diff --git a/persistence-service-v1/persistence-service-api-v1/pom.xml b/persistence-service-v1/persistence-service-api-v1/pom.xml index cff2c573b..074f7c766 100644 --- a/persistence-service-v1/persistence-service-api-v1/pom.xml +++ b/persistence-service-v1/persistence-service-api-v1/pom.xml @@ -29,6 +29,22 @@ + + com.iqser.red.service + pdftron-redaction-service-api-v1 + + + com.iqser.red.service + redaction-service-api-v1 + + + com.iqser.red.service + persistence-service-api-v1 + + + + + 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 e304a92c4..20a4c9233 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,14 +1,18 @@ package com.iqser.red.service.persistence.service.v1.api.resources; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import java.util.Set; +import com.iqser.red.service.pdftron.redaction.v1.api.model.DocumentRequest; + @ResponseStatus(value = HttpStatus.NO_CONTENT) public interface ReanalysisResource { String REANALYZE_PATH = "/reanalyze"; + String IMPORT_REDACTIONS_PATH = "/import-redactions"; String OCR_REANALYZE_PATH = "/ocr/reanalyze"; String REINDEX_PATH = "/reindex"; String DOSSIER_ID_PARAM = "dossierId"; @@ -46,5 +50,7 @@ public interface ReanalysisResource { @PostMapping(value = REINDEX_PATH) void reindex(@RequestParam(value = DOSSIER_ID_PARAM, required = false) String dossierId, @RequestBody Set fileIds); + @PostMapping(value = IMPORT_REDACTIONS_PATH, consumes = MediaType.APPLICATION_JSON_VALUE) + void importRedactions(DocumentRequest documentRequest); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReanalysisController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReanalysisController.java index 0930e4c33..0b4345313 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReanalysisController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReanalysisController.java @@ -1,10 +1,12 @@ package com.iqser.red.service.peristence.v1.server.controller; import com.google.common.collect.Sets; +import com.iqser.red.service.pdftron.redaction.v1.api.model.DocumentRequest; import com.iqser.red.service.peristence.v1.server.service.FileStatusService; import com.iqser.red.service.peristence.v1.server.service.IndexingService; import com.iqser.red.service.peristence.v1.server.service.ReanalysisRequiredStatusService; import com.iqser.red.service.peristence.v1.server.utils.FileModelMapper; +import com.iqser.red.service.persistence.management.v1.processor.client.PDFTronRedactionClient; import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity; import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException; import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException; @@ -37,6 +39,7 @@ public class ReanalysisController implements ReanalysisResource { private final DossierPersistenceService dossierPersistenceService; private final IndexingService indexingService; private final ReanalysisRequiredStatusService reanalysisRequiredStatusService; + private final PDFTronRedactionClient pDFTronRedactionClient; @Override @@ -78,6 +81,12 @@ public class ReanalysisController implements ReanalysisResource { } + public void importRedactions(DocumentRequest documentRequest){ + pDFTronRedactionClient.importRedactions(documentRequest); + fileStatusService.setStatusFullReprocess(documentRequest.getDossierId(), documentRequest.getFileId(), 1); + } + + public void ocrFile(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID_PARAM) String fileId, @RequestParam(value = "force", required = false, defaultValue = FALSE) boolean force) { diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml index bd9b397a0..d0c71c44b 100755 --- a/persistence-service-v1/pom.xml +++ b/persistence-service-v1/pom.xml @@ -27,7 +27,7 @@ 3.76.0 2.18.0 - 3.31.0 + 3.39.0 3.19.0