RED-8480: differenciate between recategorize and legal basis change

This commit is contained in:
Ali Oezyetimoglu 2024-04-16 18:10:42 +02:00
parent c066495df7
commit 498cd236c0
3 changed files with 4 additions and 7 deletions

View File

@ -357,7 +357,6 @@ public class EntityLogMergeService {
} }
@Deprecated(forRemoval = true)
private void mergeLegalBasisChange(ManualLegalBasisChange manualLegalBasisChange, private void mergeLegalBasisChange(ManualLegalBasisChange manualLegalBasisChange,
EntityLogEntry entityLogEntry, EntityLogEntry entityLogEntry,
int analysisNumber) { int analysisNumber) {
@ -379,7 +378,6 @@ 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<>();

View File

@ -2102,14 +2102,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.getRecategorizations().size()); assertEquals(1, allManualRedactions.getLegalBasisChanges().size());
assertTrue(allManualRedactions.getRecategorizations() assertTrue(allManualRedactions.getLegalBasisChanges()
.stream() .stream()
.anyMatch(entry -> entry.getAnnotationId().equals("annotationId"))); .anyMatch(entry -> entry.getAnnotationId().equals("annotationId")));
assertTrue(allManualRedactions.getRecategorizations() assertTrue(allManualRedactions.getLegalBasisChanges()
.stream() .stream()
.anyMatch(entry -> entry.getLegalBasis().equals("lb2"))); .anyMatch(entry -> entry.getLegalBasis().equals("lb2")));
assertTrue(allManualRedactions.getRecategorizations() assertTrue(allManualRedactions.getLegalBasisChanges()
.stream() .stream()
.anyMatch(entry -> entry.getSection().equals("section"))); .anyMatch(entry -> entry.getSection().equals("section")));
} }

View File

@ -6,7 +6,6 @@ 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