diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionLogCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionLogCreatorService.java index 35d3f639..4087c91f 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionLogCreatorService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/RedactionLogCreatorService.java @@ -14,6 +14,7 @@ import java.util.stream.Collectors; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Comment; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.ManualChange; @@ -206,6 +207,7 @@ public class RedactionLogCreatorService { manualChange1.setProcessedDate(manualChange.getProcessedDate()); manualChange1.setRequestedDate(manualChange.getRequestedDate()); manualChange1.setPropertyChanges(manualChange.getPropertyChanges()); + manualChange1.setAnnotationStatus(AnnotationStatus.APPROVED); return manualChange1; } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl index 1267cdf4..417fa51a 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl @@ -385,19 +385,18 @@ rule "DOC.7.0: Performing Laboratory (Name)" end - rule "DOC.7.1: Performing Laboratory (Country)" - when - nerEntities: NerEntities(hasEntitiesOfType("COUNTRY")) - $section: Section(containsString("PERFORMING LABORATORY:")) - then - nerEntities.streamEntitiesOfType("COUNTRY") - .filter(nerEntity -> $section.getTextRange().contains(nerEntity.textRange())) - .map(nerEntity -> entityCreationService.byNerEntity(nerEntity, "laboratory_country", EntityType.ENTITY, $section)) - .forEach(entity -> { - entity.apply("DOC.7.1", "Performing Laboratory found", "n-a"); - insert(entity); - }); - end +rule "DOC.7.1: Performing Laboratory (Country)" + when + nerEntities: NerEntities(hasEntitiesOfType("COUNTRY")) + $section: Section(containsString("PERFORMING LABORATORY:")) + then + nerEntities.streamEntitiesOfType("COUNTRY") + .filter(nerEntity -> $section.getTextRange().contains(nerEntity.textRange())) + .map(nerEntity -> entityCreationService.byNerEntity(nerEntity, "laboratory_country", EntityType.ENTITY, $section)) + .forEach(entity -> { + entity.apply("DOC.7.1", "Performing Laboratory found", "n-a"); + }); + end rule "DOC.7.2: Performing Laboratory (Country & Name) from dict" @@ -408,10 +407,10 @@ rule "DOC.7.2: Performing Laboratory (Country & Name) from dict" ) then $section.getEntitiesOfType("laboratory_country").forEach(entity -> { - entity.apply("DOC.7.2", "Performing laboratory country dictionary entry found.", "n-a"); + entity.apply("DOC.7.2", "Performing laboratory country dictionary entry found."); }); $section.getEntitiesOfType("laboratory_name").forEach(entity -> { - entity.apply("DOC.7.2", "Performing laboratory name dictionary entry found.", "n-a"); + entity.apply("DOC.7.2", "Performing laboratory name dictionary entry found."); }); end @@ -423,10 +422,7 @@ rule "DOC.7.3: Performing Laboratory (Country) from dict" && !(containsString("PERFORMING LABORATORY:") || (containsString("PERFORMING") && containsString("LABORATORY:"))) ) then - $section.getEntitiesOfType(List.of("laboratory_country", "laboratory_name")).forEach(entity -> { - entity.removeFromGraph(); - retract(entity); - }); + $section.getEntitiesOfType("laboratory_country", "laboratory_name").forEach(entity -> entity.remove("DOC.7.3", "Removed due to wrong section")); end