From 16dad29be3fc9fe33ccc617442309b350d85a0cc Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Mon, 8 Apr 2024 10:15:58 +0200 Subject: [PATCH 1/2] 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 a2b685433..10f9bd55a 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 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 d9f5cf69b..2318ddf82 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; -- 2.47.2 From 0137d85434ce76b6cb97dc652ed94c5b174603e7 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Mon, 8 Apr 2024 11:19:44 +0200 Subject: [PATCH 2/2] RED-7384: migration fixes * index files from dossier trash aswell --- .../service/manualredactions/ManualRedactionMapper.java | 1 + 1 file changed, 1 insertion(+) 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 2318ddf82..d9f5cf69b 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,6 +4,7 @@ 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; -- 2.47.2