RED-9782: Added analysis function that only imports imported redactions
This commit is contained in:
parent
b6d1edacba
commit
5abe73cae2
@ -4,7 +4,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
description = "redaction-service-api-v1"
|
description = "redaction-service-api-v1"
|
||||||
val persistenceServiceVersion = "2.473.0"
|
val persistenceServiceVersion = "2.503.0"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("org.springframework:spring-web:6.0.12")
|
implementation("org.springframework:spring-web:6.0.12")
|
||||||
|
|||||||
@ -16,7 +16,7 @@ val layoutParserVersion = "0.141.0"
|
|||||||
val jacksonVersion = "2.15.2"
|
val jacksonVersion = "2.15.2"
|
||||||
val droolsVersion = "9.44.0.Final"
|
val droolsVersion = "9.44.0.Final"
|
||||||
val pdfBoxVersion = "3.0.0"
|
val pdfBoxVersion = "3.0.0"
|
||||||
val persistenceServiceVersion = "2.496.0"
|
val persistenceServiceVersion = "2.503.0"
|
||||||
val springBootStarterVersion = "3.1.5"
|
val springBootStarterVersion = "3.1.5"
|
||||||
val springCloudVersion = "4.0.4"
|
val springCloudVersion = "4.0.4"
|
||||||
val testContainersVersion = "1.19.7"
|
val testContainersVersion = "1.19.7"
|
||||||
@ -69,7 +69,7 @@ dependencies {
|
|||||||
implementation("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
|
implementation("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
|
||||||
|
|
||||||
implementation("net.logstash.logback:logstash-logback-encoder:7.4")
|
implementation("net.logstash.logback:logstash-logback-encoder:7.4")
|
||||||
implementation("ch.qos.logback:logback-classic")
|
api("ch.qos.logback:logback-classic")
|
||||||
|
|
||||||
implementation("org.reflections:reflections:0.10.2")
|
implementation("org.reflections:reflections:0.10.2")
|
||||||
|
|
||||||
|
|||||||
@ -110,7 +110,14 @@ public class RedactionMessageReceiver {
|
|||||||
log.info("-------------------------------------------------------------------------------------------------");
|
log.info("-------------------------------------------------------------------------------------------------");
|
||||||
shouldRespond = false;
|
shouldRespond = false;
|
||||||
break;
|
break;
|
||||||
|
case IMPORTED_REDACTIONS_ONLY:
|
||||||
|
log.info("------------------------------Imported Redactions Analysis Only------------------------------------------");
|
||||||
|
log.info("Starting Imported Redactions Analysis Only for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
|
||||||
|
log.debug(analyzeRequest.getManualRedactions().toString());
|
||||||
|
result = analyzeService.analyzeImportedRedactionsOnly(analyzeRequest);
|
||||||
|
log.info("Successful Imported Redactions Analysis Only dossier {} file {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId());
|
||||||
|
log.info("-------------------------------------------------------------------------------------------------");
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new IllegalArgumentException("Unknown MessageType: " + analyzeRequest.getMessageType());
|
throw new IllegalArgumentException("Unknown MessageType: " + analyzeRequest.getMessageType());
|
||||||
}
|
}
|
||||||
|
|||||||
@ -199,6 +199,45 @@ public class AnalyzeService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Timed("redactmanager_analyzeImportedRedactionsOnly")
|
||||||
|
@Observed(name = "AnalyzeService", contextualName = "analyzeImportedRedactionsOnly")
|
||||||
|
public AnalyzeResult analyzeImportedRedactionsOnly(AnalyzeRequest analyzeRequest) {
|
||||||
|
|
||||||
|
long startTime = System.currentTimeMillis();
|
||||||
|
|
||||||
|
AnalysisData analysisData = analysisPreparationService.getAnalysisData(analyzeRequest);
|
||||||
|
|
||||||
|
Context context = new Context(analyzeRequest.getFileId(),
|
||||||
|
analyzeRequest.getDossierId(),
|
||||||
|
analyzeRequest.getDossierTemplateId(),
|
||||||
|
analysisData.kieWrapperEntityRules().rulesVersion(),
|
||||||
|
analyzeRequest.getAnalysisNumber(),
|
||||||
|
TenantContext.getTenantId());
|
||||||
|
|
||||||
|
var notFoundManualOrImportedEntries = Stream.of(analysisData.notFoundManualRedactionEntries(), analysisData.notFoundImportedEntries())
|
||||||
|
.flatMap(Collection::stream)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
EntityLogChanges entityLogChanges = entityLogCreatorService.createInitialEntityLog(analyzeRequest,
|
||||||
|
analysisData.document(),
|
||||||
|
notFoundManualOrImportedEntries,
|
||||||
|
analysisData.dictionary().getVersion(),
|
||||||
|
analysisData.kieWrapperEntityRules().rulesVersion());
|
||||||
|
|
||||||
|
notFoundImportedEntitiesService.processEntityLog(entityLogChanges.getEntityLog(), analyzeRequest, analysisData.notFoundImportedEntries());
|
||||||
|
|
||||||
|
return finalizeAnalysis(analyzeRequest,
|
||||||
|
startTime,
|
||||||
|
analysisData.kieWrapperComponentRules(),
|
||||||
|
entityLogChanges,
|
||||||
|
analysisData.document(),
|
||||||
|
analysisData.document().getNumberOfPages(),
|
||||||
|
false,
|
||||||
|
new HashSet<>(),
|
||||||
|
context);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private AnalyzeResult finalizeAnalysis(AnalyzeRequest analyzeRequest,
|
private AnalyzeResult finalizeAnalysis(AnalyzeRequest analyzeRequest,
|
||||||
long startTime,
|
long startTime,
|
||||||
KieWrapper kieWrapperComponentRules,
|
KieWrapper kieWrapperComponentRules,
|
||||||
|
|||||||
@ -46,6 +46,8 @@ dependencies {
|
|||||||
implementation("org.kie:kie-api:9.44.0.Final")
|
implementation("org.kie:kie-api:9.44.0.Final")
|
||||||
implementation("org.drools:drools-compiler:9.44.0.Final")
|
implementation("org.drools:drools-compiler:9.44.0.Final")
|
||||||
testImplementation("org.kie:kie-ci:9.44.0.Final")
|
testImplementation("org.kie:kie-ci:9.44.0.Final")
|
||||||
|
|
||||||
|
api("ch.qos.logback:logback-classic:1.4.11")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.test {
|
tasks.test {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user