Merge branch 'RED-8043-fixes' into 'master'

RED-8043 - General fixes

Closes RED-8043

See merge request redactmanager/persistence-service!290
This commit is contained in:
Andrei Isvoran 2024-01-03 14:13:47 +01:00
commit af2a16e540
2 changed files with 4 additions and 5 deletions

View File

@ -117,12 +117,12 @@ public class ManualRedactionService {
.entriesToAdd(convertEntriesToAdd(manualRedactionEntryEntities))
.build();
entityLogMergeService.sendToAnalyseQueue(fileId, dossierEntity, fileStatusService.getStatus(fileId), manualRedactions);
} else {
reprocess(dossierId, fileId);
}
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
reprocess(dossierId, fileId);
return response;
}
@ -300,12 +300,12 @@ public class ManualRedactionService {
.resizeRedactions(MagicConverter.convert(manualResizeRedactionEntities, ManualResizeRedaction.class))
.build();
entityLogMergeService.sendToAnalyseQueue(fileId, dossierPersistenceService.getAndValidateDossier(dossierId), fileStatusService.getStatus(fileId), manualRedactions);
} else {
reprocess(dossierId, fileId);
}
analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
reprocess(dossierId, fileId);
return response;
}

View File

@ -53,7 +53,6 @@ public class RedactionAnalysisResponseReceiver {
ManualRedactionEntryEntity manualRedactionEntry = optionalManualRedactionEntry.get();
manualRedactionEntry.setTextBefore(unprocessedManualEntity.getTextBefore());
manualRedactionEntry.setTextAfter(unprocessedManualEntity.getTextAfter());
manualRedactionEntry.setSection(unprocessedManualEntity.getSection());
manualRedactionEntry.setPositions(convertPositions(unprocessedManualEntity.getPositions()));
addRedactionPersistenceService.update(manualRedactionEntry);
}