From 98bf385c201d565d3ebf571f0f4e806c5d01246f Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Fri, 1 Sep 2023 13:55:36 +0200 Subject: [PATCH] RED-7317: mark LegalBasisChange as processed in DB after analysis --- .../service/manualredactions/ManualRedactionService.java | 7 +++++++ .../annotations/ResizeRedactionPersistenceService.java | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java index 672384e22..7e0a4d162 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java @@ -370,6 +370,13 @@ public class ManualRedactionService { } }); } + if (manualRedactions.getLegalBasisChanges() != null) { + manualRedactions.getLegalBasisChanges().forEach(e -> { + if (!e.getStatus().equals(AnnotationStatus.REQUESTED) && e.getProcessedDate() == null) { + resizeRedactionPersistenceService.markAsProcessed(e.getAnnotationId(), e.getFileId()); + } + }); + } } } 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 702b21623..348a1143f 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 @@ -13,7 +13,6 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.annotati import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualResizeRedactionEntity; import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.RectangleEntity; import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; -import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.ManualRedactionRepository; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.ResizeRedactionRepository; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ResizeRedactionRequest; @@ -27,8 +26,6 @@ import lombok.extern.slf4j.Slf4j; @RequiredArgsConstructor public class ResizeRedactionPersistenceService { - private final ManualRedactionRepository manualRedactionRepository; - private final ResizeRedactionRepository resizeRedactionRepository; @@ -56,6 +53,7 @@ public class ResizeRedactionPersistenceService { resizeRedactionRepository.updateSurroundingText(id, textBefore, textAfter); } + @Transactional public void updateStatus(String fileId, String annotationId, AnnotationStatus annotationStatus, Set typeIdsOfModifiedDictionaries) {