Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Pull request #144: RED-2661 - Removing a dossier member or deleting a user must not change the status of a file

Browse Source 
Merge in RED/persistence-service from RED-2661_8 to master

* commit '238de2bfc01b7a359887fbe3eca3320a1495bb79':
  RED-2661 - Removing a dossier member or deleting a user must not change the status of a file
This commit is contained in:
Corina Olariu 2021-12-06 13:15:35 +01:00 committed by Timo Bejan
commit bd2577da4e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java
View File

@ -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);