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

RED-3800 DossierTemplateId and DossierStatusId attached to file

Browse Source
This commit is contained in:
Timo Bejan 2022-05-03 13:34:56 +03:00
parent d4ba73c5c1
commit 279c8a79aa
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java
View File

@ -60,6 +60,8 @@ public class FileModel {
private Set<Integer> excludedPages = new HashSet<>(); private Set<Integer> excludedPages = new HashSet<>();
private Map<String, String> fileAttributes = new HashMap<>(); private Map<String, String> fileAttributes = new HashMap<>();
private String dossierId; private String dossierId;
private String dossierTemplateId;
private String dossierStatusId;
private OffsetDateTime redactionModificationDate; private OffsetDateTime redactionModificationDate;
private OffsetDateTime fileManipulationDate; private OffsetDateTime fileManipulationDate;
private boolean hasHighlights; private boolean hasHighlights;

12
persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReanalysisResource.java
View File

@ -1,19 +1,13 @@
package com.iqser.red.service.persistence.service.v1.api.resources; 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.ByteContentDocument;
import com.iqser.red.service.pdftron.redaction.v1.api.model.highlights.TextHighlightConversionRequest; 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.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.*;
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 com.iqser.red.service.pdftron.redaction.v1.api.model.DocumentRequest; import java.util.Set;
import com.iqser.red.service.persistence.service.v1.api.model.annotations.DeleteImportedRedactionsRequest;
@ResponseStatus(value = HttpStatus.NO_CONTENT) @ResponseStatus(value = HttpStatus.NO_CONTENT)
public interface ReanalysisResource { public interface ReanalysisResource {

3
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java
View File

@ -96,6 +96,9 @@ public class ReanalysisRequiredStatusService {
return new AnalysisRequiredResult(false, false); return new AnalysisRequiredResult(false, false);
} }
fileStatus.setDossierTemplateId(dossier.getDossierTemplateId());
fileStatus.setDossierStatusId(dossier.getDossierStatusId());
// get relevant versions // get relevant versions
var dossierTemplateVersions = dossierTemplateVersionMap.computeIfAbsent(dossier.getDossierTemplateId(), var dossierTemplateVersions = dossierTemplateVersionMap.computeIfAbsent(dossier.getDossierTemplateId(),
k -> buildVersionData(dossier.getDossierTemplateId())); k -> buildVersionData(dossier.getDossierTemplateId()));