From 1a8fbb97e9b247d32e55d64a9ffaf0c4c0b09ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kilian=20Sch=C3=BCttler?= Date: Thu, 30 Nov 2023 13:47:15 +0100 Subject: [PATCH] Resolve DM-606 --- .../src/test/resources/drools/acceptance_rules.drl | 2 +- .../src/test/resources/drools/all_redact_manager_rules.drl | 2 +- .../src/test/resources/drools/documine_flora.drl | 3 ++- .../src/test/resources/drools/manual_redaction_rules.drl | 2 +- .../src/test/resources/drools/rules.drl | 2 +- .../src/test/resources/drools/rules_v2.drl | 2 +- .../src/test/resources/drools/table_demo.drl | 2 +- .../src/test/resources/drools/test_rules.drl | 2 +- .../src/main/resources/all_redact_manager_rules.drl | 2 +- .../rules-management/src/main/resources/all_rules_documine.drl | 2 +- 10 files changed, 11 insertions(+), 10 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl index 76273926..c98397d2 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl @@ -510,7 +510,7 @@ rule "MAN.0.1: Apply manual resize redaction" rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity" salience 128 when - $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED) + $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED) $entityToBeRemoved: TextEntity(matchesAnnotationId($id)) then $entityToBeRemoved.getManualOverwrite().addChange($idRemoval); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl index a0c83f4d..8436fd68 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl @@ -1327,7 +1327,7 @@ rule "MAN.0.1: Apply manual resize redaction" rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity" salience 128 when - $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED) + $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED) $entityToBeRemoved: TextEntity(matchesAnnotationId($id)) then $entityToBeRemoved.getManualOverwrite().addChange($idRemoval); 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 dc4613f4..6d898478 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 @@ -1186,7 +1186,7 @@ rule "MAN.0.1: Apply manual resize redaction" rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity" salience 128 when - $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED) + $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED) $entityToBeRemoved: TextEntity(matchesAnnotationId($id)) then $entityToBeRemoved.getManualOverwrite().addChange($idRemoval); @@ -1281,6 +1281,7 @@ rule "MAN.3.3: Apply recategorization entities by default" $entity.apply("MAN.3.3", "Recategorized entities are applied by default."); end + // Rule unit: MAN.4 rule "MAN.4.0: Apply legal basis change" salience 128 diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl index 6809095c..c9d42001 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl @@ -100,7 +100,7 @@ rule "MAN.0.1: Apply manual resize redaction" rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity" salience 128 when - $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED) + $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED) $entityToBeRemoved: TextEntity(matchesAnnotationId($id)) then $entityToBeRemoved.getManualOverwrite().addChange($idRemoval); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl index 20af024f..18d1ce82 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl @@ -908,7 +908,7 @@ rule "MAN.0.1: Apply manual resize redaction" rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity" salience 128 when - $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED) + $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED) $entityToBeRemoved: TextEntity(matchesAnnotationId($id)) then $entityToBeRemoved.getManualOverwrite().addChange($idRemoval); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl index 4f507a06..08734f00 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl @@ -137,7 +137,7 @@ rule "MAN.0.1: Apply manual resize redaction" rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity" salience 128 when - $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED) + $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED) $entityToBeRemoved: TextEntity(matchesAnnotationId($id)) then $entityToBeRemoved.getManualOverwrite().addChange($idRemoval); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl index 3f818056..a2b61013 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl @@ -250,7 +250,7 @@ rule "MAN.0.1: Apply manual resize redaction" rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity" salience 128 when - $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED) + $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED) $entityToBeRemoved: TextEntity(matchesAnnotationId($id)) then $entityToBeRemoved.getManualOverwrite().addChange($idRemoval); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl index 1cd5e023..fa8885e7 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl @@ -150,7 +150,7 @@ rule "MAN.0.1: Apply manual resize redaction" rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity" salience 128 when - $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED) + $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED) $entityToBeRemoved: TextEntity(matchesAnnotationId($id)) then $entityToBeRemoved.getManualOverwrite().addChange($idRemoval); diff --git a/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl b/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl index 2e139426..d696a4db 100644 --- a/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl +++ b/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl @@ -1319,7 +1319,7 @@ rule "MAN.0.1: Apply manual resize redaction" rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity" salience 128 when - $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED) + $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED) $entityToBeRemoved: TextEntity(matchesAnnotationId($id)) then $entityToBeRemoved.getManualOverwrite().addChange($idRemoval); diff --git a/redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl b/redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl index 65ae2ca0..730bfed7 100644 --- a/redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl +++ b/redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl @@ -1333,7 +1333,7 @@ rule "MAN.0.1: Apply manual resize redaction" rule "MAN.1.0: Apply id removals that are valid and not in forced redactions to Entity" salience 128 when - $idRemoval: IdRemoval($id: annotationId, status == AnnotationStatus.APPROVED) + $idRemoval: IdRemoval($id: annotationId, !removeFromDictionary, !removeFromAllDossiers, status == AnnotationStatus.APPROVED) $entityToBeRemoved: TextEntity(matchesAnnotationId($id)) then $entityToBeRemoved.getManualOverwrite().addChange($idRemoval);