From 2a4c8dfa714b34d650cc8f15ecb87eaba5a7f252 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Wed, 28 Feb 2024 09:47:35 +0100 Subject: [PATCH] RED-8615: Revert and change the current behaviour of manualChanges --- ...SaasMigrationStatusPersistenceService.java | 9 +-- .../tests/ManualRedactionTest.java | 81 ------------------- .../entitymapped/BaseAnnotation.java | 2 - 3 files changed, 4 insertions(+), 88 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/SaasMigrationStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/SaasMigrationStatusPersistenceService.java index b38dd95c7..5efb3ec2f 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/SaasMigrationStatusPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/SaasMigrationStatusPersistenceService.java @@ -1,6 +1,9 @@ package com.iqser.red.service.persistence.management.v1.processor.service.persistence; -import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId; +import java.util.List; + +import org.springframework.stereotype.Service; + import com.iqser.red.service.persistence.management.v1.processor.entity.migration.SaasMigrationStatusEntity; import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.SaasMigrationStatusRepository; @@ -9,10 +12,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; - @Service @RequiredArgsConstructor public class SaasMigrationStatusPersistenceService { diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java index 37ac30d7a..ffea422b2 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java @@ -1704,85 +1704,4 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { } - - @Test - public void testLegalBasisInManualRecategorization() { - - var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate(); - var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate); - var file = fileTesterAndProvider.testAndProvideFile(dossier); - - var type = typeProvider.testAndProvideType(dossierTemplate, null, "type", false); - - var entityLog = new EntityLog(1, - 1, - List.of(EntityLogEntry.builder() - .id("annotationId") - .type(type.getType()) - .value("lukeSkywalker") - .dictionaryEntry(true) - .entryType(EntryType.ENTITY) - .state(EntryState.APPLIED) - .build(), - EntityLogEntry.builder() - .id("annotationId2") - .type(type.getType()) - .value("Johannesbrotkernmehl") - .dictionaryEntry(true) - .entryType(EntryType.ENTITY) - .state(EntryState.APPLIED) - .build(), - EntityLogEntry.builder() - .id("annotationId3") - .type(type.getType()) - .value("Baustelle") - .dictionaryEntry(true) - .entryType(EntryType.ENTITY) - .state(EntryState.APPLIED) - .build()), - null, - 0, - 0, - 0, - 0); - fileManagementStorageService.storeJSONObject(dossier.getId(), file.getId(), FileType.ENTITY_LOG, entityLog); - fileManagementStorageService.storeJSONObject(dossier.getId(), file.getId(), FileType.ENTITY_LOG, entityLog); - when(entityLogService.getEntityLog(Mockito.any(), Mockito.any(), any(), anyBoolean())).thenReturn(entityLog); - - var recatModel = RecategorizationRequestModel.builder() - .type(type.getType()) - .annotationId("annotationId") - .addToDictionary(true) - .addToAllDossiers(true) - .legalBasis("") - .build(); - var recatModelLongLegalBasis = RecategorizationRequestModel.builder() - .type(type.getType()) - .annotationId("annotationId2") - .addToDictionary(true) - .addToAllDossiers(true) - .legalBasis(RandomStringUtils.randomAlphanumeric(4001)) - .build(); - var recatModelNoLegalBasis = RecategorizationRequestModel.builder().type(type.getType()).annotationId("annotationId3").addToDictionary(true).addToAllDossiers(true).build(); - - manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recatModel, recatModelNoLegalBasis), false); - - var allManualRedactions = manualRedactionClient.getManualRedactions(dossier.getId(), file.getId(), false, true); - assertEquals(2, allManualRedactions.getRecategorizations().size()); - assertTrue(allManualRedactions.getRecategorizations() - .stream() - .anyMatch(entry -> entry.getAnnotationId().equals("annotationId"))); - - assertThatThrownBy(() -> manualRedactionClient.recategorizeBulk(dossier.getId(), file.getId(), Set.of(recatModelLongLegalBasis), false) - .get(0)).isInstanceOf(FeignException.class).hasMessageContaining("The legal basis is too long"); - - assertEquals("", - allManualRedactions.getRecategorizations() - .stream() - .filter(manualRecategorization -> manualRecategorization.getAnnotationId().equals("annotationId3")) - .findFirst() - .get().getLegalBasis()); - - } - } diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/BaseAnnotation.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/BaseAnnotation.java index 50d234971..6867752c2 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/BaseAnnotation.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/annotations/entitymapped/BaseAnnotation.java @@ -2,8 +2,6 @@ package com.iqser.red.service.persistence.service.v1.api.shared.model.annotation import java.time.OffsetDateTime; -import org.checkerframework.checker.units.qual.A; - import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus; import lombok.AllArgsConstructor;