From 9795cbf675cde5cf06116222f91d0e3002221f67 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Thu, 19 Jan 2023 10:36:17 +0100 Subject: [PATCH] RED-6032: Fixed not setting processed date for manual resize redaction after analysis --- .../annotations/ResizeRedactionPersistenceService.java | 4 ++++ .../repository/ResizeRedactionRepository.java | 4 ++++ .../v1/server/service/ManualRedactionService.java | 9 ++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ResizeRedactionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ResizeRedactionPersistenceService.java index 4658424ae..4f6d4d719 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ResizeRedactionPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ResizeRedactionPersistenceService.java @@ -98,4 +98,8 @@ public class ResizeRedactionPersistenceService { return resizeRedactionRepository.findByStatusAndValue(status, value); } + public void markAsProcessed(String annotationId, String fileId){ + resizeRedactionRepository.markAsProcessed(new AnnotationEntityId(annotationId, fileId), 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/ResizeRedactionRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ResizeRedactionRepository.java index 828c29c40..4dcb6e4b5 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ResizeRedactionRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ResizeRedactionRepository.java @@ -42,4 +42,8 @@ public interface ResizeRedactionRepository extends JpaRepository findByStatusAndValue(AnnotationStatus status, String value); + @Modifying + @Query("update ManualResizeRedactionEntity mir set mir.processedDate = :processedDate where mir.id = :annotationEntityId") + void markAsProcessed(AnnotationEntityId annotationEntityId, OffsetDateTime processedDate); + } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java index aeb61b6c4..80d76b104 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java @@ -15,7 +15,6 @@ import java.util.stream.Collectors; import javax.transaction.Transactional; -import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Service; @@ -59,6 +58,7 @@ import com.iqser.red.service.persistence.service.v1.api.model.annotations.Manual import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions; import com.iqser.red.service.persistence.service.v1.api.model.annotations.RemoveRedactionRequest; import com.iqser.red.service.persistence.service.v1.api.model.annotations.ResizeRedactionRequest; +import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval; import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.ProcessingStatus; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus; @@ -781,6 +781,13 @@ public class ManualRedactionService { } }); } + if (manualRedactions.getResizeRedactions() != null) { + manualRedactions.getResizeRedactions().forEach(e -> { + if (!e.getStatus().equals(AnnotationStatus.REQUESTED) && e.getProcessedDate() == null) { + resizeRedactionPersistenceService.markAsProcessed(e.getAnnotationId(), e.getFileId()); + } + }); + } } }