From 25391040fffd761260c4689888b42fd655184797 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 5 Apr 2022 12:20:38 +0300 Subject: [PATCH] updated flag correct sets --- .../service/persistence/FileStatusPersistenceService.java | 4 ++-- .../service/persistence/repository/FileRepository.java | 8 ++++---- .../server/service/AnalysisFlagsCalculationService.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) 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 112d578a1..4fa3046b7 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 @@ -337,13 +337,13 @@ public class FileStatusPersistenceService { @Transactional public void setLastRedactionModificationDateForFile(String fileId, OffsetDateTime changeDate) { - fileRepository.setLastRedactionModificationDateForFile(fileId, changeDate); + fileRepository.setLastRedactionModificationDateForFile(fileId, changeDate, OffsetDateTime.now()); } @Transactional public void setLastManualChangeDate(String fileId, OffsetDateTime lastManualChangeDate) { - fileRepository.setLastManualChangeDate(fileId, lastManualChangeDate); + fileRepository.setLastManualChangeDate(fileId, lastManualChangeDate, OffsetDateTime.now()); } 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 345545a86..833ee1cda 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 @@ -132,12 +132,12 @@ public interface FileRepository extends JpaRepository { List findDossierChangeByLastUpdatedIsAfter(OffsetDateTime since); @Modifying(clearAutomatically = true) - @Query("update FileEntity f set f.redactionModificationDate = :redactionModificationDate where f.id = :fileId") - void setLastRedactionModificationDateForFile(String fileId, OffsetDateTime redactionModificationDate); + @Query("update FileEntity f set f.redactionModificationDate = :redactionModificationDate, f.lastUpdated = :lastUpdated where f.id = :fileId") + void setLastRedactionModificationDateForFile(String fileId, OffsetDateTime redactionModificationDate, OffsetDateTime lastUpdated); @Modifying(clearAutomatically = true) - @Query("update FileEntity f set f.lastManualChangeDate = :lastManualChangeDate where f.id = :fileId") - void setLastManualChangeDate(String fileId, OffsetDateTime lastManualChangeDate); + @Query("update FileEntity f set f.lastManualChangeDate = :lastManualChangeDate, f.lastUpdated = :lastUpdated where f.id = :fileId") + void setLastManualChangeDate(String fileId, OffsetDateTime lastManualChangeDate, OffsetDateTime lastUpdated); @Query("select f from FileEntity f join DossierEntity d on d.id = f.dossierId where f.workflowStatus <> 'APPROVED' and f.excludedFromAutomaticAnalysis = false " + "and ( f.processingStatus = 'PROCESSED' or f.processingStatus = 'UNPROCESSED' or f.processingStatus = 'DELETED' or f.processingStatus = 'ERROR' )" + diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java index 22ef05606..410698c20 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java @@ -126,7 +126,7 @@ public class AnalysisFlagsCalculationService { if (lastRedactionModification != null && (file.getRedactionModificationDate() == null || file.getRedactionModificationDate().isBefore(lastRedactionModification))) { fileStatusPersistenceService.setLastRedactionModificationDateForFile(fileId, lastRedactionModification); } - if (lastManualChangeDate != null) { + if (lastManualChangeDate != null && (file.getLastManualChangeDate() == null || file.getLastManualChangeDate().isBefore(lastManualChangeDate))) { fileStatusPersistenceService.setLastManualChangeDate(fileId, lastManualChangeDate); }