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

implemented patching of project tasks when new user is added to project
Build Docker Image / Docker-Build (push) Successful in 4m16s
Details
Build Docker Image / Clean-Registry (push) Successful in 7s
Details

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
StephanRichter
2026-07-06 16:27:00 +02:00
parent 5eead469d3
commit 79195494cd
12 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java
+12 -1
View File
@@ -22,6 +22,7 @@ import static de.srsoftware.umbrella.messagebus.MessageBus.messageBus;
import static de.srsoftware.umbrella.messagebus.events.Event.EventType.CREATE;
import static de.srsoftware.umbrella.project.Constants.CONFIG_DATABASE;
import static java.lang.Boolean.TRUE;
import static java.lang.System.Logger.Level.WARNING;
import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
import com.sun.net.httpserver.HttpExchange;
@@ -138,6 +139,7 @@ public class ProjectModule extends BaseHandler implements ProjectService {
private void dropMember(Project project, long userId) {
if (project.members().get(userId).permission() == OWNER) throw forbidden("You may not remove the owner of the project");
projectDb.dropMember(project.id(),userId);
LOG.log(WARNING,"Removing member from project tasks not implemented"); // TODO
project.members().remove(userId);
}
@@ -223,7 +225,16 @@ public class ProjectModule extends BaseHandler implements ProjectService {
UmbrellaUser newMember = null;
if (json.has(DROP_MEMBER) && json.get(DROP_MEMBER) instanceof Number id) dropMember(project,id.longValue());
if (json.has(MEMBERS) && json.get(MEMBERS) instanceof JSONObject memberJson) patchMembers(project,memberJson);
if (json.has(NEW_MEMBER) && json.get(NEW_MEMBER) instanceof Number num) newMember = addMember(project,num.longValue());
if (json.has(NEW_MEMBER) && json.get(NEW_MEMBER) instanceof Number num) {
UmbrellaUser inheritFrom = null;
if (json.has(INHERIT_FROM)){
if (!(json.get(INHERIT_FROM) instanceof Number uid)) throw invalidField(INHERIT_FROM,Text.NUMBER);
inheritFrom = userService().loadUser(uid.longValue());
if (!project.hasMember(inheritFrom)) throw notAmember(inheritFrom);
}
newMember = addMember(project,num.longValue());
if (inheritFrom != null) taskService().clonePermissions(project.id(),inheritFrom,newMember);
}
project = projectDb.save(project.patch(json), user);
messageBus().dispatch(newMember != null ? new ProjectEvent(user,project,newMember) : new ProjectEvent(user,project, old));