Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-7384: migration fixes

Browse Source 
* index files from dossier trash aswell
This commit is contained in:
Kilian Schuettler 2024-04-08 10:15:58 +02:00
parent dd53983e72
commit 16dad29be3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/IndexingService.java
View File

@ -36,13 +36,14 @@ public class IndexingService {
if (dossierId == null) { if (dossierId == null) {
List<DossierEntity> dossiers = dossierService.getAllDossiers(); List<DossierEntity> dossiers = dossierService.getAllDossiers();
for (DossierEntity dossier : dossiers) { for (DossierEntity dossier : dossiers) {
if (dossier.getSoftDeletedTime() == null || dossier.getArchivedTime() != null) { if (dossier.getHardDeletedTime() != null || dossier.getArchivedTime() != null) {
reindexDossierIds.add(new ImmutablePair<>(dossier.getDossierTemplateId(), dossier.getId())); continue;
} }
reindexDossierIds.add(new ImmutablePair<>(dossier.getDossierTemplateId(), dossier.getId()));
} }
} else { } else {
DossierEntity dossier = dossierService.getDossierById(dossierId); 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())); reindexDossierIds.add(new ImmutablePair<>(dossier.getDossierTemplateId(), dossier.getId()));
} }
} }

1
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
View File

@ -4,7 +4,6 @@ import static com.iqser.red.service.persistence.management.v1.processor.utils.Ty
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;