Pull request #254: RED-3397: Added endpoint to convert texthighlights

Merge in RED/persistence-service from RED-3397 to master

* commit '15dee5c876111f7a90aa768067a95223a9e5e8bb':
  RED-3397: Added endpoint to convert texthighlights
This commit is contained in:
Dominique Eiflaender 2022-02-22 11:27:16 +01:00
commit d6b0ff2d14
3 changed files with 18 additions and 1 deletions

View File

@ -7,12 +7,15 @@ import org.springframework.web.bind.annotation.*;
import java.util.Set;
import com.iqser.red.service.pdftron.redaction.v1.api.model.DocumentRequest;
import com.iqser.red.service.pdftron.redaction.v1.api.model.TextHighlightRequest;
import com.iqser.red.service.pdftron.redaction.v1.api.model.TextHighlightResponse;
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public interface ReanalysisResource {
String REANALYZE_PATH = "/reanalyze";
String IMPORT_REDACTIONS_PATH = "/import-redactions";
String TEXT_HIGHLIGHT_CONVERSION_PATH = "/texthighlights-conversion";
String OCR_REANALYZE_PATH = "/ocr/reanalyze";
String REINDEX_PATH = "/reindex";
String DOSSIER_ID_PARAM = "dossierId";
@ -53,4 +56,7 @@ public interface ReanalysisResource {
@PostMapping(value = IMPORT_REDACTIONS_PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
void importRedactions(@RequestBody DocumentRequest documentRequest);
@PostMapping(value = TEXT_HIGHLIGHT_CONVERSION_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
TextHighlightResponse processTextHighlights(@RequestBody TextHighlightRequest textHighlightRequest);
}

View File

@ -2,6 +2,9 @@ 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.pdftron.redaction.v1.api.model.TextHighlightOperation;
import com.iqser.red.service.pdftron.redaction.v1.api.model.TextHighlightRequest;
import com.iqser.red.service.pdftron.redaction.v1.api.model.TextHighlightResponse;
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;
@ -86,6 +89,14 @@ public class ReanalysisController implements ReanalysisResource {
fileStatusService.setStatusFullReprocess(documentRequest.getDossierId(), documentRequest.getFileId(), 1);
}
public TextHighlightResponse processTextHighlights(@RequestBody TextHighlightRequest textHighlightRequest){
var textHighlightResponse = pDFTronRedactionClient.processTextHighlights(textHighlightRequest);
if(textHighlightRequest.getOperation().equals(TextHighlightOperation.CONVERT)){
fileStatusService.setStatusFullReprocess(textHighlightRequest.getDossierId(), textHighlightRequest.getFileId(), 1);
}
return textHighlightResponse;
}
public void ocrFile(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID_PARAM) String fileId,
@RequestParam(value = "force", required = false, defaultValue = FALSE) boolean force) {

View File

@ -27,7 +27,7 @@
<properties>
<redaction-service.version>3.76.0</redaction-service.version>
<search-service.version>2.18.0</search-service.version>
<pdftron-redaction-service.version>3.40.0</pdftron-redaction-service.version>
<pdftron-redaction-service.version>3.42.0</pdftron-redaction-service.version>
<redaction-report-service.version>3.19.0</redaction-report-service.version>
</properties>