Merge pull request #195 from fbasios/devel

[ACC-286] Do not erase acl when updating a Project

Author: cthermolia-grnet

CHANGELOG.md

@@ -38,6 +38,7 @@ According to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) , the `Unr
 
 -   [#193](https://github.com/ARGOeu/argo-accounting/pull/193) - ACC-274 Update Group ID Path Name to Resolve Conflict with User ID Path.
 -   [#194](https://github.com/ARGOeu/argo-accounting/pull/194) - ACC-275 Fix Search of Metrics by Start or End Date.
+-   [#195](https://github.com/ARGOeu/argo-accounting/pull/195) - ACC-286 Project entry "lost" when updated.
 
 ## 1.5.1 - 2024-07-24
 

src/main/java/org/accounting/system/repositories/project/ProjectRepository.java

@@ -11,6 +11,7 @@
 import jakarta.inject.Inject;
 import jakarta.ws.rs.NotFoundException;
 import org.accounting.system.beans.RequestUserContext;
+import org.accounting.system.dtos.project.UpdateProjectRequest;
 import org.accounting.system.entities.HierarchicalRelation;
 import org.accounting.system.entities.MetricDefinition;
 import org.accounting.system.entities.acl.RoleAccessControl;
@@ -32,6 +33,7 @@
 import org.accounting.system.repositories.metric.MetricRepository;
 import org.accounting.system.repositories.provider.ProviderRepository;
 import org.accounting.system.services.authorization.RoleService;
+import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
 import org.bson.conversions.Bson;
 
@@ -281,6 +283,46 @@ public ProjectProjection fetchById(String projectId){
                 .first();
     }
 
+    public ProjectProjection updateProject(UpdateProjectRequest request, String id) {
+
+        var eq = Filters.eq("_id",  id);
+
+        var list = new ArrayList<Bson>();
+
+        if(StringUtils.isNotEmpty(request.acronym)){
+
+            list.add(Updates.set("acronym", request.acronym));
+        }
+
+        if(StringUtils.isNotEmpty(request.title)){
+
+            list.add(Updates.set("title", request.title));
+        }
+
+        if(StringUtils.isNotEmpty(request.startDate)){
+
+            list.add(Updates.set("startDate", request.startDate));
+        }
+
+        if(StringUtils.isNotEmpty(request.endDate)){
+
+            list.add(Updates.set("endDate", request.endDate));
+        }
+
+        if(StringUtils.isNotEmpty(request.callIdentifier)){
+
+            list.add(Updates.set("callIdentifier", request.callIdentifier));
+        }
+
+        var update = Updates.combine(
+                list
+        );
+
+        getMongoCollection().updateOne(eq, update);
+
+        return fetchById(id);
+    }
+
     public boolean accessibility(String projectId, Collection collection, Operation operation){
 
         var roleAccessControls = fetchRoleAccessControl(projectId, requestUserContext.getId());

src/main/java/org/accounting/system/services/SystemAdminService.java

@@ -14,7 +14,6 @@
 import org.accounting.system.entities.client.Client;
 import org.accounting.system.entities.projections.normal.ProjectProjection;
 import org.accounting.system.exceptions.ConflictException;
-import org.accounting.system.mappers.ProjectMapper;
 import org.accounting.system.mappers.ResourceMapper;
 import org.accounting.system.repositories.ResourceRepository;
 import org.accounting.system.repositories.authorization.RoleRepository;
@@ -205,12 +204,6 @@ public ResourceResponse createResource(ResourceRequest request) {
 
     public ProjectProjection updateProject(UpdateProjectRequest request, String id) {
 
-        var entity = projectRepository.findById(id);
-
-        ProjectMapper.INSTANCE.updateProjectFromDto(request, entity);
-
-        projectRepository.update(entity);
-
-        return projectRepository.fetchById(id);
+        return projectRepository.updateProject(request, id);
     }
 }