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

working on project settings update:

Browse Source 
adding/updating members not implemented
This commit is contained in:
Stephan Richter
2025-07-21 00:16:14 +02:00
parent c8b6c3feb7
commit 6016f81c27
17 changed files with 169 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/de/srsoftware/umbrella/core/Constants.java
View File

@@ -12,6 +12,7 @@ public class Constants {
public static final String ATTACHMENTS = "attachments";
public static final String AUTHORIZATION = "Authorization";
public static final String BODY = "body";
public static final String CODE = "code";
public static final String COMPANY = "company";
public static final String COMPANY_ID = "company_id";
public static final String CONTENT_TYPE = "Content-Type";

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

@@ -10,6 +10,6 @@ import java.util.Map;
public record Member(long userId, Permission permission) implements Mappable {
@Override
public Map<String, Object> toMap() {
return Map.of(USER_ID,userId,PERMISSION,permission.name());
return Map.of(USER_ID,userId,PERMISSION,permission.toMap());
}
}

12
core/src/main/java/de/srsoftware/umbrella/core/model/Permission.java
View File

@@ -1,11 +1,16 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.core.model;
import de.srsoftware.tools.Mappable;
import static de.srsoftware.umbrella.core.Constants.CODE;
import static de.srsoftware.umbrella.core.Constants.NAME;
import static java.text.MessageFormat.format;
import java.security.InvalidParameterException;
import java.util.Map;
public enum Permission {
public enum Permission implements Mappable {
OWNER(1),
EDIT(2),
ASSIGNEE(3),
@@ -27,4 +32,9 @@ public enum Permission {
}
throw new InvalidParameterException(format("{0} is not a valid permission code"));
}
@Override
public Map<String, Object> toMap() {
return Map.of(NAME,name(),CODE,code);
}
}

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

@@ -1,18 +1,23 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.core.model;
import static de.srsoftware.tools.Optionals.isSet;
import static de.srsoftware.tools.Optionals.nullable;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Util.markdown;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.invalidFieldException;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.missingFieldException;
import de.srsoftware.tools.Mappable;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import org.json.JSONObject;
public class Project implements Mappable {
private final Collection<Member> members;
private final Map<Long,Member> members;
private final boolean showClosed;
private final Long companyId;
private Status status;
@@ -21,7 +26,7 @@ public class Project implements Mappable {
private String description;
private final Set<String> dirtyFields = new HashSet<>();
public Project(long id, String name, String description, Status status, Long companyId, boolean showClosed, Collection<Member> members) {
public Project(long id, String name, String description, Status status, Long companyId, boolean showClosed, Map<Long,Member> members) {
this.id = id;
this.name = name;
this.description = description;
@@ -44,17 +49,15 @@ public class Project implements Mappable {
}
public boolean hasMember(UmbrellaUser user) {
for (var member : members){
if (member.userId() == user.id()) return true;
}
return false;
var member = members.get(user.id());
return isSet(member) && member.userId() == user.id();
}
public long id(){
return id;
}
public Collection<Member> members(){
public Map<Long,Member> members(){
return members;
}
@@ -64,13 +67,14 @@ public class Project implements Mappable {
public static Project of(ResultSet rs) throws SQLException {
var companyId = rs.getLong(COMPANY_ID);
return new Project(rs.getLong(ID),rs.getString(NAME),rs.getString(DESCRIPTION),Status.of(rs.getInt(STATUS)),companyId == 0 ? null : companyId,rs.getBoolean(SHOW_CLOSED),new ArrayList<>());
return new Project(rs.getLong(ID),rs.getString(NAME),rs.getString(DESCRIPTION),Status.of(rs.getInt(STATUS)),companyId == 0 ? null : companyId,rs.getBoolean(SHOW_CLOSED),new HashMap<>());
}
public Project patch(JSONObject json) {
for (var key : json.keySet()){
switch (key){
case DESCRIPTION: description = json.getString(key); break;
case MEMBERS: patchMembers(json.getJSONObject(MEMBERS)); break;
case NAME: name = json.getString(key); break;
case STATUS: status = json.get(key) instanceof Number number ? Status.of(number.intValue()) : Status.valueOf(json.getString(key)); break;
default: key = null;
@@ -80,6 +84,20 @@ public class Project implements Mappable {
return this;
}
private void patchMembers(JSONObject json) throws UmbrellaException {
for (var key : json.keySet()){
long userId;
try {
userId = Long.parseLong(key);
} catch (NumberFormatException e) {
throw invalidFieldException(USER_ID,"long");
}
if (!(json.get(key) instanceof Number number)) throw invalidFieldException(PERMISSION,"int");
var permission = Permission.of(number.intValue());
members.put(userId,new Member(userId,permission));
}
}
public boolean showClosed(){
return showClosed;
}
@@ -91,13 +109,17 @@ 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,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);
map.put(MEMBERS,members == null ? List.of() : members.stream().map(Member::toMap).toList());
map.put(MEMBERS,memberMap);
return map;
}