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

Merge branch 'RED-7384' into 'master'

Browse Source 
RED-7384: migration fixes

Closes RED-7384

See merge request redactmanager/persistence-service!432
This commit is contained in:
Dominique Eifländer 2024-04-08 10:32:32 +02:00
commit ddcff217e5
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) {
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()));
}
}

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.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Set;