implemented message on transaction creation/update

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
2026-05-04 22:38:11 +02:00
parent e43ab1f20e
commit 713edd3638
3 changed files with 17 additions and 4 deletions
@@ -222,6 +222,7 @@ public class AccountingModule extends BaseHandler implements AccountingService {
private boolean patchTransaction(UmbrellaUser user, long transactionId, HttpExchange ex) throws IOException {
var transaction = accountDb.loadTransaction(transactionId);
LOG.log(WARNING,"Missing permission check in patchTransaction(…)!");
var oldData = transaction.toMap();
var json = json(ex);
if (json.has(Field.AMOUNT)) transaction.amount(json.getDouble(Field.AMOUNT));
if (json.has(Field.DATE)) transaction.date(LocalDate.parse(json.getString(Field.DATE)));
@@ -230,7 +231,7 @@ public class AccountingModule extends BaseHandler implements AccountingService {
if (json.has(Field.SOURCE)) transaction.source(IdOrString.of(json.getString(Field.SOURCE)));
if (json.has(Field.TAG)) transaction.tags().add(json.getString(Field.TAG));
var patched = accountDb.save(transaction);
messageBus().dispatch(new TransactionEvent(user,patched,UPDATE));
messageBus().dispatch(new TransactionEvent(user,patched,oldData));
return sendContent(ex,patched);
}
@@ -1,6 +1,7 @@
package de.srsoftware.umbrella.messagebus.events;
import de.srsoftware.umbrella.core.ModuleRegistry;
import de.srsoftware.umbrella.core.constants.Field;
import de.srsoftware.umbrella.core.constants.Module;
import de.srsoftware.umbrella.core.constants.Text;
import de.srsoftware.umbrella.core.model.Transaction;
@@ -10,9 +11,11 @@ import de.srsoftware.umbrella.core.model.UnTranslatable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import static de.srsoftware.umbrella.core.ModuleRegistry.accountingService;
import static de.srsoftware.umbrella.core.model.Translatable.t;
import static java.text.MessageFormat.format;
public class TransactionEvent extends Event<Transaction> {
private Collection<UmbrellaUser> audience;
@@ -22,6 +25,11 @@ public class TransactionEvent extends Event<Transaction> {
audience = null;
}
public TransactionEvent(UmbrellaUser initiator, Transaction transaction, Map<String, Object> oldData){
super(initiator,Module.ACCOUNTING,transaction,oldData);
}
@Override
public Collection<UmbrellaUser> audience() {
if (audience == null) audience = accountingService().loadAccount(payload().accountId()).userMap().values();
@@ -30,14 +38,17 @@ public class TransactionEvent extends Event<Transaction> {
@Override
public Translatable describe() {
return new UnTranslatable(payload().purpose());
return switch (eventType()){
case UPDATE -> new UnTranslatable(diff().orElse(""));
case null, default -> new UnTranslatable(payload().toString());
};
}
@Override
public Translatable subject() {
return switch (eventType()){
case CREATE -> t("user_created_entity",initiator().name(), Text.TRANSACTION);
case UPDATE -> t("user_updated_entity",initiator().name(), Text.TRANSACTION);
case CREATE -> t("user_created_entity", Field.USER,initiator().name(), Field.ENTITY, t(Text.TRANSACTION));
case UPDATE -> t("user_updated_entity", Field.USER,initiator().name(), Field.ENTITY, t(Text.TRANSACTION));
case null, default -> t("TODO"); // TODO
};
}
@@ -57,6 +57,7 @@ public class Field {
public static final String EDITOR = "editor";
public static final String EMAIL = "email";
public static final String END_TIME = "end_time";
public static final String ENTITY = "entity";
public static final String ENTITY_ID = "entity_id";
public static final String EST_TIME = "est_time";
public static final String EVALUATION = "evaluation";