SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

implemented proper messages for accounting events

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2026-05-05 10:01:03 +02:00
parent 713edd3638
commit 719558e8ee
14 changed files with 101 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/de/srsoftware/umbrella/core/api/AccountingService.java
+2 -3
View File
@@ -1,18 +1,17 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.core.api;
import static de.srsoftware.umbrella.core.Util.mapValues;
import de.srsoftware.tools.Mappable;
import de.srsoftware.umbrella.core.constants.Field;
import de.srsoftware.umbrella.core.model.Account;
import de.srsoftware.umbrella.core.model.Transaction;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static de.srsoftware.umbrella.core.Util.mapValues;
public interface AccountingService {
public record AccountData(Account account, List<Transaction> transactions, HashMap<Long, UmbrellaUser> userMap) implements Mappable {
public static AccountData of(Account account, List<Transaction> transactions, HashMap<Long, UmbrellaUser> userMap) {
core/src/main/java/de/srsoftware/umbrella/core/constants/Text.java
+4
View File
@@ -7,6 +7,7 @@ package de.srsoftware.umbrella.core.constants;
public class Text {
public static final String ACCOUNT = "account";
public static final String ACCOUNTING = "accounting";
public static final String AMOUNT = "amount";
public static final String BOOKMARK = "bookmark";
public static final String BOOKMARKS = "bookmarks";
@@ -21,6 +22,7 @@ public class Text {
public static final String CUSTOMER = "customer";
public static final String CUSTOMER_SETTINGS = "customer settings";
public static final String DESTINATION = "destination";
public static final String DOCUMENT = "document";
public static final String DOCUMENTS = "documents";
public static final String DOCUMENT_TYPE_ID = "document type id";
@@ -60,6 +62,7 @@ public class Text {
public static final String PROJECT_WITH_ID = "project ({id})";
public static final String PROPERTIES = "properties";
public static final String PROPERTY = "property";
public static final String PURPOSE = "purpose";
public static final String RECEIVER = "receiver";
public static final String RECEIVERS = "receivers";
@@ -69,6 +72,7 @@ public class Text {
public static final String SERVICE_WITH_ID = "service ({id})";
public static final String SESSION = "session";
public static final String SETTINGS = "settings";
public static final String SOURCE = "source";
public static final String STOCK = "stock";
public static final String STRING = "string";
core/src/main/java/de/srsoftware/umbrella/core/model/IdOrString.java
+2 -3
View File
@@ -1,14 +1,13 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.core.model;
import static de.srsoftware.tools.Optionals.isSet;
import de.srsoftware.tools.Mappable;
import de.srsoftware.umbrella.core.constants.Field;
import java.util.HashMap;
import java.util.Map;
import static de.srsoftware.tools.Optionals.isSet;
import static de.srsoftware.tools.Optionals.nullIfEmpty;
public class IdOrString implements Mappable {
private final Long id;
private final String value;