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

RED-7712 - Published information does not always trigger the skip mechanism

Browse Source
This commit is contained in:
Andrei Isvoran 2023-11-01 08:59:11 +01:00
parent 54bb79b294
commit 908b3ca4b2
5 changed files with 30 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl
View File

@ -146,17 +146,13 @@ rule "CBI.7.0: Do not redact Names and Addresses if published information found
rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row" rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row"
when when
$table: Table(hasEntitiesOfType("published_information"), $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author"))
(hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address"))) $tableCell: TableCell() from $table.streamTableCells().toList()
$sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList()
TextEntity(type == "published_information") from $tableCell.getEntities()
$author: TextEntity(type == "CBI_author") from $tableCell.getEntities()
then then
$table.streamEntitiesWhereRowContainsEntitiesOfType(List.of("CBI_author", "CBI_address")) $author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author));
.forEach(redactionEntity -> {
redactionEntity.skipWithReferences(
"CBI.7.1",
"Published Information found in row",
$table.getEntitiesOfTypeInSameRow("published_information", redactionEntity)
);
});
end end

16
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl
View File

@ -329,17 +329,13 @@ rule "CBI.7.0: Do not redact Names and Addresses if published information found
rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row" rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row"
when when
$table: Table(hasEntitiesOfType("published_information"), $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author"))
(hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address"))) $tableCell: TableCell() from $table.streamTableCells().toList()
$sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList()
TextEntity(type == "published_information") from $tableCell.getEntities()
$author: TextEntity(type == "CBI_author") from $tableCell.getEntities()
then then
$table.streamEntitiesWhereRowContainsEntitiesOfType(List.of("CBI_author", "CBI_address")) $author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author));
.forEach(redactionEntity -> {
redactionEntity.skipWithReferences(
"CBI.7.1",
"Published Information found in row",
$table.getEntitiesOfTypeInSameRow("published_information", redactionEntity)
);
});
end end

16
redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/rules.drl
View File

@ -142,17 +142,13 @@ rule "CBI.7.0: Do not redact Names and Addresses if published information found
rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row" rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row"
when when
$table: Table(hasEntitiesOfType("published_information"), $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author"))
(hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address"))) $tableCell: TableCell() from $table.streamTableCells().toList()
$sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList()
TextEntity(type == "published_information") from $tableCell.getEntities()
$author: TextEntity(type == "CBI_author") from $tableCell.getEntities()
then then
$table.streamEntitiesWhereRowContainsEntitiesOfType(List.of("CBI_author", "CBI_address")) $author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author));
.forEach(redactionEntity -> {
redactionEntity.skipWithReferences(
"CBI.7.1",
"Published Information found in row",
$table.getEntitiesOfTypeInSameRow("published_information", redactionEntity)
);
});
end end

16
redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl
View File

@ -329,17 +329,13 @@ rule "CBI.7.0: Do not redact Names and Addresses if published information found
rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row" rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row"
when when
$table: Table(hasEntitiesOfType("published_information"), $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author"))
(hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address"))) $tableCell: TableCell() from $table.streamTableCells().toList()
$sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList()
TextEntity(type == "published_information") from $tableCell.getEntities()
$author: TextEntity(type == "CBI_author") from $tableCell.getEntities()
then then
$table.streamEntitiesWhereRowContainsEntitiesOfType(List.of("CBI_author", "CBI_address")) $author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author));
.forEach(redactionEntity -> {
redactionEntity.skipWithReferences(
"CBI.7.1",
"Published Information found in row",
$table.getEntitiesOfTypeInSameRow("published_information", redactionEntity)
);
});
end end

16
redaction-service-v1/rules-management/src/test/resources/all_redact_manager_rules.drl
View File

@ -329,17 +329,13 @@ rule "CBI.7.0: Do not redact Names and Addresses if published information found
rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row" rule "CBI.7.1: Do not redact Names and Addresses if published information found in same table row"
when when
$table: Table(hasEntitiesOfType("published_information"), $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author"))
(hasEntitiesOfType("CBI_author") || hasEntitiesOfType("CBI_address"))) $tableCell: TableCell() from $table.streamTableCells().toList()
$sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList()
TextEntity(type == "published_information") from $tableCell.getEntities()
$author: TextEntity(type == "CBI_author") from $tableCell.getEntities()
then then
$table.streamEntitiesWhereRowContainsEntitiesOfType(List.of("CBI_author", "CBI_address")) $author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author));
.forEach(redactionEntity -> {
redactionEntity.skipWithReferences(
"CBI.7.1",
"Published Information found in row",
$table.getEntitiesOfTypeInSameRow("published_information", redactionEntity)
);
});
end end