From c60c79ef06b2313bdf555c32e9e44242b7cd68a2 Mon Sep 17 00:00:00 2001
From: Kilian Schuettler <kilian.schuettler@knecon.com>
Date: Mon, 8 Apr 2024 10:15:58 +0200
Subject: [PATCH] RED-7384: migration fixes * index files from dossier trash
 aswell

---
 .../management/v1/processor/service/IndexingService.java   | 7 ++++---
 .../service/manualredactions/ManualRedactionMapper.java    | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/IndexingService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/IndexingService.java
index 070fd9049..5b71c0a21 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/IndexingService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/IndexingService.java
@@ -36,13 +36,14 @@ public class IndexingService {
             if (dossierId == null) {
                 List<DossierEntity> dossiers = dossierService.getAllDossiers();
                 for (DossierEntity dossier : dossiers) {
-                    if (dossier.getSoftDeletedTime() == null || dossier.getArchivedTime() != null) {
-                        reindexDossierIds.add(new ImmutablePair<>(dossier.getDossierTemplateId(), dossier.getId()));
+                    if (dossier.getHardDeletedTime() != null || dossier.getArchivedTime() != null) {
+                        continue;
                     }
+                    reindexDossierIds.add(new ImmutablePair<>(dossier.getDossierTemplateId(), dossier.getId()));
                 }
             } else {
                 DossierEntity dossier = dossierService.getDossierById(dossierId);
-                if (dossier.getSoftDeletedTime() == null || dossier.getArchivedTime() != null) {
+                if (dossier.getHardDeletedTime() == null && dossier.getArchivedTime() == null) {
                     reindexDossierIds.add(new ImmutablePair<>(dossier.getDossierTemplateId(), dossier.getId()));
                 }
             }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
index 695f9c220..3d88eaa71 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
@@ -4,7 +4,6 @@ import static com.iqser.red.service.persistence.management.v1.processor.utils.Ty
 
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;