From 279c8a79aa3a7c04fc35c93adefb51050789a162 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Tue, 3 May 2022 13:34:56 +0300
Subject: [PATCH] RED-3800 DossierTemplateId and DossierStatusId  attached to
 file

---
 .../dossiertemplate/dossier/file/FileModel.java      |  2 ++
 .../service/v1/api/resources/ReanalysisResource.java | 12 +++---------
 .../service/ReanalysisRequiredStatusService.java     |  3 +++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java
index 35ab36007..a6a4c728d 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java
@@ -60,6 +60,8 @@ public class FileModel {
     private Set<Integer> excludedPages = new HashSet<>();
     private Map<String, String> fileAttributes = new HashMap<>();
     private String dossierId;
+    private String dossierTemplateId;
+    private String dossierStatusId;
     private OffsetDateTime redactionModificationDate;
     private OffsetDateTime fileManipulationDate;
     private boolean hasHighlights;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReanalysisResource.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReanalysisResource.java
index b2f9ab0dc..bc525e583 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReanalysisResource.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReanalysisResource.java
@@ -1,19 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import java.util.Set;
-
 import com.iqser.red.service.pdftron.redaction.v1.api.model.ByteContentDocument;
 import com.iqser.red.service.pdftron.redaction.v1.api.model.highlights.TextHighlightConversionRequest;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.DeleteImportedRedactionsRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.*;
 
-import com.iqser.red.service.pdftron.redaction.v1.api.model.DocumentRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.DeleteImportedRedactionsRequest;
+import java.util.Set;
 
 @ResponseStatus(value = HttpStatus.NO_CONTENT)
 public interface ReanalysisResource {
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java
index c86b3bcca..6fc58eb5d 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java
@@ -96,6 +96,9 @@ public class ReanalysisRequiredStatusService {
             return new AnalysisRequiredResult(false, false);
         }
 
+        fileStatus.setDossierTemplateId(dossier.getDossierTemplateId());
+        fileStatus.setDossierStatusId(dossier.getDossierStatusId());
+
         // get relevant versions
         var dossierTemplateVersions = dossierTemplateVersionMap.computeIfAbsent(dossier.getDossierTemplateId(),
                 k -> buildVersionData(dossier.getDossierTemplateId()));