From b977a2e46e5748a4cab67b7683c9cf6b7dc4ad5e Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 27 Aug 2024 09:44:47 +0200 Subject: [PATCH] RED-9717: added fileId to approveresponse --- .../v1/external/api/impl/controller/StatusController.java | 6 +++--- .../v1/api/shared/model/warning/ApproveResponse.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/StatusController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/StatusController.java index 39c42fd8b..87554c3e2 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/StatusController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/StatusController.java @@ -308,7 +308,7 @@ public class StatusController implements StatusResource { accessControlService.checkAccessPermissionsToDossier(dossierId); accessControlService.verifyUserIsApprover(dossierId); - ApproveResponse approveResponse = new ApproveResponse(false, new HashMap<>()); + ApproveResponse approveResponse = new ApproveResponse(fileId, false, new HashMap<>()); if (!force) { approveResponse = approvalVerificationService.verifyApprovalOfFile(dossierId, fileId); } @@ -411,8 +411,8 @@ public class StatusController implements StatusResource { @Override @PreAuthorize("hasAuthority('" + SET_STATUS_APPROVED + "')") public List setStatusApprovedForList(String dossierId, - List fileIds, - @RequestParam(value = FORCE_REQUEST_PARAM, required = false, defaultValue = "false") boolean force) { + List fileIds, + @RequestParam(value = FORCE_REQUEST_PARAM, required = false, defaultValue = "false") boolean force) { List approveResponses = new ArrayList<>(); accessControlService.checkAccessPermissionsToDossier(dossierId); diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/warning/ApproveResponse.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/warning/ApproveResponse.java index 3659143c0..4aba6792c 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/warning/ApproveResponse.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/warning/ApproveResponse.java @@ -18,6 +18,8 @@ import lombok.NoArgsConstructor; @Builder public class ApproveResponse { + private String fileId; + private boolean hasWarnings; private Map> fileWarnings = new HashMap<>();