From cc62bbc3ecf915faf472bd2055be08b2c0e57030 Mon Sep 17 00:00:00 2001 From: Maverick Studer Date: Tue, 6 Feb 2024 14:28:11 +0100 Subject: [PATCH] RED-8451: RECATEGORIZED hint is APPLIED instead of SKIPPED --- .../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 | 2 +- .../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, 10 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 57941be0..10319feb 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 @@ -846,7 +846,7 @@ rule "MAN.3.2: Apply image recategorization" rule "MAN.3.3: Apply recategorization entities by default" salience 128 when - $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false)) + $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type())) then $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis()); end 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 f4c5234f..588118db 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 @@ -1416,7 +1416,7 @@ rule "MAN.3.2: Apply image recategorization" rule "MAN.3.3: Apply recategorization entities by default" salience 128 when - $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false)) + $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type())) then $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis()); end 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 a2c14670..773fa565 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 @@ -1276,7 +1276,7 @@ rule "MAN.3.2: Apply image recategorization" rule "MAN.3.3: Apply recategorization entities by default" salience 128 when - $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false)) + $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type())) then $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis()); end 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 900264bc..932bfdc2 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 @@ -188,7 +188,7 @@ rule "MAN.3.2: Apply image recategorization" rule "MAN.3.3: Apply recategorization entities by default" salience 128 when - $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false)) + $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type())) then $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis()); end 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 f7ea3974..fdd31935 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 @@ -1006,7 +1006,7 @@ rule "MAN.3.2: Apply image recategorization" rule "MAN.3.3: Apply recategorization entities by default" salience 128 when - $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false)) + $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type())) then $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis()); end 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 7c93954f..44672168 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 @@ -212,7 +212,7 @@ rule "MAN.3.1: Apply entity recategorization of same type" rule "MAN.3.3: Apply recategorization entities by default" salience 128 when - $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false)) + $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type())) then $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis()); end 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 0458ff2c..02f1a2bd 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 @@ -338,7 +338,7 @@ rule "MAN.3.2: Apply image recategorization" rule "MAN.3.3: Apply recategorization entities by default" salience 128 when - $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false)) + $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type())) then $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis()); end 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 6e4dfc49..2914d7fa 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 @@ -238,7 +238,7 @@ rule "MAN.3.2: Apply image recategorization" rule "MAN.3.3: Apply recategorization entities by default" salience 128 when - $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false)) + $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type())) then $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis()); end 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 4232aba8..66c48c2d 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 @@ -1438,7 +1438,7 @@ rule "MAN.3.2: Apply image recategorization" rule "MAN.3.3: Apply recategorization entities by default" salience 128 when - $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false)) + $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type())) then $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis()); end 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 edd5d731..1e57ab4c 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 @@ -1423,7 +1423,7 @@ rule "MAN.3.2: Apply image recategorization" rule "MAN.3.3: Apply recategorization entities by default" salience 128 when - $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false)) + $entity: IEntity(getManualOverwrite().getRecategorized().orElse(false), !dictionary.isHint(type())) then $entity.apply("MAN.3.3", "Recategorized entities are applied by default.", $entity.legalBasis()); end