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

Merge branch 'RED-9140-fp' into 'master'

Browse Source 
RED-9140 - Properly distinct between REMOVED and IGNORED Change type

Closes RED-9140

See merge request redactmanager/redaction-service!464
This commit is contained in:
Andrei Isvoran 2024-07-23 15:58:26 +02:00
commit 2ab536dfee
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redaction-service-v1/redaction-service-server-v1/build.gradle.kts
View File

@ -16,7 +16,7 @@ val layoutParserVersion = "0.141.0"
val jacksonVersion = "2.15.2" val jacksonVersion = "2.15.2"
val droolsVersion = "9.44.0.Final" val droolsVersion = "9.44.0.Final"
val pdfBoxVersion = "3.0.0" val pdfBoxVersion = "3.0.0"
val persistenceServiceVersion = "2.473.0" val persistenceServiceVersion = "2.496.0"
val springBootStarterVersion = "3.1.5" val springBootStarterVersion = "3.1.5"
val springCloudVersion = "4.0.4" val springCloudVersion = "4.0.4"
val testContainersVersion = "1.19.7" val testContainersVersion = "1.19.7"

13
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityChangeLogService.java
View File

@ -102,7 +102,7 @@ public class EntityChangeLogService {
if (previousEntry.getManualChanges().isEmpty() && !currentEntry.getManualChanges().isEmpty()) { if (previousEntry.getManualChanges().isEmpty() && !currentEntry.getManualChanges().isEmpty()) {
currentLastManualChange = currentEntry.getManualChanges() currentLastManualChange = currentEntry.getManualChanges()
.get(currentEntry.getManualChanges().size() - 1); .get(currentEntry.getManualChanges().size() - 1);
return manualChange(propertyChanges, analysisNumber, currentLastManualChange); return manualChange(propertyChanges, analysisNumber, currentLastManualChange, currentEntry.getState());
} }
previousLastManualChange = previousEntry.getManualChanges() previousLastManualChange = previousEntry.getManualChanges()
@ -113,7 +113,7 @@ public class EntityChangeLogService {
if (Objects.equals(previousLastManualChange, currentLastManualChange)) { if (Objects.equals(previousLastManualChange, currentLastManualChange)) {
return systemChange(propertyChanges, analysisNumber, previousEntry.getState(), currentEntry.getState()); return systemChange(propertyChanges, analysisNumber, previousEntry.getState(), currentEntry.getState());
} else { } else {
return manualChange(propertyChanges, analysisNumber, currentLastManualChange); return manualChange(propertyChanges, analysisNumber, currentLastManualChange, currentEntry.getState());
} }
} }
@ -136,12 +136,17 @@ public class EntityChangeLogService {
} }
private Change manualChange(List<PropertyChange> propertyChanges, int analysisNumber, ManualChange manualChange) { private Change manualChange(List<PropertyChange> propertyChanges, int analysisNumber, ManualChange manualChange, EntryState entryState) {
return ChangeFactory.toChange(convertToChangeType(manualChange.getManualRedactionType()), Change change = ChangeFactory.toChange(convertToChangeType(manualChange.getManualRedactionType()),
manualChange.getRequestedDate(), manualChange.getRequestedDate(),
analysisNumber, analysisNumber,
propertyChanges.toArray(new PropertyChange[0])); propertyChanges.toArray(new PropertyChange[0]));
if (change.getType().equals(ChangeType.REMOVED) && entryState.equals(EntryState.IGNORED)) {
change.setType(ChangeType.IGNORED);
}
return change;
} }

2
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java
View File

@ -1990,7 +1990,7 @@ public class RedactionIntegrationTest extends RulesIntegrationTest {
assertEquals(responseDavidKsenia.getChanges() assertEquals(responseDavidKsenia.getChanges()
.get(0).getType(), ChangeType.ADDED); .get(0).getType(), ChangeType.ADDED);
assertEquals(responseDavidKsenia.getChanges() assertEquals(responseDavidKsenia.getChanges()
.get(1).getType(), ChangeType.REMOVED); .get(1).getType(), ChangeType.IGNORED);
assertEquals(responseDavidKsenia.getChanges() assertEquals(responseDavidKsenia.getChanges()
.get(1).getPropertyChanges() .get(1).getPropertyChanges()
.get("reason"), "No vertebrate found -> removed by manual override"); .get("reason"), "No vertebrate found -> removed by manual override");