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

RED-9495 - Remove here for locally resized dictionary entry should remove the entry completly

Browse Source 
- update unit tests
This commit is contained in:
corinaolariu 2024-07-11 10:50:51 +03:00
parent 0bf85842c1
commit 3fefb8efab
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@ -56,6 +57,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualRedactionType; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualRedactionType;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualAddResponse; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualAddResponse;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactionResponse;
import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dictionary.Dictionary; import com.iqser.red.service.persistence.service.v1.api.shared.model.dictionary.Dictionary;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
@ -1701,22 +1703,22 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
when(entityLogService.getEntityLog(any(), any(), anyBoolean())).thenReturn(entityLog); when(entityLogService.getEntityLog(any(), any(), anyBoolean())).thenReturn(entityLog);
manualRedactionClient.recategorizeBulk(dossier.getId(), ManualRedactionResponse response = manualRedactionClient.recategorizeBulk(dossier.getId(),
file.getId(), file.getId(),
Set.of(RecategorizationRequestModel.builder().annotationId("dv").legalBasis("").section("section").type(type.getType()).build()), Set.of(RecategorizationRequestModel.builder().annotationId("dv").legalBasis("").section("section").type(type.getType()).build()),
false); false);
var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true); var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true);
assertEquals(allManualRedactions.getRecategorizations().size(), 1); assertEquals(allManualRedactions.getRecategorizations().size(), 1);
assertTrue(allManualRedactions.getRecategorizations() assertTrue(allManualRedactions.getRecategorizations()
.stream() .stream()
.anyMatch(entry -> entry.getAnnotationId().equals("dv"))); .anyMatch(entry -> entry.getAnnotationId().equals(response.getManualAddResponses().get(0).getAnnotationId())));
var unprocessedManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), true, true); var unprocessedManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), true, true);
assertEquals(unprocessedManualRedactions.getRecategorizations().size(), 1); assertEquals(unprocessedManualRedactions.getRecategorizations().size(), 1);
assertTrue(unprocessedManualRedactions.getRecategorizations() assertTrue(unprocessedManualRedactions.getRecategorizations()
.stream() .stream()
.anyMatch(entry -> entry.getAnnotationId().equals("dv"))); .anyMatch(entry -> entry.getAnnotationId().equals(response.getManualAddResponses().get(0).getAnnotationId())));
fileProcessingClient.analysisSuccessful(dossier.getId(), fileProcessingClient.analysisSuccessful(dossier.getId(),
file.getId(), file.getId(),
@ -1728,7 +1730,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
.dossierId(dossier.getId()) .dossierId(dossier.getId())
.build()); .build());
manualRedactionClient.recategorizeBulk(dossier.getId(), ManualRedactionResponse response2 = manualRedactionClient.recategorizeBulk(dossier.getId(),
file.getId(), file.getId(),
Set.of(RecategorizationRequestModel.builder().annotationId("dv2").legalBasis("").section("section").type(type.getType()).build()), Set.of(RecategorizationRequestModel.builder().annotationId("dv2").legalBasis("").section("section").type(type.getType()).build()),
false); false);
@ -1737,19 +1739,19 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
assertEquals(allManualRedactions.getRecategorizations().size(), 2); assertEquals(allManualRedactions.getRecategorizations().size(), 2);
assertTrue(allManualRedactions.getRecategorizations() assertTrue(allManualRedactions.getRecategorizations()
.stream() .stream()
.anyMatch(entry -> entry.getAnnotationId().equals("dv"))); .anyMatch(entry -> entry.getAnnotationId().equals(response.getManualAddResponses().get(0).getAnnotationId())));
assertTrue(allManualRedactions.getRecategorizations() assertTrue(allManualRedactions.getRecategorizations()
.stream() .stream()
.anyMatch(entry -> entry.getAnnotationId().equals("dv2"))); .anyMatch(entry -> entry.getAnnotationId().equals(response2.getManualAddResponses().get(0).getAnnotationId())));
unprocessedManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), true, true); unprocessedManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), true, true);
assertEquals(unprocessedManualRedactions.getRecategorizations().size(), 1); assertEquals(unprocessedManualRedactions.getRecategorizations().size(), 1);
assertTrue(unprocessedManualRedactions.getRecategorizations() assertTrue(unprocessedManualRedactions.getRecategorizations()
.stream() .stream()
.noneMatch(entry -> entry.getAnnotationId().equals("dv"))); .noneMatch(entry -> entry.getAnnotationId().equals(response.getManualAddResponses().get(0).getAnnotationId())));
assertTrue(unprocessedManualRedactions.getRecategorizations() assertTrue(unprocessedManualRedactions.getRecategorizations()
.stream() .stream()
.anyMatch(entry -> entry.getAnnotationId().equals("dv2"))); .anyMatch(entry -> entry.getAnnotationId().equals(response2.getManualAddResponses().get(0).getAnnotationId())));
fileProcessingClient.analysisSuccessful(dossier.getId(), fileProcessingClient.analysisSuccessful(dossier.getId(),
file.getId(), file.getId(),
@ -1765,10 +1767,10 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
assertEquals(allManualRedactions.getRecategorizations().size(), 2); assertEquals(allManualRedactions.getRecategorizations().size(), 2);
assertTrue(allManualRedactions.getRecategorizations() assertTrue(allManualRedactions.getRecategorizations()
.stream() .stream()
.anyMatch(entry -> entry.getAnnotationId().equals("dv"))); .anyMatch(entry -> entry.getAnnotationId().equals(response.getManualAddResponses().get(0).getAnnotationId())));
assertTrue(allManualRedactions.getRecategorizations() assertTrue(allManualRedactions.getRecategorizations()
.stream() .stream()
.anyMatch(entry -> entry.getAnnotationId().equals("dv2"))); .anyMatch(entry -> entry.getAnnotationId().equals(response2.getManualAddResponses().get(0).getAnnotationId())));
unprocessedManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), true, true); unprocessedManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), true, true);
assertTrue(unprocessedManualRedactions.getRecategorizations().isEmpty()); assertTrue(unprocessedManualRedactions.getRecategorizations().isEmpty());
@ -2105,13 +2107,13 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
.section("overriddenSection") .section("overriddenSection")
.build(); .build();
manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recatModel), false); ManualRedactionResponse response =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.getRecategorizations().size());
assertTrue(allManualRedactions.getRecategorizations() assertTrue(allManualRedactions.getRecategorizations()
.stream() .stream()
.anyMatch(entry -> entry.getAnnotationId().equals("annotationId"))); .anyMatch(entry -> entry.getAnnotationId().equals(response.getManualAddResponses().get(0).getAnnotationId())));
assertTrue(allManualRedactions.getRecategorizations() assertTrue(allManualRedactions.getRecategorizations()
.stream() .stream()
.anyMatch(entry -> entry.getLegalBasis().equals("lb2"))); .anyMatch(entry -> entry.getLegalBasis().equals("lb2")));
@ -2590,7 +2592,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
@Test @Test
public void testLocalLegalBasisChange() { public void testLocalLegalBasisChangeOnDictEntry() {
var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate(); var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate();
var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate); var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate);
@ -2626,7 +2628,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
.build())) .build()))
.getManualAddResponses().get(0); .getManualAddResponses().get(0);
assertEquals(response.getEntityLogEntry().getId(), "AnnotationId"); assertNotEquals(response.getEntityLogEntry().getId(), "AnnotationId");
assertEquals(response.getEntityLogEntry().getLegalBasis(), "new legal basis"); assertEquals(response.getEntityLogEntry().getLegalBasis(), "new legal basis");
assertEquals(response.getEntityLogEntry().getManualChanges() assertEquals(response.getEntityLogEntry().getManualChanges()
.get(0).getManualRedactionType(), ManualRedactionType.LEGAL_BASIS_CHANGE); .get(0).getManualRedactionType(), ManualRedactionType.LEGAL_BASIS_CHANGE);
@ -2635,7 +2637,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
} }
@Test @Test
public void testLocalResize() { public void testLocalResizeOnDictEntry() {
var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate(); var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate();
var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate); var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate);
@ -2674,7 +2676,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
false) false)
.getManualAddResponses().get(0); .getManualAddResponses().get(0);
assertEquals(response.getEntityLogEntry().getId(), "AnnotationId"); assertNotEquals(response.getEntityLogEntry().getId(), "AnnotationId");
assertEquals(response.getEntityLogEntry().getValue(), "Luke"); assertEquals(response.getEntityLogEntry().getValue(), "Luke");
assertEquals(response.getEntityLogEntry().getPositions().get(0).getRectangle()[0], 5f); assertEquals(response.getEntityLogEntry().getPositions().get(0).getRectangle()[0], 5f);
assertEquals(response.getEntityLogEntry().getPositions().get(0).getRectangle()[1], 5f); assertEquals(response.getEntityLogEntry().getPositions().get(0).getRectangle()[1], 5f);
@ -2688,7 +2690,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
@Test @Test
public void testLocalRecategorize() { public void testLocalRecategorizeOnDictEntry() {
var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate(); var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate();
var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate); var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate);
@ -2729,7 +2731,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
false) false)
.getManualAddResponses().get(0); .getManualAddResponses().get(0);
assertEquals(response.getEntityLogEntry().getId(), "AnnotationId"); assertNotEquals(response.getEntityLogEntry().getId(), "AnnotationId");
assertEquals(response.getEntityLogEntry().getType(), type2.getType()); assertEquals(response.getEntityLogEntry().getType(), type2.getType());
assertEquals(response.getEntityLogEntry().getManualChanges() assertEquals(response.getEntityLogEntry().getManualChanges()
.get(0).getManualRedactionType(), ManualRedactionType.RECATEGORIZE); .get(0).getManualRedactionType(), ManualRedactionType.RECATEGORIZE);
@ -2832,7 +2834,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest {
false) false)
.getManualAddResponses().get(0); .getManualAddResponses().get(0);
assertEquals(response.getEntityLogEntry().getId(), "AnnotationId"); assertNotEquals(response.getEntityLogEntry().getId(), "AnnotationId");
assertEquals(response.getEntityLogEntry().getType(), type2.getType()); assertEquals(response.getEntityLogEntry().getType(), type2.getType());
assertEquals(response.getEntityLogEntry().getManualChanges() assertEquals(response.getEntityLogEntry().getManualChanges()
.get(0).getManualRedactionType(), ManualRedactionType.RECATEGORIZE); .get(0).getManualRedactionType(), ManualRedactionType.RECATEGORIZE);