From c8ad603fca09a30eff211dce65c8332ce09d03fa Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Wed, 22 Apr 2026 08:24:54 +0200 Subject: [PATCH 1/7] preparing for journal with timestamps Signed-off-by: Stephan Richter --- .../srsoftware/umbrella/journal/SqliteDb.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java b/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java index 0d16bffc..77bfa0a0 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java @@ -13,6 +13,8 @@ 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) { @@ -33,13 +35,14 @@ public class SqliteDb extends BaseDb implements JournalDb{ var sql = """ CREATE TABLE IF NOT EXISTS {0} ( {1} INTEGER PRIMARY KEY, - {2} INTEGER, - {3} VARCHAR(255) NOT NULL, - {4} VARCHAR(16) NOT NULL, - {5} TEXT + {2} LONG NOT NULL, + {3} INTEGER, + {4} VARCHAR(255) NOT NULL, + {5} VARCHAR(16) NOT NULL, + {6} TEXT ); """; - sql = format(sql,TABLE_JOURNAL,ID,USER_ID,MODULE,ACTION,DESCRIPTION); + sql = format(sql,TABLE_JOURNAL,ID,TIMESTAMP,USER_ID,MODULE,ACTION,DESCRIPTION); try { db.prepareStatement(sql).execute(); } catch (SQLException e) { @@ -50,8 +53,9 @@ public class SqliteDb extends BaseDb implements JournalDb{ @Override public void logEvent(Event event) { try { - insertInto(TABLE_JOURNAL,USER_ID,MODULE,ACTION,DESCRIPTION) - .values(event.initiator().id(), event.module(), event.eventType(), event.describe()) + var timestamp = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC); + insertInto(TABLE_JOURNAL,TIMESTAMP,USER_ID,MODULE,ACTION,DESCRIPTION) + .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()); From e614880d71bfc869739bbc83a126e252872f6494 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Mon, 27 Jul 2026 09:22:50 +0200 Subject: [PATCH 2/7] refactoring objects in preparation for: refactoring journal database to contain object ids for: querying journal for objects --- .../umbrella/messagebus/events/Event.java | 15 +++++--- .../umbrella/messagebus/events/ItemEvent.java | 4 ++ .../messagebus/events/ProjectEvent.java | 5 +++ .../messagebus/events/TransactionEvent.java | 5 +++ .../umbrella/messagebus/events/WikiEvent.java | 4 ++ .../srsoftware/umbrella/core/model/Item.java | 37 +++++++------------ .../umbrella/core/model/ObjectWithId.java | 30 +++++++++++++++ .../umbrella/core/model/Project.java | 30 ++++++--------- .../umbrella/core/model/Transaction.java | 17 +++------ .../umbrella/core/model/WikiPage.java | 13 ++----- .../srsoftware/umbrella/journal/SqliteDb.java | 11 +++--- 11 files changed, 97 insertions(+), 74 deletions(-) create mode 100644 core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java index 09b68d86..56a7650f 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java @@ -6,6 +6,7 @@ import static java.util.Optional.*; import de.srsoftware.tools.Diff; import de.srsoftware.tools.Mappable; +import de.srsoftware.umbrella.core.model.ObjectWithId; import de.srsoftware.umbrella.core.model.Translatable; import de.srsoftware.umbrella.core.model.UmbrellaUser; import java.util.Collection; @@ -14,15 +15,15 @@ import java.util.Map; import java.util.Optional; import org.json.JSONObject; -public abstract class Event { +public abstract class Event { public enum EventType { CREATE, MEMBER_ADDED, UPDATE, DELETE; - } + } private final UmbrellaUser initiator; private final String module; private final Payload payload; @@ -39,10 +40,10 @@ public abstract class Event { public Event(UmbrellaUser initiator, String module, Payload payload, Map oldData){ this.initiator = initiator; - this.module = module; - this.payload = payload; + this.module = module; + this.payload = payload; this.eventType = EventType.UPDATE; - this.oldData = oldData; + this.oldData = oldData; } public abstract Collection audience(); @@ -98,6 +99,10 @@ public abstract class Event { return module; } + public long objectId() { + return payload.id(); + }; + protected Map oldData() { return oldData; } diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ItemEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ItemEvent.java index 9f886933..727582f8 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ItemEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ItemEvent.java @@ -36,6 +36,10 @@ public class ItemEvent extends Event{ return t("{user} added \"{item}\" to \"{location}\"", USER,initiator().name(), ITEM, payload().name(), LOCATION, loc); } + @Override + public long objectId() { + return payload().id(); + } @Override public Translatable subject() { diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ProjectEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ProjectEvent.java index 78534b3a..0113f962 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ProjectEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ProjectEvent.java @@ -78,6 +78,11 @@ public class ProjectEvent extends Event{ return t("You can view/edit this project at {base_url}/project/{id}/view",ID,payload().id()); } + @Override + public long objectId() { + return payload().id(); + } + @Override public Translatable subject() { return switch (eventType()){ diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TransactionEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TransactionEvent.java index ec30ea3c..00d9f7b4 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TransactionEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TransactionEvent.java @@ -62,6 +62,11 @@ public class TransactionEvent extends Event { return t("You can view/edit this transaction at {base_url}/account/{id}", ID, payload().accountId()); } + @Override + public long objectId() { + return payload().id(); + } + @Override public Translatable subject() { var user = initiator().name(); diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java index 2a6c5b91..d4e9240c 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java @@ -68,6 +68,10 @@ public class WikiEvent extends Event{ return t("You can view/edit this wiki page at {base_url}/wiki/{id}/view",ID,payload().id()); } + @Override + public long objectId() { + return payload().id(); + } @Override public Translatable subject() { diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Item.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Item.java index e7fbc43e..657eedef 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Item.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Item.java @@ -4,7 +4,6 @@ package de.srsoftware.umbrella.core.model; import static de.srsoftware.umbrella.core.Util.mapMarkdown; import static de.srsoftware.umbrella.core.constants.Field.*; -import de.srsoftware.tools.Mappable; import de.srsoftware.umbrella.core.api.Owner; import de.srsoftware.umbrella.core.constants.Field; import java.sql.ResultSet; @@ -12,16 +11,16 @@ import java.sql.SQLException; import java.util.*; import org.json.JSONObject; -public class Item implements Mappable { - private long id, ownerNumber; // id is the database key, number the owner-relative id - private Owner owner; +public class Item extends ObjectWithId { + private long ownerNumber; // id is the database key, number the owner-relative id + private final Owner owner; private String code, description, name; private Location location; - private Collection properties; - private Set dirtyFields = new HashSet<>(); + private final Collection properties; + private final Set dirtyFields = new HashSet<>(); public Item(long id, Owner owner, long ownerNumber, Location location, String code, String name, String description) { - this.id = id; + super(id); this.owner = owner; this.ownerNumber = ownerNumber; this.location = location; @@ -48,15 +47,6 @@ public class Item implements Mappable { return !dirtyFields.isEmpty(); } - public long id(){ - return id; - } - - public Item id(long newVal) { - id = newVal; - return this; - } - public Location location(){ return location; } @@ -121,14 +111,13 @@ public class Item implements Mappable { @Override public Map toMap() { - var map = new HashMap(); - map.put(OWNER,owner.toMap()); - map.put(ID,id); - map.put(LOCATION,location.toMap()); - map.put(Field.CODE,code); - map.put(NAME,name); - map.put(DESCRIPTION,mapMarkdown(description)); - map.put(OWNER_NUMBER,ownerNumber); + var map = super.map( + OWNER,owner.toMap(), + LOCATION,location.toMap(), + Field.CODE,code, + NAME,name, + DESCRIPTION,mapMarkdown(description), + OWNER_NUMBER,ownerNumber); if (properties != null) map.put(PROPERTIES,properties.stream().map(Property::toMap).toList()); return map; } diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java b/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java new file mode 100644 index 00000000..9bb8fd18 --- /dev/null +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java @@ -0,0 +1,30 @@ +package de.srsoftware.umbrella.core.model; + +import de.srsoftware.tools.Mappable; +import de.srsoftware.umbrella.core.constants.Field; + +import java.security.InvalidParameterException; +import java.time.LocalDate; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public abstract class ObjectWithId implements Mappable { + private final long id; + + public ObjectWithId(long id){ + this.id = id; + } + + public long id(){ + return id; + } + + protected Map map(Object ... keysAndValues) { + if (keysAndValues.length % 2 != 0) throw new InvalidParameterException("Expected even number of keys and parameters!"); + var map = new HashMap(); + map.put(Field.ID,id); + for (var idx = 0; idx members; private final Collection allowedStates; private boolean showClosed; private Long companyId; private int status; private String name; - private final long id; private String description; private final Set dirtyFields = new HashSet<>(); private final Map tagColors = new HashMap<>(); public Project(long id, String name, String description, int status, Long companyId, boolean showClosed, Map members, Collection allowedStates) { - this.id = id; + super(id); this.name = name; this.description = description; this.status = status; @@ -67,10 +65,6 @@ public class Project implements Mappable { return members.containsKey(user.id()); } - public long id(){ - return id; - } - public boolean isDirty() { return !dirtyFields.isEmpty(); } @@ -126,23 +120,21 @@ public class Project implements Mappable { @Override public Map toMap() { - var map = new HashMap(); var memberMap = new HashMap>(); if (members != null) for (var entry : members.entrySet()){ memberMap.put(entry.getKey(),entry.getValue().toMap()); } - map.put(ID,id); - map.put(NAME,name); - map.put(DESCRIPTION,mapMarkdown(description)); - map.put(STATUS,status); - map.put(COMPANY_ID,companyId); - map.put(SHOW_CLOSED,showClosed); - map.put(MEMBERS,memberMap); var stateMap = new HashMap(); for (var state : allowedStates) stateMap.put(state.code(),state.name()); - map.put(Field.ALLOWED_STATES,stateMap); - map.put(TAG_COLORS,tagColors); - return map; + return super.map( + NAME,name, + DESCRIPTION,mapMarkdown(description), + STATUS,status, + COMPANY_ID,companyId, + SHOW_CLOSED,showClosed, + MEMBERS,memberMap, + Field.ALLOWED_STATES,stateMap, + TAG_COLORS,tagColors); } @Override diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Transaction.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Transaction.java index 45a29223..1fae3dd4 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Transaction.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Transaction.java @@ -14,17 +14,17 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -public class Transaction implements Mappable { - private long accountId, id; +public class Transaction extends ObjectWithId { + private final long accountId; private LocalDateTime date; private IdOrString source, destination; private double amount; private String purpose; - private Set tags; - private HashSet dirtyFields = new HashSet<>(); + private final Set tags; + private final HashSet dirtyFields = new HashSet<>(); public Transaction(long id, long accountId, LocalDateTime date, IdOrString source, IdOrString destination, double amount, String purpose, Set tags){ - this.id = id; + super(id); this.accountId = accountId; this.date = date; this.source = source; @@ -77,10 +77,6 @@ public class Transaction implements Mappable { return this; } - public long id(){ - return id; - } - public boolean isDirty(){ return !dirtyFields.isEmpty(); } @@ -123,8 +119,7 @@ public class Transaction implements Mappable { @Override public Map toMap() { - return Map.of( - Field.ID, id, + return super.map( Field.ACCOUNT, accountId, Field.DATE, date.toLocalDate(), Field.SOURCE, source.toMap(), diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/WikiPage.java b/core/src/main/java/de/srsoftware/umbrella/core/model/WikiPage.java index 745b3859..49c0b93d 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/WikiPage.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/WikiPage.java @@ -10,16 +10,14 @@ import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*; import static de.srsoftware.umbrella.core.model.Translatable.t; import static java.lang.String.join; -import de.srsoftware.tools.Mappable; import de.srsoftware.umbrella.core.api.UserService; import java.sql.ResultSet; import java.sql.SQLException; import java.util.*; import org.json.JSONObject; -public class WikiPage implements Mappable { +public class WikiPage extends ObjectWithId { - private final long id; private String title; private int version; private final Set versions = new TreeSet<>(); @@ -29,7 +27,7 @@ public class WikiPage implements Mappable { private boolean guestAllowed = false; public WikiPage(long id, String title, int version, String content) { - this.id = id; + super(id); this.version = version; this.content = content; this.title = title; @@ -60,10 +58,6 @@ public class WikiPage implements Mappable { dirtyFields.add(GUEST_ALLOWED); } - public long id(){ - return id; - } - public boolean isDirty(String field) { return dirtyFields.contains(field); } @@ -146,8 +140,7 @@ public class WikiPage implements Mappable { var memberMap = new HashMap>(); for (var entry : members.entrySet()) memberMap.put(entry.getKey(),entry.getValue().toMap()); - return Map.of( - ID,id, + return map( CONTENT,mapMarkdown(content), GUEST_ALLOWED,guestAllowed, MEMBERS,memberMap, diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java b/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java index 77bfa0a0..785c0ce9 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java @@ -38,11 +38,12 @@ public class SqliteDb extends BaseDb implements JournalDb{ {2} LONG NOT NULL, {3} INTEGER, {4} VARCHAR(255) NOT NULL, - {5} VARCHAR(16) NOT NULL, - {6} TEXT + {5} VARCHAR(255), + {6} VARCHAR(16) NOT NULL, + {7} TEXT ); """; - sql = format(sql,TABLE_JOURNAL,ID,TIMESTAMP,USER_ID,MODULE,ACTION,DESCRIPTION); + sql = format(sql,TABLE_JOURNAL,ID,TIMESTAMP,USER_ID,MODULE,ENTITY_ID,ACTION,DESCRIPTION); try { db.prepareStatement(sql).execute(); } catch (SQLException e) { @@ -54,8 +55,8 @@ public class SqliteDb extends BaseDb implements JournalDb{ public void logEvent(Event event) { try { var timestamp = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC); - insertInto(TABLE_JOURNAL,TIMESTAMP,USER_ID,MODULE,ACTION,DESCRIPTION) - .values(timestamp,event.initiator().id(), event.module(), event.eventType(), event.describe()) + insertInto(TABLE_JOURNAL,TIMESTAMP,USER_ID,MODULE,ENTITY_ID,ACTION,DESCRIPTION) + .values(timestamp,event.initiator().id(), event.module(), event.objectId(), event.eventType(), event.describe()) .execute(db).close(); } catch (SQLException e) { throw databaseException(ERROR_WRITE_EVENT,event.eventType(),event.initiator().name()); From 722a6ae97e30209bd68a2bbba55aad342ba387f0 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Tue, 28 Jul 2026 08:46:31 +0200 Subject: [PATCH 3/7] working on journal Signed-off-by: Stephan Richter --- .../umbrella/messagebus/events/Event.java | 1 - .../umbrella/core/model/Bookmark.java | 75 +++++++++++++++++-- .../umbrella/core/model/ObjectWithId.java | 9 ++- .../srsoftware/umbrella/core/model/Task.java | 46 +++++------- frontend/src/routes/journal/related.svelte | 17 +++++ frontend/src/routes/task/View.svelte | 7 +- .../srsoftware/umbrella/stock/SqliteDb.java | 5 +- 7 files changed, 120 insertions(+), 40 deletions(-) create mode 100644 frontend/src/routes/journal/related.svelte diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java index 56a7650f..1c493892 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java @@ -5,7 +5,6 @@ import static de.srsoftware.umbrella.core.constants.Field.*; import static java.util.Optional.*; import de.srsoftware.tools.Diff; -import de.srsoftware.tools.Mappable; import de.srsoftware.umbrella.core.model.ObjectWithId; import de.srsoftware.umbrella.core.model.Translatable; import de.srsoftware.umbrella.core.model.UmbrellaUser; diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Bookmark.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Bookmark.java index d5d63d00..baedb3db 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Bookmark.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Bookmark.java @@ -5,32 +5,91 @@ import static de.srsoftware.umbrella.core.Util.mapMarkdown; import static de.srsoftware.umbrella.core.constants.Field.*; import static java.time.ZoneOffset.UTC; -import de.srsoftware.tools.Mappable; import java.sql.ResultSet; import java.sql.SQLException; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; import java.util.Map; +import java.util.Objects; -public record Bookmark(long urlId, String url, String comment, LocalDateTime timestamp, Collection tags) implements Mappable { +public final class Bookmark extends ObjectWithId { + private final String url; + private final String comment; + private final LocalDateTime timestamp; + private final Collection tags; - public static Bookmark of(ResultSet rs) throws SQLException { - return new Bookmark(rs.getLong(ID),rs.getString(URL),rs.getString(COMMENT),LocalDateTime.ofEpochSecond(rs.getLong(TIMESTAMP),0, UTC),new ArrayList<>()); + public Bookmark(long urlId, String url, String comment, LocalDateTime timestamp, Collection tags) { + super(urlId); + this.url = url; + this.comment = comment; + this.timestamp = timestamp; + this.tags = tags; } - public static Bookmark of(long urlId, String url, String comment, LocalDateTime timestamp){ - return new Bookmark(urlId,url,comment,timestamp,new ArrayList<>()); + public static Bookmark of(ResultSet rs) throws SQLException { + return new Bookmark(rs.getLong(ID), rs.getString(URL), rs.getString(COMMENT), LocalDateTime.ofEpochSecond(rs.getLong(TIMESTAMP), 0, UTC), new ArrayList<>()); + } + + public static Bookmark of(long urlId, String url, String comment, LocalDateTime timestamp) { + return new Bookmark(urlId, url, comment, timestamp, new ArrayList<>()); } @Override public Map toMap() { - return Map.of( - ID, urlId, + return map( URL, url, COMMENT, mapMarkdown(comment), TAGS, tags, TIMESTAMP, timestamp.withNano(0) ); } + + public long urlId() { + return id(); + } + + public String url() { + return url; + } + + public String comment() { + return comment; + } + + public LocalDateTime timestamp() { + return timestamp; + } + + public Collection tags() { + return tags; + } + + @Override + public boolean equals(Object obj) { + if (obj == this) return true; + if (obj == null || obj.getClass() != this.getClass()) return false; + var that = (Bookmark) obj; + return this.urlId() == that.urlId() && + Objects.equals(this.url, that.url) && + Objects.equals(this.comment, that.comment) && + Objects.equals(this.timestamp, that.timestamp) && + Objects.equals(this.tags, that.tags); + } + + @Override + public int hashCode() { + return Objects.hash(urlId(), url, comment, timestamp, tags); + } + + @Override + public String toString() { + return "Bookmark[" + + "urlId=" + urlId() + ", " + + "url=" + url + ", " + + "comment=" + comment + ", " + + "timestamp=" + timestamp + ", " + + "tags=" + tags + ']'; + } + } diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java b/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java index 9bb8fd18..49f1ffec 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java @@ -4,13 +4,11 @@ import de.srsoftware.tools.Mappable; import de.srsoftware.umbrella.core.constants.Field; import java.security.InvalidParameterException; -import java.time.LocalDate; import java.util.HashMap; -import java.util.List; import java.util.Map; public abstract class ObjectWithId implements Mappable { - private final long id; + private long id; public ObjectWithId(long id){ this.id = id; @@ -20,6 +18,11 @@ public abstract class ObjectWithId implements Mappable { return id; } + public ObjectWithId setId(long newValue){ + id = newValue; + return this; + } + protected Map map(Object ... keysAndValues) { if (keysAndValues.length % 2 != 0) throw new InvalidParameterException("Expected even number of keys and parameters!"); var map = new HashMap(); diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Task.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Task.java index f7ae2a8f..3b60d13e 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Task.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Task.java @@ -7,7 +7,6 @@ import static de.srsoftware.umbrella.core.constants.Field.*; import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*; import static java.lang.System.Logger.Level.WARNING; -import de.srsoftware.tools.Mappable; import de.srsoftware.umbrella.core.constants.Field; import java.sql.ResultSet; import java.sql.SQLException; @@ -15,9 +14,9 @@ import java.time.LocalDate; import java.util.*; import org.json.JSONObject; -public class Task implements Mappable { +public class Task extends ObjectWithId { public static final System.Logger LOG = System.getLogger(Task.class.getSimpleName()); - private final long id, projectId; + private final long projectId; private Long parentTaskId; private String description, name; private final Set requiredTasksIds; @@ -30,7 +29,7 @@ public class Task implements Mappable { private final Set tags = new HashSet<>(); public Task (long id, long projectId, Long parentTaskId, String name, String description, int status, Double estimatedTime, LocalDate start, LocalDate dueDate, boolean showClosed, boolean noIndex, Map members, int priority){ - this.id = id; + super(id); this.projectId = projectId; this.parentTaskId = parentTaskId; this.name = name; @@ -82,10 +81,6 @@ public class Task implements Mappable { return members.containsKey(user.id()); } - public long id(){ - return id; - } - public boolean isDirty() { return !dirtyFields.isEmpty(); } @@ -229,28 +224,27 @@ public class Task implements Mappable { } public Map toMap(boolean renderMarkdown){ - var map = new HashMap(); var memberMap = new HashMap>(); if (members != null) for (var entry : members.entrySet()){ memberMap.put(entry.getKey(),entry.getValue().toMap()); } - map.put(ID, id); - map.put(PROJECT_ID, projectId); - map.put(PARENT_TASK_ID, parentTaskId); - map.put(PRIORITY,priority); - map.put(NAME, name); - map.put(DESCRIPTION, renderMarkdown ? mapMarkdown(description) : Map.of(SOURCE,description)); - map.put(STATUS, status); - map.put(EST_TIME, estimatedTime); - map.put(START_DATE,start); - map.put(DUE_DATE,dueDate); - map.put(NO_INDEX,noIndex); - map.put(MEMBERS,memberMap); - map.put(REQUIRED_TASKS_IDS,requiredTasksIds); - map.put(SHOW_CLOSED,showClosed); - map.put(TOTAL_PRIO,totalPrio()); - map.put(TAGS,tags); - return map; + return map( + PROJECT_ID, projectId, + PARENT_TASK_ID, parentTaskId, + PRIORITY,priority, + NAME, name, + DESCRIPTION, renderMarkdown ? mapMarkdown(description) : Map.of(SOURCE,description), + STATUS, status, + EST_TIME, estimatedTime, + START_DATE,start, + DUE_DATE,dueDate, + NO_INDEX,noIndex, + MEMBERS,memberMap, + REQUIRED_TASKS_IDS,requiredTasksIds, + SHOW_CLOSED,showClosed, + TOTAL_PRIO,totalPrio(), + TAGS,tags + ); } @Override diff --git a/frontend/src/routes/journal/related.svelte b/frontend/src/routes/journal/related.svelte new file mode 100644 index 00000000..5124bfea --- /dev/null +++ b/frontend/src/routes/journal/related.svelte @@ -0,0 +1,17 @@ + + +... \ No newline at end of file diff --git a/frontend/src/routes/task/View.svelte b/frontend/src/routes/task/View.svelte index c9aabaad..497bc1ad 100644 --- a/frontend/src/routes/task/View.svelte +++ b/frontend/src/routes/task/View.svelte @@ -8,6 +8,7 @@ import { timetrack } from '../../user.svelte.js'; import { now } from '../../time.svelte'; + import Journal from '../journal/related.svelte'; import LineEditor from '../../Components/LineEditor.svelte'; import MarkdownEditor from '../../Components/MarkdownEditor.svelte'; import ParentSelector from './ParentSelector.svelte'; @@ -363,9 +364,13 @@ {/if} +

{t('Journal')}

+
+ +

{t('notes')}

- +
{/if} diff --git a/stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java b/stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java index b78fd73a..4539e03e 100644 --- a/stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java +++ b/stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java @@ -476,7 +476,10 @@ public class SqliteDb extends BaseDb implements StockDb { var rs = insertInto(TABLE_ITEMS, OWNER, OWNER_NUMBER, Field.CODE, NAME, DESCRIPTION, LOCATION_ID) .values(item.owner().dbCode(), number, item.code(), item.name(), item.description(), item.location().id()) .execute(db).getGeneratedKeys(); - if (rs.next()) item.id(rs.getLong(1)).ownerNumber(number); + if (rs.next()) { + item.setId(rs.getLong(1)); + item.ownerNumber(number); + } rs.close(); } catch (SQLException e) { throw failedToStoreObject(item.name()).causedBy(e); From 51a9f9272e4df414b95a916172f6ed349bbe8b28 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Tue, 28 Jul 2026 09:24:26 +0200 Subject: [PATCH 4/7] preparing to load events Signed-off-by: Stephan Richter --- .../umbrella/messagebus/events/TaskEvent.java | 4 ++ .../umbrella/core/api/UserService.java | 2 + .../umbrella/core/constants/Text.java | 1 + .../umbrella/journal/JournalDb.java | 6 +++ .../umbrella/journal/JournalModule.java | 38 ++++++++++++++++ .../srsoftware/umbrella/journal/SqliteDb.java | 43 ++++++++++++++++++- .../srsoftware/umbrella/user/UserModule.java | 12 ++++++ 7 files changed, 104 insertions(+), 2 deletions(-) diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java index b6d5c008..f11e9b3b 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java @@ -10,6 +10,9 @@ import static de.srsoftware.umbrella.messagebus.events.Event.EventType.MEMBER_AD import de.srsoftware.umbrella.core.constants.Field; import de.srsoftware.umbrella.core.model.*; + +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.Collection; import java.util.List; import java.util.Map; @@ -96,6 +99,7 @@ public class TaskEvent extends Event{ return t("You can view/edit this task at {base_url}/task/{id}/view",ID,payload().id()); } + @Override public Translatable subject() { return switch (eventType()){ diff --git a/core/src/main/java/de/srsoftware/umbrella/core/api/UserService.java b/core/src/main/java/de/srsoftware/umbrella/core/api/UserService.java index e8073262..09131fdd 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/api/UserService.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/api/UserService.java @@ -8,6 +8,7 @@ import de.srsoftware.umbrella.core.model.Session; import de.srsoftware.umbrella.core.model.Token; import de.srsoftware.umbrella.core.model.UmbrellaUser; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -15,6 +16,7 @@ public interface UserService { void dropSession(Token token) throws UmbrellaException; Session extend(Session session) throws UmbrellaException; Map list(Integer start, Integer limit, Collection ids) throws UmbrellaException; + HashMap loader(); Session load(Token token) throws UmbrellaException; UmbrellaUser load(Session session) throws UmbrellaException; Optional load(EmailAddress email) throws UmbrellaException; diff --git a/core/src/main/java/de/srsoftware/umbrella/core/constants/Text.java b/core/src/main/java/de/srsoftware/umbrella/core/constants/Text.java index 2e7fd581..5374a9aa 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/constants/Text.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/constants/Text.java @@ -30,6 +30,7 @@ public class Text { public static final String EMAILS_FOR_RECEIVER = "emails for {email}"; public static final String EVALUATION = "evaluation"; + public static final String EVENT_LIST = "event list"; public static final String FILES = "files"; diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalDb.java b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalDb.java index 69a08f0e..6ba0f02f 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalDb.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalDb.java @@ -1,8 +1,14 @@ /* © SRSoftware 2025 */ package de.srsoftware.umbrella.journal; +import de.srsoftware.umbrella.core.model.UmbrellaUser; import de.srsoftware.umbrella.messagebus.events.Event; +import java.util.HashMap; +import java.util.List; + public interface JournalDb { void logEvent(Event event); + + List> list(String module, long entityId, HashMap userLoader); } diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java index 0f2d450e..8ee2ffe7 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java @@ -2,17 +2,33 @@ package de.srsoftware.umbrella.journal; import static de.srsoftware.umbrella.core.ConnectionProvider.connect; +import static de.srsoftware.umbrella.core.ModuleRegistry.userService; +import static de.srsoftware.umbrella.core.constants.Path.PARENT_CANDIDATES; +import static de.srsoftware.umbrella.core.constants.Path.TAGGED; +import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.invalidField; import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.missingField; import static de.srsoftware.umbrella.journal.Constants.CONFIG_DATABASE; import static de.srsoftware.umbrella.messagebus.MessageBus.messageBus; import static java.lang.System.Logger.Level.DEBUG; +import com.sun.net.httpserver.HttpExchange; import de.srsoftware.configuration.Configuration; +import de.srsoftware.tools.Path; +import de.srsoftware.tools.SessionToken; import de.srsoftware.umbrella.core.BaseHandler; import de.srsoftware.umbrella.core.ModuleRegistry; +import de.srsoftware.umbrella.core.constants.Field; +import de.srsoftware.umbrella.core.constants.Text; +import de.srsoftware.umbrella.core.exceptions.UmbrellaException; +import de.srsoftware.umbrella.core.model.Token; +import de.srsoftware.umbrella.core.model.UmbrellaUser; import de.srsoftware.umbrella.messagebus.EventListener; import de.srsoftware.umbrella.messagebus.events.Event; +import java.io.IOException; +import java.util.HashMap; +import java.util.Optional; + public class JournalModule extends BaseHandler implements EventListener { @@ -26,6 +42,28 @@ public class JournalModule extends BaseHandler implements EventListener { messageBus().register(this); } + @Override + public boolean doGet(Path path, HttpExchange ex) throws IOException { + addCors(ex); + try { + Optional token = SessionToken.from(ex).map(Token::of); + var user = userService().loadUser(token); + if (user.isEmpty()) return unauthorized(ex); + var module = path.pop(); + if (module == null) throw missingField(Field.MODULE); + var head = path.pop(); + if (head == null) throw missingField(Field.ENTITY_ID); + try { + var entityId = Long.parseLong(head); + journalDb.list(module, entityId, userService().loader()); + } catch (NumberFormatException e) { + throw invalidField(Field.ENTITY_ID, Text.NUMBER); + } + } catch (UmbrellaException e) { + return send(ex, e); + } + } + @Override public void onEvent(Event event) { LOG.log(DEBUG,"{0} @ {1} (by {2})",event.eventType(),event.module(),event.initiator().name()); diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java b/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java index 785c0ce9..60481386 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java @@ -1,20 +1,32 @@ /* © SRSoftware 2025 */ package de.srsoftware.umbrella.journal; +import static de.srsoftware.tools.NotImplemented.notImplemented; +import static de.srsoftware.tools.jdbc.Condition.equal; +import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL; import static de.srsoftware.tools.jdbc.Query.insertInto; +import static de.srsoftware.tools.jdbc.Query.select; import static de.srsoftware.umbrella.core.constants.Field.*; -import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.databaseException; -import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.failedToCreateTable; +import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*; import static de.srsoftware.umbrella.journal.Constants.ERROR_WRITE_EVENT; import static de.srsoftware.umbrella.journal.Constants.TABLE_JOURNAL; import static java.text.MessageFormat.format; import de.srsoftware.umbrella.core.BaseDb; +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.UmbrellaUser; import de.srsoftware.umbrella.messagebus.events.Event; +import de.srsoftware.umbrella.messagebus.events.TaskEvent; + import java.sql.Connection; import java.sql.SQLException; import java.time.LocalDateTime; import java.time.ZoneOffset; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class SqliteDb extends BaseDb implements JournalDb{ public SqliteDb(Connection connection) { @@ -51,6 +63,33 @@ public class SqliteDb extends BaseDb implements JournalDb{ } } + @Override + public List> list(String module, long entityId, HashMap userLoader) { + try { + var rs = select(ALL).from(TABLE_JOURNAL).where(MODULE, equal(module)).where(ENTITY_ID,equal(entityId)).exec(db); + var list = new ArrayList>(); + + + while (rs.next()){ + var user = userLoader.get(rs.getLong(USER_ID)); + var id = rs.getLong(Field.ID); + var timestamp = rs.getLong(TIMESTAMP); + var action = rs.getString(ACTION); + var descr = rs.getString(DESCRIPTION); + + var event = switch (module){ + case Module.TASK -> new TaskEvent(user,) + default -> throw notImplemented("No handler for "+module+" events!"); + }; + list.add(event); + } + rs.close(); + return list; + } catch (SQLException e) { + throw failedToLoadObject(Text.EVENT_LIST); + }; + } + @Override public void logEvent(Event event) { try { diff --git a/user/src/main/java/de/srsoftware/umbrella/user/UserModule.java b/user/src/main/java/de/srsoftware/umbrella/user/UserModule.java index 2e895e95..4409bb22 100644 --- a/user/src/main/java/de/srsoftware/umbrella/user/UserModule.java +++ b/user/src/main/java/de/srsoftware/umbrella/user/UserModule.java @@ -6,6 +6,7 @@ import static de.srsoftware.tools.Optionals.*; import static de.srsoftware.tools.Strings.uuid; import static de.srsoftware.umbrella.core.ConnectionProvider.connect; import static de.srsoftware.umbrella.core.ModuleRegistry.postBox; +import static de.srsoftware.umbrella.core.ModuleRegistry.userService; import static de.srsoftware.umbrella.core.ResponseCode.*; import static de.srsoftware.umbrella.core.ResponseCode.HTTP_SERVER_ERROR; import static de.srsoftware.umbrella.core.Util.*; @@ -161,6 +162,17 @@ public class UserModule extends BaseHandler implements UserService { } } + @Override + public HashMap loader() { + return new HashMap(){ + public UmbrellaUser get(long id) { + var user = super.get(id); + if (user == null) put(id, user = loadUser(id)); + return user; + } + }; + } + @Override public UmbrellaUser loadUser(long userId) throws UmbrellaException { return users.load(userId); From 6fe8cb4b1d94495220e30d12efae4561dc3cab8c Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Wed, 29 Jul 2026 08:48:13 +0200 Subject: [PATCH 5/7] working on loading journal entries Signed-off-by: Stephan Richter --- .../messagebus/events/JournalEntry.java | 50 +++++++++++++++++++ .../umbrella/journal/JournalDb.java | 3 +- .../umbrella/journal/JournalModule.java | 3 +- .../srsoftware/umbrella/journal/SqliteDb.java | 23 ++------- 4 files changed, 59 insertions(+), 20 deletions(-) create mode 100644 bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java new file mode 100644 index 00000000..1c697966 --- /dev/null +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java @@ -0,0 +1,50 @@ +package de.srsoftware.umbrella.messagebus.events; + +import de.srsoftware.tools.Mappable; +import de.srsoftware.umbrella.core.constants.Field; +import de.srsoftware.umbrella.core.model.ObjectWithId; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Map; + +import static de.srsoftware.umbrella.core.constants.Field.*; + +public class JournalEntry extends ObjectWithId { + + long timestamp, userId, entityId; + String action, description, module; + + public JournalEntry(long id, long timestamp, long userId, String module, long entityId, String action, String description){ + super(id); + this.timestamp = timestamp; + this.userId = userId; + this.module = module; + this.entityId = entityId; + this.action = action; + this.description = description; + } + public static JournalEntry of(ResultSet rs) throws SQLException { + var id = rs.getLong(ID); + var timestamp = rs.getLong(TIMESTAMP); + var userId = rs.getLong(USER_ID); + var module = rs.getString(MODULE); + var entityId = rs.getLong(ENTITY_ID); + var action = rs.getString(ACTION); + var description = rs.getString(DESCRIPTION); + + return new JournalEntry(id, timestamp, userId, module, entityId, action, description); + } + + @Override + public Map toMap() { + return map( + TIMESTAMP, timestamp, + USER_ID, userId, + MODULE, module, + ENTITY_ID, entityId, + ACTION, action, + DESCRIPTION, description + ); + } +} diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalDb.java b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalDb.java index 6ba0f02f..0c3f7a28 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalDb.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalDb.java @@ -3,6 +3,7 @@ package de.srsoftware.umbrella.journal; import de.srsoftware.umbrella.core.model.UmbrellaUser; import de.srsoftware.umbrella.messagebus.events.Event; +import de.srsoftware.umbrella.messagebus.events.JournalEntry; import java.util.HashMap; import java.util.List; @@ -10,5 +11,5 @@ import java.util.List; public interface JournalDb { void logEvent(Event event); - List> list(String module, long entityId, HashMap userLoader); + List list(String module, long entityId, HashMap userLoader); } diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java index 8ee2ffe7..d760c45e 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java @@ -55,7 +55,8 @@ public class JournalModule extends BaseHandler implements EventListener { if (head == null) throw missingField(Field.ENTITY_ID); try { var entityId = Long.parseLong(head); - journalDb.list(module, entityId, userService().loader()); + var entries = journalDb.list(module, entityId, userService().loader()); + return sendContent(ex,entries); // TODO: map entries } catch (NumberFormatException e) { throw invalidField(Field.ENTITY_ID, Text.NUMBER); } diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java b/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java index 60481386..bc3b4435 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java @@ -18,6 +18,7 @@ import de.srsoftware.umbrella.core.constants.Module; import de.srsoftware.umbrella.core.constants.Text; import de.srsoftware.umbrella.core.model.UmbrellaUser; import de.srsoftware.umbrella.messagebus.events.Event; +import de.srsoftware.umbrella.messagebus.events.JournalEntry; import de.srsoftware.umbrella.messagebus.events.TaskEvent; import java.sql.Connection; @@ -64,30 +65,16 @@ public class SqliteDb extends BaseDb implements JournalDb{ } @Override - public List> list(String module, long entityId, HashMap userLoader) { + public List list(String module, long entityId, HashMap userLoader) { try { var rs = select(ALL).from(TABLE_JOURNAL).where(MODULE, equal(module)).where(ENTITY_ID,equal(entityId)).exec(db); - var list = new ArrayList>(); - - - while (rs.next()){ - var user = userLoader.get(rs.getLong(USER_ID)); - var id = rs.getLong(Field.ID); - var timestamp = rs.getLong(TIMESTAMP); - var action = rs.getString(ACTION); - var descr = rs.getString(DESCRIPTION); - - var event = switch (module){ - case Module.TASK -> new TaskEvent(user,) - default -> throw notImplemented("No handler for "+module+" events!"); - }; - list.add(event); - } + var list = new ArrayList(); + while (rs.next()) list.add(JournalEntry.of(rs)); rs.close(); return list; } catch (SQLException e) { throw failedToLoadObject(Text.EVENT_LIST); - }; + } } @Override From b0096ad5f40eafec147f336aca4fa2544822c3f7 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Fri, 31 Jul 2026 09:20:55 +0200 Subject: [PATCH 6/7] implemented loading and display of journal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Nächste Schritte: der Hinweis "you can view/edit xxx at https://…" sollte zwar in der Mail auftauchen, nicht aber im Journal – hier muss also nochmal nachgearbeitet werden Signed-off-by: Stephan Richter --- .../messagebus/events/JournalEntry.java | 24 ++++++++++++------- .../umbrella/messagebus/events/TaskEvent.java | 3 --- .../umbrella/core/constants/Field.java | 2 ++ .../umbrella/core/model/ObjectWithId.java | 2 +- .../umbrella/core/model/Transaction.java | 1 - frontend/src/routes/journal/related.svelte | 16 ++++++++++++- frontend/src/routes/task/View.svelte | 9 +++---- .../umbrella/journal/JournalDb.java | 5 +--- .../umbrella/journal/JournalModule.java | 16 ++++++++----- .../srsoftware/umbrella/journal/SqliteDb.java | 9 +------ .../srsoftware/umbrella/user/UserModule.java | 13 ++++++---- 11 files changed, 58 insertions(+), 42 deletions(-) diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java index 1c697966..6c02e23d 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java @@ -1,21 +1,23 @@ +/* © SRSoftware 2025 */ package de.srsoftware.umbrella.messagebus.events; -import de.srsoftware.tools.Mappable; -import de.srsoftware.umbrella.core.constants.Field; -import de.srsoftware.umbrella.core.model.ObjectWithId; +import static de.srsoftware.umbrella.core.Util.mapMarkdown; +import static de.srsoftware.umbrella.core.constants.Field.*; +import static java.time.ZoneOffset.UTC; +import de.srsoftware.umbrella.core.model.ObjectWithId; import java.sql.ResultSet; import java.sql.SQLException; +import java.time.LocalDateTime; import java.util.Map; -import static de.srsoftware.umbrella.core.constants.Field.*; - public class JournalEntry extends ObjectWithId { - long timestamp, userId, entityId; + LocalDateTime timestamp; + long userId, entityId; String action, description, module; - public JournalEntry(long id, long timestamp, long userId, String module, long entityId, String action, String description){ + public JournalEntry(long id, LocalDateTime timestamp, long userId, String module, long entityId, String action, String description){ super(id); this.timestamp = timestamp; this.userId = userId; @@ -26,7 +28,7 @@ public class JournalEntry extends ObjectWithId { } public static JournalEntry of(ResultSet rs) throws SQLException { var id = rs.getLong(ID); - var timestamp = rs.getLong(TIMESTAMP); + var timestamp = LocalDateTime.ofEpochSecond(rs.getLong(TIMESTAMP),0, UTC); var userId = rs.getLong(USER_ID); var module = rs.getString(MODULE); var entityId = rs.getLong(ENTITY_ID); @@ -36,6 +38,10 @@ public class JournalEntry extends ObjectWithId { return new JournalEntry(id, timestamp, userId, module, entityId, action, description); } + public long userId(){ + return userId; + } + @Override public Map toMap() { return map( @@ -44,7 +50,7 @@ public class JournalEntry extends ObjectWithId { MODULE, module, ENTITY_ID, entityId, ACTION, action, - DESCRIPTION, description + DESCRIPTION, mapMarkdown(description) ); } } diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java index f11e9b3b..9f4e6558 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java @@ -10,9 +10,6 @@ import static de.srsoftware.umbrella.messagebus.events.Event.EventType.MEMBER_AD import de.srsoftware.umbrella.core.constants.Field; import de.srsoftware.umbrella.core.model.*; - -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/de/srsoftware/umbrella/core/constants/Field.java b/core/src/main/java/de/srsoftware/umbrella/core/constants/Field.java index 7f2b2663..512f19c4 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/constants/Field.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/constants/Field.java @@ -83,6 +83,8 @@ public class Field { public static final String ITEM = "item"; public static final String ITEM_CODE = "item_code"; + public static final String JOURNAL = "journal"; + public static final String KEY = "key"; public static final String LANGUAGE = "language"; diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java b/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java index 49f1ffec..471f303a 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java @@ -1,8 +1,8 @@ +/* © SRSoftware 2025 */ package de.srsoftware.umbrella.core.model; import de.srsoftware.tools.Mappable; import de.srsoftware.umbrella.core.constants.Field; - import java.security.InvalidParameterException; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Transaction.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Transaction.java index 1fae3dd4..90decad2 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Transaction.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Transaction.java @@ -3,7 +3,6 @@ package de.srsoftware.umbrella.core.model; import static java.text.MessageFormat.format; -import de.srsoftware.tools.Mappable; import de.srsoftware.umbrella.core.constants.Field; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/frontend/src/routes/journal/related.svelte b/frontend/src/routes/journal/related.svelte index 5124bfea..be0481ce 100644 --- a/frontend/src/routes/journal/related.svelte +++ b/frontend/src/routes/journal/related.svelte @@ -4,14 +4,28 @@ import { t } from '../../translations.svelte'; let { module, entityId } = $props(); + let data = $state({journal:[]}); + async function loadJournal(){ const url = api(`journal/${module}/${entityId}`); const res = await get(url); if (res.ok) { + data = await res.json(); } else error(res); } $effect(loadJournal); -... \ No newline at end of file +
    + {#each data.journal as entry (entry.id)} +
  • + {entry.timestamp.replace('T',' ')} + {data.user_list[entry.user_id].name}: + {t(entry.action)} +
    + {@html entry.description.rendered} +
    +
    • + {/each} +
diff --git a/frontend/src/routes/task/View.svelte b/frontend/src/routes/task/View.svelte index 497bc1ad..98f82067 100644 --- a/frontend/src/routes/task/View.svelte +++ b/frontend/src/routes/task/View.svelte @@ -364,14 +364,15 @@ {/if} -

{t('Journal')}

-
- -

{t('notes')}

+

{t('Journal')}

+
+ +
+ {/if} diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalDb.java b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalDb.java index 0c3f7a28..276fbc54 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalDb.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalDb.java @@ -1,15 +1,12 @@ /* © SRSoftware 2025 */ package de.srsoftware.umbrella.journal; -import de.srsoftware.umbrella.core.model.UmbrellaUser; import de.srsoftware.umbrella.messagebus.events.Event; import de.srsoftware.umbrella.messagebus.events.JournalEntry; - -import java.util.HashMap; import java.util.List; public interface JournalDb { void logEvent(Event event); - List list(String module, long entityId, HashMap userLoader); + List list(String module, long entityId); } diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java index d760c45e..e11e6a22 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java @@ -3,8 +3,6 @@ package de.srsoftware.umbrella.journal; import static de.srsoftware.umbrella.core.ConnectionProvider.connect; import static de.srsoftware.umbrella.core.ModuleRegistry.userService; -import static de.srsoftware.umbrella.core.constants.Path.PARENT_CANDIDATES; -import static de.srsoftware.umbrella.core.constants.Path.TAGGED; import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.invalidField; import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.missingField; import static de.srsoftware.umbrella.journal.Constants.CONFIG_DATABASE; @@ -21,12 +19,12 @@ import de.srsoftware.umbrella.core.constants.Field; import de.srsoftware.umbrella.core.constants.Text; import de.srsoftware.umbrella.core.exceptions.UmbrellaException; import de.srsoftware.umbrella.core.model.Token; -import de.srsoftware.umbrella.core.model.UmbrellaUser; import de.srsoftware.umbrella.messagebus.EventListener; import de.srsoftware.umbrella.messagebus.events.Event; - +import de.srsoftware.umbrella.messagebus.events.JournalEntry; import java.io.IOException; import java.util.HashMap; +import java.util.Map; import java.util.Optional; @@ -55,8 +53,14 @@ public class JournalModule extends BaseHandler implements EventListener { if (head == null) throw missingField(Field.ENTITY_ID); try { var entityId = Long.parseLong(head); - var entries = journalDb.list(module, entityId, userService().loader()); - return sendContent(ex,entries); // TODO: map entries + var entries = journalDb.list(module, entityId); + var loader = userService().loader(); + var userMap = new HashMap(); + for (var entry : entries) userMap.put(entry.userId(),loader.get(entry.userId()).toMap()); + return sendContent(ex,Map.of( + Field.USER_LIST,userMap, + Field.JOURNAL,entries.stream().map(JournalEntry::toMap).toList() + )); } catch (NumberFormatException e) { throw invalidField(Field.ENTITY_ID, Text.NUMBER); } diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java b/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java index bc3b4435..93c915e2 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java @@ -1,7 +1,6 @@ /* © SRSoftware 2025 */ package de.srsoftware.umbrella.journal; -import static de.srsoftware.tools.NotImplemented.notImplemented; import static de.srsoftware.tools.jdbc.Condition.equal; import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL; import static de.srsoftware.tools.jdbc.Query.insertInto; @@ -13,20 +12,14 @@ import static de.srsoftware.umbrella.journal.Constants.TABLE_JOURNAL; import static java.text.MessageFormat.format; import de.srsoftware.umbrella.core.BaseDb; -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.UmbrellaUser; import de.srsoftware.umbrella.messagebus.events.Event; import de.srsoftware.umbrella.messagebus.events.JournalEntry; -import de.srsoftware.umbrella.messagebus.events.TaskEvent; - import java.sql.Connection; import java.sql.SQLException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; public class SqliteDb extends BaseDb implements JournalDb{ @@ -65,7 +58,7 @@ public class SqliteDb extends BaseDb implements JournalDb{ } @Override - public List list(String module, long entityId, HashMap userLoader) { + public List list(String module, long entityId) { try { var rs = select(ALL).from(TABLE_JOURNAL).where(MODULE, equal(module)).where(ENTITY_ID,equal(entityId)).exec(db); var list = new ArrayList(); diff --git a/user/src/main/java/de/srsoftware/umbrella/user/UserModule.java b/user/src/main/java/de/srsoftware/umbrella/user/UserModule.java index 4409bb22..4ad977d6 100644 --- a/user/src/main/java/de/srsoftware/umbrella/user/UserModule.java +++ b/user/src/main/java/de/srsoftware/umbrella/user/UserModule.java @@ -6,7 +6,6 @@ import static de.srsoftware.tools.Optionals.*; import static de.srsoftware.tools.Strings.uuid; import static de.srsoftware.umbrella.core.ConnectionProvider.connect; import static de.srsoftware.umbrella.core.ModuleRegistry.postBox; -import static de.srsoftware.umbrella.core.ModuleRegistry.userService; import static de.srsoftware.umbrella.core.ResponseCode.*; import static de.srsoftware.umbrella.core.ResponseCode.HTTP_SERVER_ERROR; import static de.srsoftware.umbrella.core.Util.*; @@ -165,10 +164,14 @@ public class UserModule extends BaseHandler implements UserService { @Override public HashMap loader() { return new HashMap(){ - public UmbrellaUser get(long id) { - var user = super.get(id); - if (user == null) put(id, user = loadUser(id)); - return user; + @Override + public UmbrellaUser get(Object key) { + if (key instanceof Long id){ + var user = super.get(id); + if (user == null) put(id, user = loadUser(id)); + return user; + } + return null; } }; } From d4feda141ec2f511d9e6b0088a723594d600a5ab Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Sat, 1 Aug 2026 00:46:52 +0200 Subject: [PATCH 7/7] working implementation of journal display Signed-off-by: Stephan Richter --- .../messagebus/events/BookmarkEvent.java | 4 +- .../umbrella/messagebus/events/Event.java | 6 +-- .../umbrella/messagebus/events/ItemEvent.java | 2 +- .../messagebus/events/JournalEntry.java | 38 +++++++++++-------- .../messagebus/events/ProjectEvent.java | 21 ++++------ .../umbrella/messagebus/events/TaskEvent.java | 22 ++++------- .../messagebus/events/TransactionEvent.java | 25 ++++++------ .../umbrella/messagebus/events/WikiEvent.java | 15 ++------ .../umbrella/core/model/Bookmark.java | 2 +- .../srsoftware/umbrella/core/model/Item.java | 2 +- .../umbrella/core/model/Project.java | 2 +- .../srsoftware/umbrella/core/model/Task.java | 2 +- .../umbrella/core/model/Transaction.java | 2 +- .../umbrella/core/model/Translatable.java | 9 ++++- ...{ObjectWithId.java => UmbrellaObject.java} | 18 +++++---- .../umbrella/core/model/WikiPage.java | 2 +- frontend/src/routes/journal/related.svelte | 4 +- .../umbrella/journal/JournalModule.java | 3 +- .../srsoftware/umbrella/journal/SqliteDb.java | 4 +- .../umbrella/message/MessageSystem.java | 8 +++- translations/src/main/resources/de.json | 2 +- translations/src/main/resources/en.json | 2 +- 22 files changed, 100 insertions(+), 95 deletions(-) rename core/src/main/java/de/srsoftware/umbrella/core/model/{ObjectWithId.java => UmbrellaObject.java} (76%) diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/BookmarkEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/BookmarkEvent.java index 0447e8e7..15d78b76 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/BookmarkEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/BookmarkEvent.java @@ -22,7 +22,7 @@ public class BookmarkEvent extends Event { } @Override - public Translatable describe() { + public Translatable describe(boolean verbose) { return switch (eventType()){ case CREATE -> t("New bookmark created"); case DELETE -> t("The bookmark '{url}' has been deleted", Field.URL, payload().url()); @@ -33,7 +33,7 @@ public class BookmarkEvent extends Event { @Override public Translatable subject() { - return describe(); + return describe(false); } diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java index 1c493892..aa8d0cb1 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java @@ -5,8 +5,8 @@ import static de.srsoftware.umbrella.core.constants.Field.*; import static java.util.Optional.*; import de.srsoftware.tools.Diff; -import de.srsoftware.umbrella.core.model.ObjectWithId; import de.srsoftware.umbrella.core.model.Translatable; +import de.srsoftware.umbrella.core.model.UmbrellaObject; import de.srsoftware.umbrella.core.model.UmbrellaUser; import java.util.Collection; import java.util.HashMap; @@ -14,7 +14,7 @@ import java.util.Map; import java.util.Optional; import org.json.JSONObject; -public abstract class Event { +public abstract class Event { public enum EventType { CREATE, @@ -47,7 +47,7 @@ public abstract class Event { public abstract Collection audience(); - public abstract Translatable describe(); + public abstract Translatable describe(boolean verbose); private Map dropMarkdown(Map map) { var result = new HashMap(); diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ItemEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ItemEvent.java index 727582f8..2fa588e8 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ItemEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ItemEvent.java @@ -24,7 +24,7 @@ public class ItemEvent extends Event{ } @Override - public Translatable describe() { + public Translatable describe(boolean verbose) { return switch (eventType()){ case CREATE -> describeCreate(); case null, default -> null; diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java index 6c02e23d..2efa7bb1 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java @@ -1,23 +1,25 @@ /* © SRSoftware 2025 */ package de.srsoftware.umbrella.messagebus.events; -import static de.srsoftware.umbrella.core.Util.mapMarkdown; import static de.srsoftware.umbrella.core.constants.Field.*; import static java.time.ZoneOffset.UTC; -import de.srsoftware.umbrella.core.model.ObjectWithId; +import de.srsoftware.umbrella.core.model.Translatable; +import de.srsoftware.umbrella.core.model.UmbrellaObject; import java.sql.ResultSet; import java.sql.SQLException; import java.time.LocalDateTime; import java.util.Map; +import org.json.JSONObject; -public class JournalEntry extends ObjectWithId { +public class JournalEntry extends UmbrellaObject { LocalDateTime timestamp; long userId, entityId; - String action, description, module; + String action, module; + Translatable description; - public JournalEntry(long id, LocalDateTime timestamp, long userId, String module, long entityId, String action, String description){ + public JournalEntry(long id, LocalDateTime timestamp, long userId, String module, long entityId, String action, Translatable description){ super(id); this.timestamp = timestamp; this.userId = userId; @@ -33,24 +35,30 @@ public class JournalEntry extends ObjectWithId { var module = rs.getString(MODULE); var entityId = rs.getLong(ENTITY_ID); var action = rs.getString(ACTION); - var description = rs.getString(DESCRIPTION); + var json = new JSONObject(rs.getString(DESCRIPTION)); + var message = json.getString(TEXT); + var fills = json.getJSONObject(DATA).toMap(); - return new JournalEntry(id, timestamp, userId, module, entityId, action, description); + return new JournalEntry(id, timestamp, userId, module, entityId, action, new Translatable(message,fills)); } public long userId(){ return userId; } - @Override - public Map toMap() { + public Map toMap(String lang){ return map( - TIMESTAMP, timestamp, - USER_ID, userId, - MODULE, module, - ENTITY_ID, entityId, - ACTION, action, - DESCRIPTION, mapMarkdown(description) + TIMESTAMP, timestamp, + USER_ID, userId, + MODULE, module, + ENTITY_ID, entityId, + ACTION, action, + DESCRIPTION, description.translate(lang) ); } + + @Override + public Map toMap() { + return toMap(null); + } } diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ProjectEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ProjectEvent.java index 0113f962..16dfd656 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ProjectEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ProjectEvent.java @@ -36,28 +36,27 @@ public class ProjectEvent extends Event{ } @Override - public Translatable describe() { + public Translatable describe(boolean verbose) { return switch (eventType()){ - case CREATE -> describeCreate(); + case CREATE -> describeCreate(verbose); case DELETE -> t("The project '{project}' has been deleted by {user}", Field.PROJECT, payload().name(), USER, initiator().name()); case MEMBER_ADDED -> describeMemberAdded(); case UPDATE -> describeUpdate(); }; } - private Translatable describeCreate() { - var head = t("You have been added to the new project '{project}', created by {user}:\n\n{body}", Field.PROJECT, payload().name(), BODY, payload().description(), USER, initiator().name()); - return t("{head}\n\n{link}","head",head,"link",link()); + private Translatable describeCreate(boolean verbose) { + var description = t("{user} created a new project \"{project}\"",USER,initiator().name(),Field.PROJECT,payload().name()); + if (verbose) description = t("{title}:\n\n{description}", TITLE,description, DESCRIPTION, payload().description()); + return description; } private Translatable describeMemberAdded() { - var head = t("'{name}' has been added to '{object}' by '{user}'.",NAME,newMember.name(),Field.OBJECT,payload().name(),USER,initiator().name()); - return t("{head}\n\n{link}","head",head,"link",link()); + return t("\"{name}\" has been added to \"{object}\" by \"{user}\"",NAME,newMember.name(),Field.OBJECT,payload().name(),USER,initiator().name()); } private Translatable describeUpdate() { - var head = t("Changes in project '{project}':\n\n{body}",Field.PROJECT,payload().name(),BODY,diff().orElse("")); - return t("{head}\n\n{link}","head",head,"link",link()); + return t("Changes in project '{project}':\n\n{body}",Field.PROJECT,payload().name(),BODY,diff().orElse("")); } @Override @@ -74,10 +73,6 @@ public class ProjectEvent extends Event{ return false; } - private Translatable link() { - return t("You can view/edit this project at {base_url}/project/{id}/view",ID,payload().id()); - } - @Override public long objectId() { return payload().id(); diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java index 9f4e6558..a7dfb7ab 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java @@ -39,16 +39,16 @@ public class TaskEvent extends Event{ } @Override - public Translatable describe() { + public Translatable describe(boolean verbose) { return switch (eventType()){ - case CREATE -> describeCreate(); + case CREATE -> describeCreate(verbose); case DELETE -> t("The task '{task}' has been deleted by {user}",Field.TASK, payload().name(), USER, initiator().name()); case MEMBER_ADDED -> describeMemberAdded(); case UPDATE -> describeUpdate(); }; } - private Translatable describeCreate() { + private Translatable describeCreate(boolean verbose) { String parentName = null; var pid = payload().parentTaskId(); if (pid != null) { @@ -60,18 +60,17 @@ public class TaskEvent extends Event{ if (project != null) parentName = project.name(); } if (parentName == null) parentName = "?"; - var head = t("'{task}' has been added to '{object}':\n\n{body}", Field.TASK, payload().name(), OBJECT, parentName, BODY, payload().description()); - return t("{head}\n\n{link}","head",head,"link",link()); + var description = t("\"{name}\" has been added to \"{object}\" by \"{user}\"", NAME,payload().name(), OBJECT, parentName, USER, initiator().name()); + if (verbose) description = t("{title}:\n\n{description}", TITLE,description, DESCRIPTION,payload().description()); + return description; } private Translatable describeMemberAdded() { - var head = t("'{name}' has been added to '{object}' by '{user}'.",NAME,newMember.name(), OBJECT,payload().name(),USER,initiator().name()); - return t("{head}\n\n{link}","head",head,"link",link()); + return t("\"{name}\" has been added to \"{object}\" by \"{user}\"",NAME,newMember.name(), OBJECT,payload().name(),USER,initiator().name()); } private Translatable describeUpdate() { - var head = t("Changes in task '{task}':\n\n{body}",Field.TASK,payload().name(),BODY,diff().orElse("")); - return t("{head}\n\n{link}","head",head,"link",link()); + return t("Changes in task '{task}':\n\n{body}",Field.TASK,payload().name(),BODY,diff().orElse("")); } @Override @@ -92,11 +91,6 @@ public class TaskEvent extends Event{ return false; } - private Translatable link() { - return t("You can view/edit this task at {base_url}/task/{id}/view",ID,payload().id()); - } - - @Override public Translatable subject() { return switch (eventType()){ diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TransactionEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TransactionEvent.java index 00d9f7b4..7e668d0b 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TransactionEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TransactionEvent.java @@ -34,32 +34,33 @@ public class TransactionEvent extends Event { } @Override - public Translatable describe() { + public Translatable describe(boolean verbose) { var user = initiator().name(); var type = t(Text.TRANSACTION); var entity = payload().purpose(); return switch (eventType()){ - case CREATE -> describeDetail(); - case DELETE -> describeDetail(); + case CREATE, DELETE -> describeDetail(); case UPDATE -> describeUpdate(); case null, default -> t("TODO"); // TODO }; } private Translatable describeUpdate() { - var head = t("Changes in {type} '{entity}':\n\n{body}",Field.TYPE,t(Text.TRANSACTION),Field.ENTITY,oldData().get(PURPOSE),BODY,diff().orElse("")); - return t("{head}\n\n{link}","head",head,"link",link()); + return t("Changes in {type} '{entity}':\n\n{body}",Field.TYPE,t(Text.TRANSACTION),Field.ENTITY,oldData().get(PURPOSE),BODY,diff().orElse("")); } private Translatable describeDetail(){ - var tr = payload(); + var transaction = payload(); - var message = "{source}: {source_name}\n{destination}: {dest_name}\n{amount}: {value}\n{purpose}: {purpose_val}\n\n{link}"; - return t(message,SOURCE,t(Text.SOURCE), "source_name",tr.source(), DESTINATION,t(Text.DESTINATION),"dest_name",tr.destination(), AMOUNT,t(Text.AMOUNT), VALUE,tr.amount(), PURPOSE,t(Text.PURPOSE),"purpose_val",tr.purpose(),"link",link()); - } - - private Translatable link() { - return t("You can view/edit this transaction at {base_url}/account/{id}", ID, payload().accountId()); + return t("{source}: {source_name}\n{destination}: {dest_name}\n{amount}: {value}\n{purpose}: {purpose_val}", + SOURCE,t(Text.SOURCE), + "source_name",transaction.source(), + DESTINATION, t(Text.DESTINATION), + "dest_name", transaction.destination(), + AMOUNT, t(Text.AMOUNT), + VALUE, transaction.amount(), + PURPOSE, t(Text.PURPOSE), + "purpose_val",transaction.purpose()); } @Override diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java index d4e9240c..a04ea38d 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java @@ -36,7 +36,7 @@ public class WikiEvent extends Event{ } @Override - public Translatable describe() { + public Translatable describe(boolean verbose) { return switch (eventType()){ case CREATE -> describeCreate(); case DELETE -> describeDelete(); @@ -46,8 +46,7 @@ public class WikiEvent extends Event{ } public Translatable describeCreate(){ - var head = t("New wiki page {name} has been created"); - return t("{head}:\n\n{object}\n\n{link}","head",head,OBJECT,payload().content(),"link",link()); + return t("New wiki page {name} has been created"); } public Translatable describeDelete(){ @@ -55,17 +54,11 @@ public class WikiEvent extends Event{ } public Translatable describeMemberAdded(){ - var head = t("'{name}' has been added to '{object}' by '{user}'.",NAME,newMember.name(), OBJECT,payload().title(),USER,initiator().name()); - return t("{head}\n\n{link}","head",head,"link",link()); + return t("\"{name}\" has been added to \"{object}\" by \"{user}\"",NAME,newMember.name(), OBJECT,payload().title(),USER,initiator().name()); } private Translatable describeUpdate() { - var head = t("Changes in wiki page '{id}':\n\n{body}",Field.ID,payload().title(),BODY,diff().orElse("")); - return t("{head}\n\n{link}","head",head,"link",link()); - } - - private Translatable link() { - return t("You can view/edit this wiki page at {base_url}/wiki/{id}/view",ID,payload().id()); + return t("Changes in wiki page '{id}':\n\n{body}",Field.ID,payload().title(),BODY,diff().orElse("")); } @Override diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Bookmark.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Bookmark.java index baedb3db..7ea5d7d2 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Bookmark.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Bookmark.java @@ -13,7 +13,7 @@ import java.util.Collection; import java.util.Map; import java.util.Objects; -public final class Bookmark extends ObjectWithId { +public final class Bookmark extends UmbrellaObject { private final String url; private final String comment; private final LocalDateTime timestamp; diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Item.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Item.java index 657eedef..17d08d1c 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Item.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Item.java @@ -11,7 +11,7 @@ import java.sql.SQLException; import java.util.*; import org.json.JSONObject; -public class Item extends ObjectWithId { +public class Item extends UmbrellaObject { private long ownerNumber; // id is the database key, number the owner-relative id private final Owner owner; private String code, description, name; diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Project.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Project.java index 63095423..d4dce056 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Project.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Project.java @@ -12,7 +12,7 @@ import java.sql.SQLException; import java.util.*; import org.json.JSONObject; -public class Project extends ObjectWithId { +public class Project extends UmbrellaObject { private final Map members; private final Collection allowedStates; private boolean showClosed; diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Task.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Task.java index 3b60d13e..cf8f08fb 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Task.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Task.java @@ -14,7 +14,7 @@ import java.time.LocalDate; import java.util.*; import org.json.JSONObject; -public class Task extends ObjectWithId { +public class Task extends UmbrellaObject { public static final System.Logger LOG = System.getLogger(Task.class.getSimpleName()); private final long projectId; private Long parentTaskId; diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Transaction.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Transaction.java index 90decad2..b4ba0b24 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Transaction.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Transaction.java @@ -13,7 +13,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -public class Transaction extends ObjectWithId { +public class Transaction extends UmbrellaObject { private final long accountId; private LocalDateTime date; private IdOrString source, destination; diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/Translatable.java b/core/src/main/java/de/srsoftware/umbrella/core/model/Translatable.java index bdebd58a..31236c5a 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/Translatable.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Translatable.java @@ -3,11 +3,13 @@ package de.srsoftware.umbrella.core.model; import static de.srsoftware.tools.Optionals.*; +import de.srsoftware.tools.Mappable; import de.srsoftware.umbrella.core.ModuleRegistry; +import de.srsoftware.umbrella.core.constants.Field; import java.util.HashMap; import java.util.Map; -public class Translatable { +public class Translatable implements Mappable { protected final String message; private final Map fills; private final HashMap translated = new HashMap<>(); @@ -40,6 +42,11 @@ public class Translatable { return new Translatable(message,args); } + @Override + public Map toMap() { + return Map.of(Field.TEXT,message,Field.DATA,fills); + } + public String translate(String language){ var translation = language == null ? null : translated.get(language); if (translation == null){ diff --git a/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java b/core/src/main/java/de/srsoftware/umbrella/core/model/UmbrellaObject.java similarity index 76% rename from core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java rename to core/src/main/java/de/srsoftware/umbrella/core/model/UmbrellaObject.java index 471f303a..54844e6f 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/model/ObjectWithId.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/model/UmbrellaObject.java @@ -7,10 +7,10 @@ import java.security.InvalidParameterException; import java.util.HashMap; import java.util.Map; -public abstract class ObjectWithId implements Mappable { +public abstract class UmbrellaObject implements Mappable { private long id; - public ObjectWithId(long id){ + public UmbrellaObject(long id){ this.id = id; } @@ -18,11 +18,6 @@ public abstract class ObjectWithId implements Mappable { return id; } - public ObjectWithId setId(long newValue){ - id = newValue; - return this; - } - protected Map map(Object ... keysAndValues) { if (keysAndValues.length % 2 != 0) throw new InvalidParameterException("Expected even number of keys and parameters!"); var map = new HashMap(); @@ -30,4 +25,13 @@ public abstract class ObjectWithId implements Mappable { for (var idx = 0; idx{entry.timestamp.replace('T',' ')} {data.user_list[entry.user_id].name}: {t(entry.action)} -
- {@html entry.description.rendered} -
+ 
{entry.description}
{/each} diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java index e11e6a22..c80608b9 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/JournalModule.java @@ -21,7 +21,6 @@ import de.srsoftware.umbrella.core.exceptions.UmbrellaException; import de.srsoftware.umbrella.core.model.Token; import de.srsoftware.umbrella.messagebus.EventListener; import de.srsoftware.umbrella.messagebus.events.Event; -import de.srsoftware.umbrella.messagebus.events.JournalEntry; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -59,7 +58,7 @@ public class JournalModule extends BaseHandler implements EventListener { for (var entry : entries) userMap.put(entry.userId(),loader.get(entry.userId()).toMap()); return sendContent(ex,Map.of( Field.USER_LIST,userMap, - Field.JOURNAL,entries.stream().map(JournalEntry::toMap).toList() + Field.JOURNAL,entries.stream().map(entry -> entry.toMap(user.get().language())).toList() )); } catch (NumberFormatException e) { throw invalidField(Field.ENTITY_ID, Text.NUMBER); diff --git a/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java b/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java index 93c915e2..e3c7a1b8 100644 --- a/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java +++ b/journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java @@ -21,6 +21,7 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.ArrayList; import java.util.List; +import org.json.JSONObject; public class SqliteDb extends BaseDb implements JournalDb{ public SqliteDb(Connection connection) { @@ -74,8 +75,9 @@ public class SqliteDb extends BaseDb implements JournalDb{ public void logEvent(Event event) { try { var timestamp = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC); + var description = new JSONObject(event.describe(false).toMap()).toString(2); insertInto(TABLE_JOURNAL,TIMESTAMP,USER_ID,MODULE,ENTITY_ID,ACTION,DESCRIPTION) - .values(timestamp,event.initiator().id(), event.module(), event.objectId(), event.eventType(), event.describe()) + .values(timestamp,event.initiator().id(), event.module(), event.objectId(), event.eventType(), description) .execute(db).close(); } catch (SQLException e) { throw databaseException(ERROR_WRITE_EVENT,event.eventType(),event.initiator().name()); diff --git a/messages/src/main/java/de/srsoftware/umbrella/message/MessageSystem.java b/messages/src/main/java/de/srsoftware/umbrella/message/MessageSystem.java index c10b35a4..d244891f 100644 --- a/messages/src/main/java/de/srsoftware/umbrella/message/MessageSystem.java +++ b/messages/src/main/java/de/srsoftware/umbrella/message/MessageSystem.java @@ -172,8 +172,12 @@ public class MessageSystem extends BaseHandler implements PostBox, EventListener @Override public void onEvent(Event event) { - var message = new TranslatableMessage(event.initiator(),event.subject(),event.describe(),null); - var audience = new HashSet<>(event.audience()); + var description = event.describe(true); + var payload = event.payload(); + var location = t("You can view/edit this {object} at {base_url}/{path}", OBJECT,t(payload.getClass().getSimpleName()), PATH,payload.path()); + var body = t("{description}\n\n{location}", DESCRIPTION,description, LOCATION,location); + var message = new TranslatableMessage(event.initiator(),event.subject(),body,null); + var audience = new HashSet<>(event.audience()); audience.remove(event.initiator()); send(new Envelope<>(0,message,audience)); } diff --git a/translations/src/main/resources/de.json b/translations/src/main/resources/de.json index dfb2cefa..41c26d6c 100644 --- a/translations/src/main/resources/de.json +++ b/translations/src/main/resources/de.json @@ -257,7 +257,7 @@ "my files": "Meine Dateien", "name": "Name", - "'{name}' has been added to '{object}' by '{user}'.": "'{name}' wurde von {user} zu '{object}' hinzugefügt.", + "\"{name}\" has been added to \"{object}\" by \"{user}\"": "„{name}“ wurde von „{user}“ zu „{object}“ hinzugefügt", "net_price": "Nettopreis", "net_sum": "Netto-Summe", "new_contact": "neuer Kontakt", diff --git a/translations/src/main/resources/en.json b/translations/src/main/resources/en.json index 1f7279ec..c65d3ee9 100644 --- a/translations/src/main/resources/en.json +++ b/translations/src/main/resources/en.json @@ -257,7 +257,7 @@ "my files": "my files", "name": "Name", - "'{name}' has been added to '{object}' by '{user}'.": "'{name}' has been added to '{object}' by '{user}'.", + "\"{name}\" has been added to \"{object}\" by \"{user}\"": "\"{name}\" has been added to \"{object}\" by \"{user}\"", "net_price": "net price", "net_sum": "net sum", "new_contact": "new contact",