From 238de2bfc01b7a359887fbe3eca3320a1495bb79 Mon Sep 17 00:00:00 2001 From: devplant Date: Mon, 6 Dec 2021 12:15:16 +0200 Subject: [PATCH] RED-2661 - Removing a dossier member or deleting a user must not change the status of a file - update correctly the lastReviewer and lastApprover in case the assignee is set to null --- .../peristence/v1/server/service/FileStatusService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java index d50936be4..ce14953ee 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java @@ -204,11 +204,11 @@ public class FileStatusService { FileEntity fileStatus = fileStatusPersistenceService.getStatus(fileId); String lastReviewer = fileStatus.getLastReviewer(); String lastApprover = fileStatus.getLastApprover(); - if(StringUtils.isNotEmpty(assignee) && WorkflowStatus.UNDER_REVIEW.equals(fileStatus.getWorkflowStatus())) { - lastReviewer = assignee; + if(WorkflowStatus.UNDER_REVIEW.equals(fileStatus.getWorkflowStatus())) { + lastReviewer = StringUtils.isNotEmpty(assignee)? assignee: fileStatus.getAssignee(); } - if(StringUtils.isNotEmpty(assignee) && WorkflowStatus.UNDER_APPROVAL.equals(fileStatus.getWorkflowStatus())) { - lastApprover = assignee; + if(WorkflowStatus.UNDER_APPROVAL.equals(fileStatus.getWorkflowStatus())) { + lastApprover = StringUtils.isNotEmpty(assignee)? assignee: fileStatus.getAssignee(); } fileStatusPersistenceService.setAssignee(fileId, assignee, lastReviewer, lastApprover);