Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

Merge branch 'RED-9378' into 'master'

Browse Source 
RED-9378 - Don't create UnprocessedManualEntities for non-manual entities

Closes RED-9378

See merge request redactmanager/redaction-service!441
This commit is contained in:
Andrei Isvoran 2024-06-21 07:57:04 +02:00
commit 9ef104bbae
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java
View File

@ -13,7 +13,8 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLog; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.BaseAnnotation; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.BaseAnnotation;
@ -61,7 +62,9 @@ public class UnprocessedChangesService {
dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId()); dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
EntityLog previousEntityLog = redactionStorageService.getEntityLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId()); List<String> annotationIds = analyzeRequest.getManualRedactions().buildAll().stream().map(BaseAnnotation::getAnnotationId).toList();
List<EntityLogEntry> entityLogEntries = redactionStorageService.getEntityLogEntriesById(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), annotationIds);
Document document = DocumentGraphMapper.toDocumentGraph(observedStorageService.getDocumentData(analyzeRequest.getDossierId(), analyzeRequest.getFileId())); Document document = DocumentGraphMapper.toDocumentGraph(observedStorageService.getDocumentData(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
Set<String> allAnnotationIds = analyzeRequest.getManualRedactions().getEntriesToAdd() Set<String> allAnnotationIds = analyzeRequest.getManualRedactions().getEntriesToAdd()
@ -77,9 +80,10 @@ public class UnprocessedChangesService {
List<ManualResizeRedaction> manualResizeRedactions = analyzeRequest.getManualRedactions().getResizeRedactions() List<ManualResizeRedaction> manualResizeRedactions = analyzeRequest.getManualRedactions().getResizeRedactions()
.stream() .stream()
.toList(); .toList();
List<PrecursorEntity> manualEntitiesToBeResized = previousEntityLog.getEntityLogEntry() List<PrecursorEntity> manualEntitiesToBeResized = entityLogEntries
.stream() .stream()
.filter(entityLogEntry -> resizeIds.contains(entityLogEntry.getId())) .filter(entityLogEntry -> resizeIds.contains(entityLogEntry.getId()))
.filter(entityLogEntry -> entityLogEntry.getEngines().contains(Engine.MANUAL))
.toList() .toList()
.stream() .stream()
.map(PrecursorEntity::fromEntityLogEntry) .map(PrecursorEntity::fromEntityLogEntry)

6
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java
View File

@ -109,6 +109,12 @@ public class RedactionStorageService {
} }
public List<EntityLogEntry> getEntityLogEntriesById(String dossierId, String fileId, List<String> ids) {
return entityLogMongoService.findEntityLogEntriesByIds(dossierId, fileId, ids);
}
@Timed("redactmanager_getImportedRedactions") @Timed("redactmanager_getImportedRedactions")
public ImportedRedactions getImportedRedactions(String dossierId, String fileId) { public ImportedRedactions getImportedRedactions(String dossierId, String fileId) {