Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Revert "RED-8480: differenciate between recategorize and legal basis change"

Browse Source 
This reverts commit dcb5c0e03e1f4fabbe270658a790f1c5d08b4cfd.
This commit is contained in:
Ali Oezyetimoglu 2024-04-24 13:12:59 +02:00
parent 05ce3123fc
commit 0f6c7faceb
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java
View File

@ -357,6 +357,7 @@ public class EntityLogMergeService {
} }
@Deprecated(forRemoval = true)
private void mergeLegalBasisChange(ManualLegalBasisChange manualLegalBasisChange, private void mergeLegalBasisChange(ManualLegalBasisChange manualLegalBasisChange,
EntityLogEntry entityLogEntry, EntityLogEntry entityLogEntry,
int analysisNumber) { int analysisNumber) {
@ -378,6 +379,7 @@ public class EntityLogMergeService {
} }
@Deprecated(forRemoval = true)
private Map<String, String> getPropertyChanges(ManualLegalBasisChange manualLegalBasisChange) { private Map<String, String> getPropertyChanges(ManualLegalBasisChange manualLegalBasisChange) {
Map<String, String> propertyChanges = new HashMap<>(); Map<String, String> propertyChanges = new HashMap<>();

8
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
View File

@ -2100,14 +2100,14 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recatModel), false); manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recatModel), false);
var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true); var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
assertEquals(1, allManualRedactions.getLegalBasisChanges().size()); assertEquals(1, allManualRedactions.getRecategorizations().size());
assertTrue(allManualRedactions.getLegalBasisChanges() assertTrue(allManualRedactions.getRecategorizations()
.stream() .stream()
.anyMatch(entry -> entry.getAnnotationId().equals("annotationId"))); .anyMatch(entry -> entry.getAnnotationId().equals("annotationId")));
assertTrue(allManualRedactions.getLegalBasisChanges() assertTrue(allManualRedactions.getRecategorizations()
.stream() .stream()
.anyMatch(entry -> entry.getLegalBasis().equals("lb2"))); .anyMatch(entry -> entry.getLegalBasis().equals("lb2")));
assertTrue(allManualRedactions.getLegalBasisChanges() assertTrue(allManualRedactions.getRecategorizations()
.stream() .stream()
.anyMatch(entry -> entry.getSection().equals("section"))); .anyMatch(entry -> entry.getSection().equals("section")));
} }

1
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/ManualLegalBasisChange.java
View File

@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
@Deprecated(forRemoval = true)
@Data @Data
@SuperBuilder @SuperBuilder
@NoArgsConstructor @NoArgsConstructor