From 723ddc7fa406268bed79cb442c01f4582ba28e27 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Fri, 10 Feb 2023 14:07:57 +0100 Subject: [PATCH] hotfix: Do not remove lastFileReview / lastApprover when deleting users --- .../service/v1/api/resources/StatusResource.java | 4 ---- .../persistence/FileStatusPersistenceService.java | 9 --------- .../persistence/repository/FileRepository.java | 12 +----------- .../v1/server/controller/FileStatusController.java | 7 ------- .../v1/server/service/FileStatusService.java | 6 ------ 5 files changed, 1 insertion(+), 37 deletions(-) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java index 60b72404e..96a55e2de 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java @@ -126,8 +126,4 @@ public interface StatusResource { @PostMapping(value = STATUS_PATH + "/include-pages" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE) void includePages(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody Set pages); - - @PostMapping(value = STATUS_PATH + "/remove-not-existing-users", consumes = MediaType.APPLICATION_JSON_VALUE) - void removeNotExistingUsers(@RequestBody Set deletedUsers); - } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java index 8729b2e4f..f8a240616 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java @@ -526,13 +526,4 @@ public class FileStatusPersistenceService { response.isOcrFinished() ? OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS) : null, OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); } - - - @Transactional - public void removeNotExistingUsers(Set users) { - - fileRepository.deleteLastReviewers(users, OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); - fileRepository.deleteLastApprovers(users, OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); - } - } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java index f47a53873..52577bf5e 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java @@ -125,17 +125,7 @@ public interface FileRepository extends JpaRepository { @Modifying @Query("update FileEntity f set f.assignee = :assignee, f.lastReviewer = :lastReviewer, f.lastApprover = :lastApprover, " + "f.lastUpdated = :lastUpdated where f.id = :fileId") int setAssignee(String fileId, String assignee, String lastReviewer, String lastApprover, OffsetDateTime lastUpdated); - - - @Modifying - @Query("update FileEntity f set f.lastReviewer = null, f.lastUpdated = :lastUpdated where f.lastReviewer IN :users") - int deleteLastReviewers(Set users, OffsetDateTime lastUpdated); - - - @Modifying - @Query("update FileEntity f set f.lastApprover = null, f.lastUpdated = :lastUpdated where f.lastApprover IN :users") - int deleteLastApprovers(Set users, OffsetDateTime lastUpdated); - + @Modifying(clearAutomatically = true) @Query("update FileEntity f set f.excluded = :excluded, f.lastUpdated = :lastUpdated where f.id = :fileId") diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java index fceb7a255..8f1200d95 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java @@ -95,13 +95,6 @@ public class FileStatusController implements StatusResource { } - @Override - public void removeNotExistingUsers(@RequestBody Set notExistingUsers) { - - fileStatusService.removeNotExistingUsers(notExistingUsers); - } - - public void setStatusUnderReview(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestParam(value = USER_ID_REQUEST_PARAM, required = false) String userId) { 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 4d64fba22..d3cc5c88b 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 @@ -748,10 +748,4 @@ public class FileStatusService { fileStatusPersistenceService.updateOCRStatus(response); } - - public void removeNotExistingUsers(Set notExistingUsers) { - - fileStatusPersistenceService.removeNotExistingUsers(notExistingUsers); - } - }