From d27fc118e6a430dec9166329f5b5d5ef9b6b4a43 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Fri, 28 Jan 2022 16:30:58 +0200
Subject: [PATCH 1/2] fixed has updates flag for approved files

---
 .../v1/server/service/AnalysisFlagsCalculationService.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 ef1769bc4..2fd5c478e 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
@@ -4,6 +4,7 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.annotati
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileStatusPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.ViewedPagesPersistenceService;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
 
 import lombok.RequiredArgsConstructor;
@@ -81,12 +82,13 @@ public class AnalysisFlagsCalculationService {
 
             var viewedPage = entry.getPositions().isEmpty() ? null : viewedPages.get(entry.getPositions().get(0).getPage());
 
-            if (lastChange != null && lastChange.getDateTime() != null && viewedPage != null && viewedPage.isBefore(lastChange.getDateTime())) {
+            if (file.getWorkflowStatus() != WorkflowStatus.APPROVED && lastChange != null && lastChange.getDateTime() != null && viewedPage != null && viewedPage.isBefore(lastChange.getDateTime())) {
                 hasUpdates = true;
             }
 
         }
 
+
         log.info("Flag Calculations for file: {} took: {}ms", fileId, System.currentTimeMillis() - startTime);
 
         if (file.isHasRedactions() == hasRedactions &&

From 129a1e2a9764495e2b7057f396c799b981b5507f Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Sat, 29 Jan 2022 21:10:29 +0200
Subject: [PATCH 2/2] Fixed various issues for efsa. Improved UI RED-3303 and
 others

---
 .../peristence/v1/server/service/FileService.java        | 9 +++++++--
 persistence-service-v1/pom.xml                           | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java
index d7e3fdbd5..6e28cb0e3 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileService.java
@@ -161,8 +161,13 @@ public class FileService {
     }
 
     public void hardDeleteFile(String dossierId, String fileId) {
-        Arrays.stream(FileType.values()).forEach(fileType ->
-                fileManagementStorageService.deleteObject(dossierId, fileId, fileType)
+        Arrays.stream(FileType.values()).forEach(fileType -> {
+                    try {
+                        fileManagementStorageService.deleteObject(dossierId, fileId, fileType);
+                    } catch (Exception e) {
+                        log.warn("Failed to physically delete file: {} with type {}", fileId, fileType);
+                    }
+                }
         );
 
         forceRedactionPersistenceService.findForceRedactions(fileId, true).forEach(annotation -> {
diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml
index c06764f28..c6386377e 100755
--- a/persistence-service-v1/pom.xml
+++ b/persistence-service-v1/pom.xml
@@ -36,7 +36,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.8.0</version>
+                <version>1.10.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>