From c79a79f35c930903815a123c5b9ffb4a55c2453d Mon Sep 17 00:00:00 2001 From: ADAM M SANADI Date: Thu, 5 Dec 2024 17:47:00 +0530 Subject: [PATCH] avniproject/avni-webapp#1113 | Returning updated IdentifierUserAssignment ResponseEntity as it is. --- .../identifier/IdentifierUserAssignmentService.java | 4 ++-- .../server/web/IdentifierUserAssignmentWebController.java | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/avni-server-api/src/main/java/org/avni/server/service/identifier/IdentifierUserAssignmentService.java b/avni-server-api/src/main/java/org/avni/server/service/identifier/IdentifierUserAssignmentService.java index 224c43b1f..56c55b43e 100644 --- a/avni-server-api/src/main/java/org/avni/server/service/identifier/IdentifierUserAssignmentService.java +++ b/avni-server-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 index 376c43c03..0110df5c3 100644 --- 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; } }