Merge branch 'module/journal' into dev

bus/src/main/java/de/srsoftware/umbrella/messagebus/events/BookmarkEvent.java

@@ -22,7 +22,7 @@ public class BookmarkEvent extends Event<Bookmark> {
 	}
 
 	@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<Bookmark> {
 
 	@Override
 	public Translatable subject() {
-		return describe();
+		return describe(false);
 	}
 
 

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.tools.Mappable;
 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,15 +14,15 @@ import java.util.Map;
 import java.util.Optional;
 import org.json.JSONObject;
 
-public abstract class Event<Payload extends Mappable> {
+public abstract class Event<Payload extends UmbrellaObject> {
 
 	public enum EventType {
 		CREATE,
 		MEMBER_ADDED,
 		UPDATE,
 		DELETE;
-	}
 
+	}
 	private final UmbrellaUser initiator;
 	private final String module;
 	private final Payload payload;
@@ -39,15 +39,15 @@ public abstract class Event<Payload extends Mappable> {
 
 	public Event(UmbrellaUser initiator, String module, Payload payload, Map<String, Object> oldData){
 		this.initiator = initiator;
-		this.module = module;
+		this.module    = module;
-		this.payload = payload;
+		this.payload   = payload;
 		this.eventType = EventType.UPDATE;
-		this.oldData = oldData;
+		this.oldData   = oldData;
 	}
 
 	public abstract Collection<UmbrellaUser> audience();
 
-	public abstract Translatable describe();
+	public abstract Translatable describe(boolean verbose);
 
 	private Map<String, Object> dropMarkdown(Map<String, Object> map) {
 		var result = new HashMap<String, Object>();
@@ -98,6 +98,10 @@ public abstract class Event<Payload extends Mappable> {
 		return module;
 	}
 
+	public long objectId() {
+		return payload.id();
+	};
+
 	protected Map<String, Object> oldData() {
 		return oldData;
 	}

bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ItemEvent.java

@@ -24,7 +24,7 @@ public class ItemEvent extends Event<Item>{
 	}
 
 	@Override
-	public Translatable describe() {
+	public Translatable describe(boolean verbose) {
 		return switch (eventType()){
 			case CREATE -> describeCreate();
 			case null, default -> null;
@@ -36,6 +36,10 @@ public class ItemEvent extends Event<Item>{
 		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() {

bus/src/main/java/de/srsoftware/umbrella/messagebus/events/JournalEntry.java

@@ -0,0 +1,64 @@
+/* © SRSoftware 2025 */
+package de.srsoftware.umbrella.messagebus.events;
+
+import static de.srsoftware.umbrella.core.constants.Field.*;
+import static java.time.ZoneOffset.UTC;
+
+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 UmbrellaObject {
+
+	LocalDateTime timestamp;
+	long userId, entityId;
+	String action, module;
+	Translatable 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;
+		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   = LocalDateTime.ofEpochSecond(rs.getLong(TIMESTAMP),0, UTC);
+		var userId      = rs.getLong(USER_ID);
+		var module      = rs.getString(MODULE);
+		var entityId    = rs.getLong(ENTITY_ID);
+		var action      = rs.getString(ACTION);
+		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, new Translatable(message,fills));
+	}
+
+	public long userId(){
+		return userId;
+	}
+
+	public Map<String, Object> toMap(String lang){
+		return map(
+				TIMESTAMP,  timestamp,
+				USER_ID,     userId,
+				MODULE,      module,
+				ENTITY_ID,   entityId,
+				ACTION,      action,
+				DESCRIPTION, description.translate(lang)
+		);
+	}
+
+	@Override
+	public Map<String, Object> toMap() {
+		return toMap(null);
+	}
+}

bus/src/main/java/de/srsoftware/umbrella/messagebus/events/ProjectEvent.java

@@ -36,28 +36,27 @@ public class ProjectEvent extends Event<Project>{
 	}
 
 	@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() {
+	private Translatable describeCreate(boolean verbose) {
-		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());
+		var description = t("{user} created a new project \"{project}\"",USER,initiator().name(),Field.PROJECT,payload().name());
-		return t("{head}\n\n{link}","head",head,"link",link());
+		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("\"{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());
 	}
 
 	private Translatable describeUpdate() {
-		var head = t("Changes in project '{project}':\n\n{body}",Field.PROJECT,payload().name(),BODY,diff().orElse(""));
+		return 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());
 	}
 
 	@Override
@@ -74,8 +73,9 @@ public class ProjectEvent extends Event<Project>{
 		return false;
 	}
 
-	private Translatable link() {
+	@Override
-		return t("You can view/edit this project at {base_url}/project/{id}/view",ID,payload().id());
+	public long objectId() {
+		return payload().id();
 	}
 
 	@Override

bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TaskEvent.java

@@ -39,16 +39,16 @@ public class TaskEvent extends Event<Task>{
 	}
 
 	@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<Task>{
 			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());
+		var description = t("\"{name}\" has been added to \"{object}\" by \"{user}\"", NAME,payload().name(), OBJECT, parentName, USER, initiator().name());
-		return t("{head}\n\n{link}","head",head,"link",link());
+		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("\"{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());
 	}
 
 	private Translatable describeUpdate() {
-		var head = t("Changes in task '{task}':\n\n{body}",Field.TASK,payload().name(),BODY,diff().orElse(""));
+		return 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());
 	}
 
 	@Override
@@ -92,10 +91,6 @@ public class TaskEvent extends Event<Task>{
 		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()){

bus/src/main/java/de/srsoftware/umbrella/messagebus/events/TransactionEvent.java

@@ -34,32 +34,38 @@ public class TransactionEvent extends Event<Transaction> {
 	}
 
 	@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 CREATE, DELETE -> describeDetail();
-			case 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("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());
 	}
 
 	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("{source}: {source_name}\n{destination}: {dest_name}\n{amount}: {value}\n{purpose}: {purpose_val}",
-		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());
+				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());
 	}
 
-	private Translatable link() {
+	@Override
-		return t("You can view/edit this transaction at {base_url}/account/{id}", ID, payload().accountId());
+	public long objectId() {
+		return payload().id();
 	}
 
 	@Override

bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java

@@ -36,7 +36,7 @@ public class WikiEvent extends Event<WikiPage>{
 	}
 
 	@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<WikiPage>{
 	}
 
 	public Translatable describeCreate(){
-		var head = t("New wiki page {name} has been created");
+		return t("New wiki page {name} has been created");
-		return t("{head}:\n\n{object}\n\n{link}","head",head,OBJECT,payload().content(),"link",link());
 	}
 
 	public Translatable describeDelete(){
@@ -55,20 +54,18 @@ public class WikiEvent extends Event<WikiPage>{
 	}
 
 	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("\"{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());
 	}
 
 	private Translatable describeUpdate() {
-		var head = t("Changes in wiki page '{id}':\n\n{body}",Field.ID,payload().title(),BODY,diff().orElse(""));
+		return 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() {
+	@Override
-		return t("You can view/edit this wiki page at {base_url}/wiki/{id}/view",ID,payload().id());
+	public long objectId() {
+		return payload().id();
 	}
 
-
 	@Override
 	public Translatable subject() {
 		return switch (eventType()){

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<Long, UmbrellaUser> list(Integer start, Integer limit, Collection<Long> ids) throws UmbrellaException;
+	HashMap<Long,UmbrellaUser> loader();
 	Session load(Token token) throws UmbrellaException;
 	UmbrellaUser load(Session session) throws UmbrellaException;
 	Optional<UmbrellaUser> load(EmailAddress email) throws UmbrellaException;

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";

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";
 

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<String> tags) implements Mappable {
+public final class Bookmark extends UmbrellaObject {
+	private final String url;
+	private final String comment;
+	private final LocalDateTime timestamp;
+	private final Collection<String> tags;
 
-	public static Bookmark of(ResultSet rs) throws SQLException {
+	public Bookmark(long urlId, String url, String comment, LocalDateTime timestamp, Collection<String> tags) {
-		return new Bookmark(rs.getLong(ID),rs.getString(URL),rs.getString(COMMENT),LocalDateTime.ofEpochSecond(rs.getLong(TIMESTAMP),0, UTC),new ArrayList<>());
+		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){
+	public static Bookmark of(ResultSet rs) throws SQLException {
-		return new Bookmark(urlId,url,comment,timestamp,new ArrayList<>());
+		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<String, Object> toMap() {
-		return Map.of(
+		return map(
-				ID, urlId,
 				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<String> 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 + ']';
+	}
+
 }

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 {
+public class Item extends UmbrellaObject {
-	private long id, ownerNumber; // id is the database key, number the owner-relative id
+	private long ownerNumber; // id is the database key, number the owner-relative id
-	private Owner owner;
+	private final Owner owner;
 	private String code, description, name;
 	private Location location;
-	private Collection<Property> properties;
+	private final Collection<Property> properties;
-	private Set<String> dirtyFields = new HashSet<>();
+	private final Set<String> 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<String, Object> toMap() {
-		var map = new HashMap<String,Object>();
+		var map = super.map(
-		map.put(OWNER,owner.toMap());
+				OWNER,owner.toMap(),
-		map.put(ID,id);
+				LOCATION,location.toMap(),
-		map.put(LOCATION,location.toMap());
+				Field.CODE,code,
-		map.put(Field.CODE,code);
+				NAME,name,
-		map.put(NAME,name);
+				DESCRIPTION,mapMarkdown(description),
-		map.put(DESCRIPTION,mapMarkdown(description));
+				OWNER_NUMBER,ownerNumber);
-		map.put(OWNER_NUMBER,ownerNumber);
 		if (properties != null) map.put(PROPERTIES,properties.stream().map(Property::toMap).toList());
 		return map;
 	}

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

@@ -6,27 +6,25 @@ import static de.srsoftware.umbrella.core.Util.mapMarkdown;
 import static de.srsoftware.umbrella.core.constants.Field.*;
 import static de.srsoftware.umbrella.core.model.Status.PREDEFINED;
 
-import de.srsoftware.tools.Mappable;
 import de.srsoftware.umbrella.core.constants.Field;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
 import org.json.JSONObject;
 
-public class Project implements Mappable {
+public class Project extends UmbrellaObject {
 	private final Map<Long,Member> members;
 	private final Collection<Status> allowedStates;
 	private boolean showClosed;
 	private Long companyId;
 	private int status;
 	private String name;
-	private final long id;
 	private String description;
 	private final Set<String> dirtyFields = new HashSet<>();
 	private final Map<String,String> tagColors = new HashMap<>();
 
 	public Project(long id, String name, String description, int status, Long companyId, boolean showClosed, Map<Long,Member> members, Collection<Status> 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<String, Object> toMap() {
-		var map = new HashMap<String, Object>();
 		var memberMap = new HashMap<Long,Map<String,Object>>();
 		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<Integer,String>();
 		for (var state : allowedStates) stateMap.put(state.code(),state.name());
-		map.put(Field.ALLOWED_STATES,stateMap);
+		return super.map(
-		map.put(TAG_COLORS,tagColors);
+				NAME,name,
-		return map;
+				DESCRIPTION,mapMarkdown(description),
+				STATUS,status,
+				COMPANY_ID,companyId,
+				SHOW_CLOSED,showClosed,
+				MEMBERS,memberMap,
+				Field.ALLOWED_STATES,stateMap,
+				TAG_COLORS,tagColors);
 	}
 
 	@Override

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 UmbrellaObject {
 	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<Long> requiredTasksIds;
@@ -30,7 +29,7 @@ public class Task implements Mappable {
 	private final Set<String> 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<Long,Member> 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<String,Object> toMap(boolean renderMarkdown){
-		var map = new HashMap<String,Object>();
 		var memberMap = new HashMap<Long,Map<String,Object>>();
 		if (members != null) for (var entry : members.entrySet()){
 			memberMap.put(entry.getKey(),entry.getValue().toMap());
 		}
-		map.put(ID, id);
+		return map(
-		map.put(PROJECT_ID, projectId);
+			PROJECT_ID, projectId,
-		map.put(PARENT_TASK_ID, parentTaskId);
+			PARENT_TASK_ID, parentTaskId,
-		map.put(PRIORITY,priority);
+			PRIORITY,priority,
-		map.put(NAME, name);
+			NAME, name,
-		map.put(DESCRIPTION, renderMarkdown ? mapMarkdown(description) : Map.of(SOURCE,description));
+			DESCRIPTION, renderMarkdown ? mapMarkdown(description) : Map.of(SOURCE,description),
-		map.put(STATUS, status);
+			STATUS, status,
-		map.put(EST_TIME, estimatedTime);
+			EST_TIME, estimatedTime,
-		map.put(START_DATE,start);
+			START_DATE,start,
-		map.put(DUE_DATE,dueDate);
+			DUE_DATE,dueDate,
-		map.put(NO_INDEX,noIndex);
+			NO_INDEX,noIndex,
-		map.put(MEMBERS,memberMap);
+			MEMBERS,memberMap,
-		map.put(REQUIRED_TASKS_IDS,requiredTasksIds);
+			REQUIRED_TASKS_IDS,requiredTasksIds,
-		map.put(SHOW_CLOSED,showClosed);
+			SHOW_CLOSED,showClosed,
-		map.put(TOTAL_PRIO,totalPrio());
+			TOTAL_PRIO,totalPrio(),
-		map.put(TAGS,tags);
+			TAGS,tags
-		return map;
+		);
 	}
 
 	@Override

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;
@@ -14,17 +13,17 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-public class Transaction implements Mappable {
+public class Transaction extends UmbrellaObject {
-	private long accountId, id;
+	private final long accountId;
 	private LocalDateTime date;
 	private IdOrString source, destination;
 	private double amount;
 	private String purpose;
-	private Set<String> tags;
+	private final Set<String> tags;
-	private HashSet<String> dirtyFields = new HashSet<>();
+	private final HashSet<String> dirtyFields = new HashSet<>();
 
 	public Transaction(long id, long accountId, LocalDateTime date, IdOrString source, IdOrString destination, double amount, String purpose, Set<String> tags){
-		this.id          = id;
+		super(id);
 		this.accountId   = accountId;
 		this.date        = date;
 		this.source      = source;
@@ -77,10 +76,6 @@ public class Transaction implements Mappable {
 		return this;
 	}
 
-	public long id(){
-		return id;
-	}
-
 	public boolean isDirty(){
 		return !dirtyFields.isEmpty();
 	}
@@ -123,8 +118,7 @@ public class Transaction implements Mappable {
 
 	@Override
 	public Map<String, Object> toMap() {
-		return Map.of(
+		return super.map(
-				Field.ID, id,
 				Field.ACCOUNT, accountId,
 				Field.DATE, date.toLocalDate(),
 				Field.SOURCE, source.toMap(),

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<String, Object> fills;
 	private final HashMap<String,String> translated = new HashMap<>();
@@ -40,6 +42,11 @@ public class Translatable {
 		return new Translatable(message,args);
 	}
 
+	@Override
+	public Map<String, Object> 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){

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

@@ -0,0 +1,37 @@
+/* © 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;
+
+public abstract class UmbrellaObject implements Mappable {
+	private long id;
+
+	public UmbrellaObject(long id){
+		this.id = id;
+	}
+
+	public long id(){
+		return id;
+	}
+
+	protected Map<String, Object> map(Object ... keysAndValues) {
+		if (keysAndValues.length % 2 != 0) throw new InvalidParameterException("Expected even number of keys and parameters!");
+		var map = new HashMap<String, Object>();
+		map.put(Field.ID,id);
+		for (var idx = 0; idx<keysAndValues.length; idx+=2) map.put(keysAndValues[idx].toString(),keysAndValues[idx+1]);
+		return map;
+	}
+
+	public String path(){
+		return getClass().getSimpleName().toLowerCase()+"/"+id()+"/view";
+	}
+
+	public UmbrellaObject setId(long newValue){
+		id = newValue;
+		return this;
+	}
+}

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 UmbrellaObject {
 
-	private final long id;
 	private String title;
 	private int version;
 	private final Set<Integer> 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<Long,Map<String,Object>>();
 		for (var entry : members.entrySet()) memberMap.put(entry.getKey(),entry.getValue().toMap());
 
-		return Map.of(
+		return map(
-				ID,id,
 				CONTENT,mapMarkdown(content),
 				GUEST_ALLOWED,guestAllowed,
 				MEMBERS,memberMap,

frontend/src/routes/journal/related.svelte

@@ -0,0 +1,29 @@
+<script>
+	import { api, get } from '../../urls.svelte';
+	import { error, yikes } from '../../warn.svelte';
+	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);
+</script>
+
+<ul>
+	{#each data.journal as entry (entry.id)}
+	<li>
+		<span class="date">{entry.timestamp.replace('T',' ')}</span>
+		<span class="actor">{data.user_list[entry.user_id].name}</span>:
+		<span class="action">{t(entry.action)}</span>
+		<pre>{entry.description}</pre>
+	</li>
+	{/each}
+</ul>

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';
@@ -365,8 +366,13 @@
 
     <h3>{t('notes')}</h3>
     <div>
-    <Notes module="task" entity_id={id} />
+        <Notes module="task" entity_id={id} />
     </div>
+    <h3>{t('Journal')}</h3>
+    <div>
+        <Journal module="task" entityId={id} />
+    </div>
+
 </div>
 {/if}
 

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

@@ -2,7 +2,11 @@
 package de.srsoftware.umbrella.journal;
 
 import de.srsoftware.umbrella.messagebus.events.Event;
+import de.srsoftware.umbrella.messagebus.events.JournalEntry;
+import java.util.List;
 
 public interface JournalDb {
 	void logEvent(Event<?> event);
+
+	List<JournalEntry> list(String module, long entityId);
 }

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

@@ -2,16 +2,29 @@
 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.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.messagebus.EventListener;
 import de.srsoftware.umbrella.messagebus.events.Event;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 
 
 public class JournalModule extends BaseHandler implements EventListener {
@@ -26,6 +39,35 @@ 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> 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);
+				var entries = journalDb.list(module, entityId);
+				var loader = userService().loader();
+				var userMap = new HashMap<Long,Object>();
+				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(entry -> entry.toMap(user.get().language())).toList()
+				));
+			} 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());

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

@@ -1,18 +1,27 @@
 /* © SRSoftware 2025 */
 package de.srsoftware.umbrella.journal;
 
+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.*;
-import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.failedToCreateTable;
 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.Text;
 import de.srsoftware.umbrella.messagebus.events.Event;
+import de.srsoftware.umbrella.messagebus.events.JournalEntry;
 import java.sql.Connection;
 import java.sql.SQLException;
+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) {
@@ -33,13 +42,15 @@ public class SqliteDb extends BaseDb implements JournalDb{
 		var sql = """
 				CREATE TABLE IF NOT EXISTS {0} (
 					{1} INTEGER PRIMARY KEY,
-					{2} INTEGER,
+					{2} LONG NOT NULL,
-					{3} VARCHAR(255) NOT NULL,
+					{3} INTEGER,
-					{4} VARCHAR(16) NOT NULL,
+					{4} VARCHAR(255) NOT NULL,
-					{5} TEXT
+					{5} VARCHAR(255),
+					{6} VARCHAR(16) NOT NULL,
+					{7} TEXT
 				);
 				""";
-		sql = format(sql,TABLE_JOURNAL,ID,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) {
@@ -47,11 +58,26 @@ public class SqliteDb extends BaseDb implements JournalDb{
 		}
 	}
 
+	@Override
+	public List<JournalEntry> 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<JournalEntry>();
+			while (rs.next()) list.add(JournalEntry.of(rs));
+			rs.close();
+			return list;
+		} catch (SQLException e) {
+			throw failedToLoadObject(Text.EVENT_LIST);
+		}
+	}
+
 	@Override
 	public void logEvent(Event<?> event) {
 		try {
-			insertInto(TABLE_JOURNAL,USER_ID,MODULE,ACTION,DESCRIPTION)
+			var timestamp = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
-					.values(event.initiator().id(), event.module(), event.eventType(), event.describe())
+			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(), description)
 					.execute(db).close();
 		} catch (SQLException e) {
 			throw databaseException(ERROR_WRITE_EVENT,event.eventType(),event.initiator().name());

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 description = event.describe(true);
-		var audience = new HashSet<>(event.audience());
+		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));
 	}

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);

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",

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",

user/src/main/java/de/srsoftware/umbrella/user/UserModule.java

@@ -161,6 +161,21 @@ public class UserModule extends BaseHandler implements UserService {
 		}
 	}
 
+	@Override
+	public HashMap<Long, UmbrellaUser> loader() {
+		return new HashMap<Long, UmbrellaUser>(){
+			@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;
+			}
+		};
+	}
+
 	@Override
 	public UmbrellaUser loadUser(long userId) throws UmbrellaException {
 		return users.load(userId);