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

RED-3699: Fixed cycle rest calls on getRedactionLog

Browse Source
This commit is contained in:
deiflaender 2022-03-25 09:33:35 +01:00
parent 80c6a42a82
commit b16babef1a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iqser.red.service.peristence.v1.server.client.RedactionClient; import com.iqser.red.service.peristence.v1.server.client.RedactionClient;
import com.iqser.red.service.peristence.v1.server.controller.DictionaryController;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService;
import com.iqser.red.service.redaction.v1.model.RedactionLog; import com.iqser.red.service.redaction.v1.model.RedactionLog;
@ -24,6 +25,7 @@ public class RedactionLogService {
private final RedactionClient redactionClient; private final RedactionClient redactionClient;
private final DossierPersistenceService dossierPersistenceService; private final DossierPersistenceService dossierPersistenceService;
private final FileStatusService fileStatusService; private final FileStatusService fileStatusService;
private final DictionaryController dictionaryController;
public RedactionLog getRedactionLog(String dossierId, String fileId, boolean withManualRedactions, boolean includeFalsePositives) { public RedactionLog getRedactionLog(String dossierId, String fileId, boolean withManualRedactions, boolean includeFalsePositives) {
@ -44,6 +46,10 @@ public class RedactionLogService {
if (withManualRedactions) { if (withManualRedactions) {
var dossier = dossierPersistenceService.findByDossierId(dossierId); var dossier = dossierPersistenceService.findByDossierId(dossierId);
var manualRedactions = manualRedactionService.getManualRedactions(fileId); var manualRedactions = manualRedactionService.getManualRedactions(fileId);
var colors = dictionaryController.getColors(dossier.getDossierTemplateId());
var types = dictionaryController.getAllTypesForDossierTemplate(dossier.getDossierTemplateId());
var dossierTypes = dictionaryController.getAllTypesForDossier(dossierId);
types.addAll(dossierTypes);
try { try {
redactionLog = redactionClient.getRedactionLog(RedactionRequest.builder() redactionLog = redactionClient.getRedactionLog(RedactionRequest.builder()
@ -53,6 +59,8 @@ public class RedactionLogService {
.dossierTemplateId(dossier.getDossierTemplateId()) .dossierTemplateId(dossier.getDossierTemplateId())
.excludedPages(fileStatus.getExcludedPages()) .excludedPages(fileStatus.getExcludedPages())
.includeFalsePositives(includeFalsePositives) .includeFalsePositives(includeFalsePositives)
.colors(colors)
.types(types)
.build()); .build());
} catch (FeignException e) { } catch (FeignException e) {
if (e.status() == HttpStatus.NOT_FOUND.value()) { if (e.status() == HttpStatus.NOT_FOUND.value()) {

2
persistence-service-v1/pom.xml
View File

@ -25,7 +25,7 @@
</modules> </modules>
<properties> <properties>
<redaction-service.version>3.86.0</redaction-service.version> <redaction-service.version>3.90.0</redaction-service.version>
<search-service.version>2.26.0</search-service.version> <search-service.version>2.26.0</search-service.version>
<pdftron-redaction-service.version>3.53.0</pdftron-redaction-service.version> <pdftron-redaction-service.version>3.53.0</pdftron-redaction-service.version>
<redaction-report-service.version>3.19.0</redaction-report-service.version> <redaction-report-service.version>3.19.0</redaction-report-service.version>