diff --git a/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountDb.java b/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountDb.java index e507416f..b025c70c 100644 --- a/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountDb.java +++ b/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountDb.java @@ -4,7 +4,6 @@ package de.srsoftware.umbrella.accounting; import de.srsoftware.umbrella.core.model.Account; import de.srsoftware.umbrella.core.model.Transaction; import de.srsoftware.umbrella.core.model.UmbrellaUser; - import java.util.Collection; import java.util.List; import java.util.Optional; diff --git a/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java b/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java index b92c2559..bc2e7a8e 100644 --- a/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java +++ b/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java @@ -10,7 +10,6 @@ import static de.srsoftware.umbrella.core.constants.Path.*; import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*; import static de.srsoftware.umbrella.messagebus.MessageBus.messageBus; import static de.srsoftware.umbrella.messagebus.events.Event.EventType.CREATE; -import static java.lang.System.Logger.Level.WARNING; import com.sun.net.httpserver.HttpExchange; import de.srsoftware.configuration.Configuration; @@ -54,7 +53,7 @@ public class AccountingModule extends BaseHandler implements AccountingService { case TRANSACTION -> { try { var transaction = accountDb.loadTransaction(Long.parseLong(path.pop())); - if (!accountDb.getMembers(transaction.accountId()).contains(user)) throw forbidden("You are not allowed to access account {id}",Field.ID,accountId); + if (!accountDb.getMembers(transaction.accountId()).contains(user.get())) throw forbidden("You are not allowed to access account {id}",Field.ID,transaction.accountId()); yield dropTransaction(transaction, user.get(), path, ex); } catch (NumberFormatException ignored) { yield super.doDelete(path,ex); @@ -225,7 +224,7 @@ public class AccountingModule extends BaseHandler implements AccountingService { private boolean patchTransaction(UmbrellaUser user, long transactionId, HttpExchange ex) throws IOException { var transaction = accountDb.loadTransaction(transactionId); - if (!accountDb.getMembers(transaction.accountId()).contains(user)) throw forbidden("You are not allowed to access account {id}",Field.ID,accountId); + if (!accountDb.getMembers(transaction.accountId()).contains(user)) throw forbidden("You are not allowed to access account {id}",Field.ID,transaction.accountId()); var oldData = transaction.toMap(); var json = json(ex); if (json.has(Field.AMOUNT)) transaction.amount(json.getDouble(Field.AMOUNT)); diff --git a/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java b/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java index c499a004..844de420 100644 --- a/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java +++ b/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java @@ -21,7 +21,6 @@ import de.srsoftware.umbrella.core.constants.Text; import de.srsoftware.umbrella.core.model.Account; import de.srsoftware.umbrella.core.model.Transaction; import de.srsoftware.umbrella.core.model.UmbrellaUser; - import java.sql.Connection; import java.sql.SQLException; import java.time.ZoneOffset;