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

Merge branch 'RED-7712' into 'master'

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

Closes RED-7712

See merge request redactmanager/redaction-service!192
This commit is contained in:
Andrei Isvoran 2023-11-03 08:42:48 +01:00
commit 5a4947372f
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,8 +149,8 @@ rule "CBI.7.1: Do not redact Names and Addresses if published information found
$table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author")) $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author"))
$tableCell: TableCell() from $table.streamTableCells().toList() $tableCell: TableCell() from $table.streamTableCells().toList()
$sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList() $sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList()
TextEntity(type == "published_information") from $tableCell.getEntities() TextEntity(type == "published_information", active()) from $tableCell.getEntities()
$author: TextEntity(type == "CBI_author") from $tableCell.getEntities() $author: TextEntity(type == "CBI_author", active()) from $tableCell.getEntities()
then then
$author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author)); $author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author));
end end

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

@ -332,8 +332,8 @@ rule "CBI.7.1: Do not redact Names and Addresses if published information found
$table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author")) $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author"))
$tableCell: TableCell() from $table.streamTableCells().toList() $tableCell: TableCell() from $table.streamTableCells().toList()
$sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList() $sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList()
TextEntity(type == "published_information") from $tableCell.getEntities() TextEntity(type == "published_information", active()) from $tableCell.getEntities()
$author: TextEntity(type == "CBI_author") from $tableCell.getEntities() $author: TextEntity(type == "CBI_author", active()) from $tableCell.getEntities()
then then
$author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author)); $author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author));
end end

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

@ -145,8 +145,8 @@ rule "CBI.7.1: Do not redact Names and Addresses if published information found
$table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author")) $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author"))
$tableCell: TableCell() from $table.streamTableCells().toList() $tableCell: TableCell() from $table.streamTableCells().toList()
$sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList() $sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList()
TextEntity(type == "published_information") from $tableCell.getEntities() TextEntity(type == "published_information", active()) from $tableCell.getEntities()
$author: TextEntity(type == "CBI_author") from $tableCell.getEntities() $author: TextEntity(type == "CBI_author", active()) from $tableCell.getEntities()
then then
$author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author)); $author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author));
end end

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

@ -332,8 +332,8 @@ rule "CBI.7.1: Do not redact Names and Addresses if published information found
$table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author")) $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author"))
$tableCell: TableCell() from $table.streamTableCells().toList() $tableCell: TableCell() from $table.streamTableCells().toList()
$sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList() $sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList()
TextEntity(type == "published_information") from $tableCell.getEntities() TextEntity(type == "published_information", active()) from $tableCell.getEntities()
$author: TextEntity(type == "CBI_author") from $tableCell.getEntities() $author: TextEntity(type == "CBI_author", active()) from $tableCell.getEntities()
then then
$author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author)); $author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author));
end end

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

@ -332,8 +332,8 @@ rule "CBI.7.1: Do not redact Names and Addresses if published information found
$table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author")) $table: Table(hasEntitiesOfType("published_information"), hasEntitiesOfType("CBI_author"))
$tableCell: TableCell() from $table.streamTableCells().toList() $tableCell: TableCell() from $table.streamTableCells().toList()
$sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList() $sameRowCell: TableCell(row == $tableCell.row) from $table.streamTableCells().toList()
TextEntity(type == "published_information") from $tableCell.getEntities() TextEntity(type == "published_information", active()) from $tableCell.getEntities()
$author: TextEntity(type == "CBI_author") from $tableCell.getEntities() $author: TextEntity(type == "CBI_author", active()) from $tableCell.getEntities()
then then
$author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author)); $author.skipWithReferences("CBI.7.1", "Published Information found in row", $table.getEntitiesOfTypeInSameRow("published_information", $author));
end end