Merge branch 'main' into dev

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

.gitea/workflows/docker.yaml

@@ -53,8 +53,10 @@ jobs:
         run: |
           TAGS="$(curl -s -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/tags/list | jq -r ".tags[]")"
           COUNT=$(echo "$TAGS" | wc -l)
+          echo found $COUNT tags: $TAGS
           if [ $COUNT -gt 10 ]; then
             REMAIN=$((COUNT - 10))
+            echo $REMAIN tags will be kept!
             echo "$TAGS" | head -n $REMAIN > /tmp/old_tags
           else
             echo less than 10 tags, skipping cleanup

accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java

@@ -295,7 +295,7 @@ public class SqliteDb extends BaseDb implements AccountDb {
 			}
 		} else if (transaction.isDirty()) {
 			try {
-				if (transaction.amount() == 0 || transaction.source().isEmpty() || transaction.destination().isEmpty()) {
+				if (transaction.amount() == 0) {
 					delete().from(TABLE_TRANSACTIONS).where(Field.ID, equal(transaction.id())).where(ACCOUNT, equal(transaction.accountId())).execute(db);
 				} else {
 					replaceInto(TABLE_TRANSACTIONS, Field.ID, Field.ACCOUNT, Field.TIMESTAMP, Field.SOURCE, Field.DESTINATION, Field.AMOUNT, Field.DESCRIPTION)

core/src/main/java/de/srsoftware/umbrella/core/model/IdOrString.java

@@ -6,9 +6,6 @@ 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;
@@ -55,10 +52,6 @@ public class IdOrString implements Mappable {
 			return map;
 		}
 
-	public boolean isEmpty() {
-			return id == null && !isSet(value);
-	}
-
 	@Override
 	public String toString() {
 		return value;
@@ -67,4 +60,4 @@ public class IdOrString implements Mappable {
 	public String value(){
 			return value;
 		}
-}
+	}

journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java

@@ -13,8 +13,6 @@ import de.srsoftware.umbrella.core.BaseDb;
 import de.srsoftware.umbrella.messagebus.events.Event;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 
 public class SqliteDb extends BaseDb implements JournalDb{
 	public SqliteDb(Connection connection) {
@@ -35,14 +33,13 @@ public class SqliteDb extends BaseDb implements JournalDb{
 		var sql = """
 				CREATE TABLE IF NOT EXISTS {0} (
 					{1} INTEGER PRIMARY KEY,
-					{2} LONG NOT NULL,
+					{2} INTEGER,
-					{3} INTEGER,
+					{3} VARCHAR(255) NOT NULL,
-					{4} VARCHAR(255) NOT NULL,
+					{4} VARCHAR(16) NOT NULL,
-					{5} VARCHAR(16) NOT NULL,
+					{5} TEXT
-					{6} TEXT
 				);
 				""";
-		sql = format(sql,TABLE_JOURNAL,ID,TIMESTAMP,USER_ID,MODULE,ACTION,DESCRIPTION);
+		sql = format(sql,TABLE_JOURNAL,ID,USER_ID,MODULE,ACTION,DESCRIPTION);
 		try {
 			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
@@ -53,9 +50,8 @@ public class SqliteDb extends BaseDb implements JournalDb{
 	@Override
 	public void logEvent(Event<?> event) {
 		try {
-			var timestamp = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
+			insertInto(TABLE_JOURNAL,USER_ID,MODULE,ACTION,DESCRIPTION)
-			insertInto(TABLE_JOURNAL,TIMESTAMP,USER_ID,MODULE,ACTION,DESCRIPTION)
+					.values(event.initiator().id(), event.module(), event.eventType(), event.describe())
-					.values(timestamp,event.initiator().id(), event.module(), event.eventType(), event.describe())
 					.execute(db).close();
 		} catch (SQLException e) {
 			throw databaseException(ERROR_WRITE_EVENT,event.eventType(),event.initiator().name());