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

refactoring

Browse Source
This commit is contained in:
Stephan Richter
2025-07-19 00:28:11 +02:00
parent a06217517b
commit 08838e8ddc
12 changed files with 180 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/de/srsoftware/umbrella/core/model/Member.java
View File

@@ -2,16 +2,14 @@
package de.srsoftware.umbrella.core.model;
import de.srsoftware.tools.Mappable;
import static de.srsoftware.umbrella.core.Constants.*;
import de.srsoftware.tools.Mappable;
import java.util.Map;
import static de.srsoftware.umbrella.core.Constants.PERMISSION;
import static de.srsoftware.umbrella.core.Constants.USER;
public record Member(UmbrellaUser user, Permission permission) implements Mappable {
public record Member(long userId, Permission permission) implements Mappable {
@Override
public Map<String, Object> toMap() {
return Map.of(USER,user.toMap(),PERMISSION,permission.name());
return Map.of(USER_ID,userId,PERMISSION,permission.name());
}
}

3
core/src/main/java/de/srsoftware/umbrella/core/model/Project.java
View File

@@ -2,6 +2,7 @@
package de.srsoftware.umbrella.core.model;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Util.markdown;
import de.srsoftware.tools.Mappable;
import java.sql.ResultSet;
@@ -47,7 +48,7 @@ public record Project(long id, String name, String description, Status status, L
var map = new HashMap<String, Object>();
map.put(ID,id);
map.put(NAME,name);
map.put(DESCRIPTION,description);
map.put(DESCRIPTION,Map.of(SOURCE,description,RENDERED,markdown(description)));
map.put(STATUS,Map.of(STATUS_CODE,status.code(), NAME,status.name()));
map.put(COMPANY_ID,companyId);
map.put(SHOW_CLOSED,showClosed);