avniproject/avni-webapp#1113 | Returning updated IdentifierUserAssign…

…ment ResponseEntity as it is.
avniproject · Dec 5, 2024 · c79a79f · c79a79f
1 parent ff5a968
commit c79a79f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/...api/src/main/java/org/avni/server/service/identifier/IdentifierUserAssignmentService.java b/...api/src/main/java/org/avni/server/service/identifier/IdentifierUserAssignmentService.java
@@ -37,7 +37,7 @@ public void save(IdentifierUserAssignment identifierUserAssignment) throws Ident
         }
     }
 
-    public void update(IdentifierUserAssignment existingIdentifierUserAssignment, IdentifierUserAssignment newIdentifierUserAssignment) throws IdentifierOverlappingException, ValidationException {
+    public IdentifierUserAssignment update(IdentifierUserAssignment existingIdentifierUserAssignment, IdentifierUserAssignment newIdentifierUserAssignment) throws IdentifierOverlappingException, ValidationException {
         newIdentifierUserAssignment.validate();
 
         IdentifierSource identifierSource = newIdentifierUserAssignment.getIdentifierSource();
@@ -52,7 +52,7 @@ public void update(IdentifierUserAssignment existingIdentifierUserAssignment, Id
                     || (overlappingWithAssignments.size() == 1 && !(overlappingWithAssignments.get(0).getId().equals(existingIdentifierUserAssignment.getId()))))
                 throw new IdentifierOverlappingException(overlappingWithAssignments);
 
-            identifierUserAssignmentRepository.updateExistingWithNew(existingIdentifierUserAssignment, newIdentifierUserAssignment);
+            return identifierUserAssignmentRepository.updateExistingWithNew(existingIdentifierUserAssignment, newIdentifierUserAssignment);
         }
     }
 }
diff --git a/avni-server-api/src/main/java/org/avni/server/web/IdentifierUserAssignmentWebController.java b/avni-server-api/src/main/java/org/avni/server/web/IdentifierUserAssignmentWebController.java
@@ -89,12 +89,13 @@ public ResponseEntity updateIdAssignment(@RequestBody IdentifierUserAssignmentCo
 
         IdentifierUserAssignment identifierUserAssignment = getIdentifierUserAssignment(request);
         identifierUserAssignment.setVoided(request.isVoided());
+        IdentifierUserAssignment updatedIdentifierUserAssignment;
         try {
-            identifierUserAssignmentService.update(existingIdentifierUserAssignment, identifierUserAssignment);
+            updatedIdentifierUserAssignment = identifierUserAssignmentService.update(existingIdentifierUserAssignment, identifierUserAssignment);
         } catch (IdentifierOverlappingException | ValidationException e) {
             return WebResponseUtil.createBadRequestResponse(e, logger);
         }
-        return ResponseEntity.ok(IdentifierUserAssignmentContractWeb.fromIdentifierUserAssignment(identifierUserAssignment));
+        return ResponseEntity.ok(IdentifierUserAssignmentContractWeb.fromIdentifierUserAssignment(updatedIdentifierUserAssignment));
     }
 
     @DeleteMapping(value = "/web/identifierUserAssignment/{id}")
@@ -116,8 +117,6 @@ private IdentifierUserAssignment getIdentifierUserAssignment(IdentifierUserAssig
         identifierUserAssignment.setIdentifierSource(request.getIdentifierSourceId() == null ? null : identifierSourceRepository.findOne(request.getIdentifierSourceId()));
         identifierUserAssignment.setIdentifierStart(request.getIdentifierStart());
         identifierUserAssignment.setIdentifierEnd(request.getIdentifierEnd());
-        identifierUserAssignment.setId(request.getId());
-        identifierUserAssignment.setOrganisationId(request.getOrganisationId());
         return identifierUserAssignment;
     }
 }