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

Pull request #608: hotfix: Do not remove lastFileReview / lastApprover when deleting users

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

* commit '723ddc7fa406268bed79cb442c01f4582ba28e27':
  hotfix: Do not remove lastFileReview / lastApprover when deleting users
This commit is contained in:
Dominique Eiflaender 2023-02-10 14:22:27 +01:00
commit 9e54a8a132
5 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/StatusResource.java
View File

@ -126,8 +126,4 @@ public interface StatusResource {
@PostMapping(value = STATUS_PATH + "/include-pages" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE) @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<Integer> pages); void includePages(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody Set<Integer> pages);
@PostMapping(value = STATUS_PATH + "/remove-not-existing-users", consumes = MediaType.APPLICATION_JSON_VALUE)
void removeNotExistingUsers(@RequestBody Set<String> deletedUsers);
} }

9
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
View File

@ -526,13 +526,4 @@ public class FileStatusPersistenceService {
response.isOcrFinished() ? OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS) : null, response.isOcrFinished() ? OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS) : null,
OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)); OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
} }
@Transactional
public void removeNotExistingUsers(Set<String> users) {
fileRepository.deleteLastReviewers(users, OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
fileRepository.deleteLastApprovers(users, OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
}
} }

10
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java
View File

@ -127,16 +127,6 @@ public interface FileRepository extends JpaRepository<FileEntity, String> {
int setAssignee(String fileId, String assignee, String lastReviewer, String lastApprover, OffsetDateTime lastUpdated); 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<String> users, OffsetDateTime lastUpdated);
@Modifying
@Query("update FileEntity f set f.lastApprover = null, f.lastUpdated = :lastUpdated where f.lastApprover IN :users")
int deleteLastApprovers(Set<String> users, OffsetDateTime lastUpdated);
@Modifying(clearAutomatically = true) @Modifying(clearAutomatically = true)
@Query("update FileEntity f set f.excluded = :excluded, f.lastUpdated = :lastUpdated where f.id = :fileId") @Query("update FileEntity f set f.excluded = :excluded, f.lastUpdated = :lastUpdated where f.id = :fileId")
int toggleExclusion(String fileId, boolean excluded, OffsetDateTime lastUpdated); int toggleExclusion(String fileId, boolean excluded, OffsetDateTime lastUpdated);

7
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java
View File

@ -95,13 +95,6 @@ public class FileStatusController implements StatusResource {
} }
@Override
public void removeNotExistingUsers(@RequestBody Set<String> notExistingUsers) {
fileStatusService.removeNotExistingUsers(notExistingUsers);
}
public void setStatusUnderReview(@PathVariable(DOSSIER_ID_PARAM) String dossierId, public void setStatusUnderReview(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
@PathVariable(FILE_ID) String fileId, @PathVariable(FILE_ID) String fileId,
@RequestParam(value = USER_ID_REQUEST_PARAM, required = false) String userId) { @RequestParam(value = USER_ID_REQUEST_PARAM, required = false) String userId) {

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

@ -748,10 +748,4 @@ public class FileStatusService {
fileStatusPersistenceService.updateOCRStatus(response); fileStatusPersistenceService.updateOCRStatus(response);
} }
public void removeNotExistingUsers(Set<String> notExistingUsers) {
fileStatusPersistenceService.removeNotExistingUsers(notExistingUsers);
}
} }