From 5bd2b553593aae99d763391de162ead53b06f1d1 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Fri, 18 Feb 2022 16:17:17 +0100 Subject: [PATCH] RED-3452: Fixed undelete legal basis changes --- .../peristence/v1/server/service/FileService.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 e971a44ad..ca608e4c7 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 @@ -5,6 +5,7 @@ import java.time.OffsetDateTime; import java.util.Arrays; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel; + import org.springframework.stereotype.Service; import com.google.common.hash.HashFunction; @@ -293,6 +294,20 @@ public class FileService { } }); + legalBasisChangePersistenceService.findLegalBasisChanges(fileId, true).forEach(annotation -> { + if (annotation.getSoftDeletedTime().equals(softDeletedTime) || annotation.getSoftDeletedTime() + .isAfter(softDeletedTime)) { + legalBasisChangePersistenceService.undelete(fileId, annotation.getId().getAnnotationId()); + commentPersistenceService.findCommentsByAnnotationId(fileId, annotation.getId().getAnnotationId(), true) + .forEach(comment -> { + if (comment.getSoftDeletedTime().equals(softDeletedTime) || comment.getSoftDeletedTime() + .isAfter(softDeletedTime)) { + commentPersistenceService.undelete(comment.getId()); + } + }); + } + }); + indexingService.addToIndexingQueue(IndexMessageType.UPDATE, dossierTemplateId, dossierId, fileId, 2); }