From 19d7670ada2fb22a7fdf1a99ddb8aaced3435e23 Mon Sep 17 00:00:00 2001 From: corinaolariu Date: Wed, 20 Nov 2024 11:30:42 +0200 Subject: [PATCH 1/3] RED-10202 - Fix ComponentOverrideTest for persistence-service pipeline - enable tests from component overrides --- .../v1/server/integration/tests/ComponentOverrideTest.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java index ef7542f32..56c1af160 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java @@ -64,8 +64,6 @@ public class ComponentOverrideTest extends AbstractPersistenceServerServiceTest @Test - @Disabled - // todo: fix me public void testOverrides() throws IOException { var dossier = dossierTesterAndProvider.provideTestDossier(); @@ -187,8 +185,6 @@ public class ComponentOverrideTest extends AbstractPersistenceServerServiceTest @Test @SneakyThrows - @Disabled - //todo: fix me public void testDeletedFileOverrides() throws IOException { var dossier = dossierTesterAndProvider.provideTestDossier(); From 58d11fc7b930d903ba0818a806601ed97b6c4cb7 Mon Sep 17 00:00:00 2001 From: corinaolariu Date: Wed, 20 Nov 2024 15:33:09 +0200 Subject: [PATCH 2/3] RED-10202 - Fix ComponentOverrideTest for persistence-service pipeline - include ruleFileType.Component when the application type is documine --- .../service/DossierTemplateTesterAndProvider.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java index be58780ec..657069ade 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java @@ -14,6 +14,7 @@ import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryC import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateClient; import com.iqser.red.service.peristence.v1.server.integration.client.LegalBasisClient; import com.iqser.red.service.peristence.v1.server.integration.client.RulesClient; +import com.iqser.red.service.persistence.management.v1.processor.service.CurrentApplicationTypeProvider; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierTemplateModel; import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DownloadFileType; @@ -36,6 +37,9 @@ public class DossierTemplateTesterAndProvider { @Autowired private DictionaryClient dictionaryClient; + @Autowired + private CurrentApplicationTypeProvider currentApplicationTypeProvider; + public Colors provideDefaultColors(String dossierTemplateId) { @@ -82,6 +86,9 @@ public class DossierTemplateTesterAndProvider { rulesClient.upload(new RulesUploadRequestModel("ABCD", loadedTemplate.getDossierTemplateId(), RuleFileType.ENTITY)); legalBasisClient.setLegalBasisMapping(List.of(new LegalBasis("name", "description", "reason","technicalName")), loadedTemplate.getDossierTemplateId()); + if (currentApplicationTypeProvider.isDocuMine()) { + rulesClient.upload(new RulesUploadRequestModel("ABCD", loadedTemplate.getDossierTemplateId(), RuleFileType.COMPONENT)); + } loadedTemplate = dossierTemplateClient.getDossierTemplate(result.getDossierTemplateId()); return loadedTemplate; From a5004c6d2638c88e598f05ca2902be4389b2d085 Mon Sep 17 00:00:00 2001 From: corinaolariu Date: Wed, 20 Nov 2024 16:21:17 +0200 Subject: [PATCH 3/3] RED-10202 - Fix ComponentOverrideTest for persistence-service pipeline - revert the file name --- .../v1/server/integration/tests/ComponentOverrideTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java index 56c1af160..c48c66905 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java @@ -253,7 +253,7 @@ public class ComponentOverrideTest extends AbstractPersistenceServerServiceTest assertTrue(overrides.getComponentOverrides().isEmpty()); // case 2: re-upload file that was deleted before overrides should also not be returned anymore - fileTesterAndProvider.testAndProvideFile(dossier, "filename3"); + fileTesterAndProvider.testAndProvideFile(dossier, "filename2"); var e = assertThrows(FeignException.class, () -> componentClient.getOverrides(dossierTemplate.getId(), dossier.getId(), file.getId())); assertEquals(e.status(), 404);