From 77c6348e354c0748740500f22f6b9d025f63f539 Mon Sep 17 00:00:00 2001
From: Kilian Schuettler <kilian.schuettler@knecon.com>
Date: Wed, 11 Oct 2023 10:49:02 +0200
Subject: [PATCH] DM-504: adjust error messages * also check for hard deleted
 date in dossier

---
 .../v1/processor/service/DossierManagementService.java    | 8 +++++---
 .../v1/processor/service/FileStatusManagementService.java | 4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierManagementService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierManagementService.java
index cc7d9fd0f..252ad7e56 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierManagementService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierManagementService.java
@@ -8,15 +8,12 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import jakarta.transaction.Transactional;
-
 import org.springframework.stereotype.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.management.v1.processor.settings.FileManagementServiceSettings;
 import com.iqser.red.service.persistence.management.v1.processor.utils.DossierMapper;
-import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierInformation;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.common.JSONPrimitive;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.CreateOrUpdateDossierRequest;
@@ -24,7 +21,9 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierChange;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileModel;
 import com.iqser.red.service.search.v1.model.IndexMessageType;
+import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
 
+import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -155,6 +154,9 @@ public class DossierManagementService {
     public Dossier getDossierById(String dossierId, boolean includeArchived, boolean includeDeleted) {
 
         DossierEntity dossier = dossierService.getDossierById(dossierId);
+        if (dossier.getHardDeletedTime() != null) {
+            throw new DossierNotFoundException(String.format(DOSSIER_NOT_FOUND_MESSAGE, dossierId));
+        }
         if (dossier.getArchivedTime() != null && !includeArchived) {
             throw new DossierNotFoundException(String.format(DOSSIER_NOT_FOUND_MESSAGE, dossierId));
         }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusManagementService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusManagementService.java
index bc8f859f5..d29e5f7ba 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusManagementService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusManagementService.java
@@ -70,11 +70,9 @@ public class FileStatusManagementService {
     public FileModel getFileStatus(String fileId, boolean includeSoftDeleted) {
 
         var status = fileStatusService.getStatus(fileId);
-
         if (status.getHardDeletedTime() != null) {
-            throw new NotFoundException("File not found");
+            throw new NotFoundException(String.format("File with ID \"%s\" not found!", fileId));
         }
-
         if (!includeSoftDeleted && status.getDeleted() != null) {
             throw new NotFoundException(String.format("The requested file has been soft deleted on %s.", status.getDeleted().format(DateTimeFormatter.ISO_LOCAL_DATE)));
         }
-- 
2.47.2