From e59577ad90f7d8b3f728e56cef68240681d9612f Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 15 Mar 2022 17:54:22 +0200 Subject: [PATCH] dossier stats for soft deleted files --- .../peristence/v1/server/service/DossierStatsService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierStatsService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierStatsService.java index eb939fbb5..e4c0598c9 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierStatsService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/DossierStatsService.java @@ -3,7 +3,6 @@ package com.iqser.red.service.peristence.v1.server.service; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity; import com.iqser.red.service.persistence.management.v1.processor.exception.DossierNotFoundException; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierStats; -import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierStatus; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -53,7 +52,7 @@ public class DossierStatsService { DossierStats dossierStats = new DossierStats(); - if (dossierEntity.getStatus().equals(DossierStatus.DELETED)) { + if (dossierEntity.getHardDeletedTime() != null) { throw new DossierNotFoundException(String.format(DOSSIER_NOT_FOUND_MESSAGE, dossierId)); } @@ -92,7 +91,7 @@ public class DossierStatsService { files.stream().sorted(Comparator.comparing(FileModel::getLastUpdated, Comparator.nullsLast(Comparator.reverseOrder()))) .findFirst().ifPresent((file) -> dossierStats.setLastFileUpdateDate(file.getLastUpdated())); - files.stream().sorted(Comparator.comparing(FileModel::getFileManipulationDate, Comparator.nullsLast(Comparator.reverseOrder()))) + files.stream().sorted(Comparator.comparing(FileModel::getFileManipulationDate, Comparator.nullsLast(Comparator.reverseOrder()))) .findFirst().ifPresent((file) -> dossierStats.setFileManipulationDate(file.getFileManipulationDate())); return dossierStats; }