From 82cb289de9eb5e5b60ce2d4e7d333bbcfb6d6860 Mon Sep 17 00:00:00 2001
From: deiflaender <dominique.eiflaender@iqser.com>
Date: Tue, 14 Dec 2021 09:38:48 +0100
Subject: [PATCH] RED-3029: Fixed processedDate is not set for approved force
 redactions

---
 .../service/persistence/ForceRedactionPersistenceService.java | 4 ++++
 .../persistence/ResizeRedactionPersistenceService.java        | 3 ++-
 .../v1/server/integration/tests/ManualRedactionTest.java      | 2 ++
 3 files changed, 8 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/ForceRedactionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ForceRedactionPersistenceService.java
index d4e7a063b..013f4137a 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ForceRedactionPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ForceRedactionPersistenceService.java
@@ -1,6 +1,7 @@
 package com.iqser.red.service.persistence.management.v1.processor.service.persistence;
 
 import java.time.OffsetDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -32,6 +33,9 @@ public class ForceRedactionPersistenceService {
         manualForceRedaction.setId(new AnnotationEntityId(forceRedactionRequest.getAnnotationId(), fileId));
         BeanUtils.copyProperties(forceRedactionRequest, manualForceRedaction);
         manualForceRedaction.setRequestDate(OffsetDateTime.now());
+        if(manualForceRedaction.getStatus().equals(AnnotationStatus.APPROVED)) {
+            manualForceRedaction.setProcessedDate(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
+        }
 
         forceRedactionRepository.save(manualForceRedaction);
     }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ResizeRedactionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ResizeRedactionPersistenceService.java
index 3c24703ce..d1a8ca32a 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ResizeRedactionPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ResizeRedactionPersistenceService.java
@@ -3,6 +3,7 @@ package com.iqser.red.service.persistence.management.v1.processor.service.persis
 import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 import java.time.OffsetDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
 
 import javax.transaction.Transactional;
@@ -36,7 +37,7 @@ public class ResizeRedactionPersistenceService {
         manualResizeRedaction.setPositions(convert(resizeRedactionRequest.getPositions(), RectangleEntity.class));
         manualResizeRedaction.setRequestDate(OffsetDateTime.now());
         if(manualResizeRedaction.getStatus().equals(AnnotationStatus.APPROVED)) {
-            manualResizeRedaction.setProcessedDate(OffsetDateTime.now());
+            manualResizeRedaction.setProcessedDate(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
         }
 
         resizeRedactionRepository.save(manualResizeRedaction);
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
index f85441aff..3b5dfc47a 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
@@ -291,6 +291,8 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
                 .build());
         var loadedForceRedaction2 = manualRedactionClient.getForceRedaction(file.getId(), forceRedaction2.getAnnotationId());
         assertThat(loadedForceRedaction2.getStatus()).isEqualTo(AnnotationStatus.APPROVED);
+        assertThat(loadedForceRedaction2.getProcessedDate()).isNotNull();
+
 
         manualRedactionClient.updateForceRedactionStatus(dossier.getId(), file.getId(), forceRedaction2.getAnnotationId(), JSONPrimitive.of(AnnotationStatus.REQUESTED));
         loadedForceRedaction2 = manualRedactionClient.getForceRedaction(file.getId(), forceRedaction2.getAnnotationId());