Revert-RED8480 and add updates for RED-9042

This commit is contained in:
Ali Oezyetimoglu 2024-04-24 13:23:14 +02:00
parent 622494a61c
commit 790a0d2bcd
2 changed files with 26 additions and 4 deletions

View File

@ -0,0 +1,9 @@
databaseChangeLog:
- changeSet:
id: add-legal-basis-change-to-manual-recategorization
author: ali
changes:
- modifyDataType:
columnName: legal_basis
newDataType: VARCHAR(4000)
tableName: manual_legal_basis_change

View File

@ -12,6 +12,7 @@ import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.when;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@ -42,8 +43,12 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist
import com.iqser.red.service.persistence.management.v1.processor.service.redactionlog.RedactionRequest;
import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeResult;
import com.iqser.red.service.persistence.service.v1.api.shared.model.MessageType;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Change;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ChangeType;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLog;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogLegalBasis;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
@ -2389,9 +2394,13 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
.value("Image:Other")
.build();
var resp = manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recategorizationRequestModel), false);
manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recategorizationRequestModel), false);
System.out.println(resp);
var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
assertTrue(allManualRedactions.getRecategorizations()
.stream()
.anyMatch(manualRecategorization -> manualRecategorization.getType().equals(typeLogo.getType())));
}
@ -2455,9 +2464,13 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
.value("Ranya Eikenboom")
.build();
var resp = manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recategorizationRequestModel), false);
manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recategorizationRequestModel), false);
System.out.println(resp);
var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
assertTrue(allManualRedactions.getLegalBasisChanges()
.stream()
.anyMatch(manualLegalBasisChange -> manualLegalBasisChange.getLegalBasis().equals(recategorizationRequestModel.getLegalBasis())));
}