From 693a92bf10960a0e4664964a0e1e696792a0df7d Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Sun, 17 Oct 2021 17:41:17 +0300 Subject: [PATCH] unique constraint fix --- .../integration/service/DossierTesterAndProvider.java | 8 ++++---- .../v1/server/integration/tests/DossierStatsTest.java | 9 +++++++-- .../integration/tests/DownloadPreparationTest.java | 2 +- .../peristence/v1/server/integration/tests/TypeTest.java | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTesterAndProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTesterAndProvider.java index c1f65aa36..77d67b450 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTesterAndProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTesterAndProvider.java @@ -29,11 +29,11 @@ public class DossierTesterAndProvider { return provideTestDossier(testTemplate, "Dossier1"); } - public Dossier provideTestDossier(DossierTemplate testTemplate, String filename) { + public Dossier provideTestDossier(DossierTemplate testTemplate, String dossierName) { CreateOrUpdateDossierRequest cru = new CreateOrUpdateDossierRequest(); cru.setDownloadFileTypes(Sets.newHashSet(DownloadFileType.ORIGINAL)); - cru.setDossierName(filename); - cru.setDescription(filename); + cru.setDossierName(dossierName); + cru.setDescription(dossierName); cru.setWatermarkEnabled(true); cru.setMemberIds(Sets.newHashSet("1")); cru.setOwnerId("1"); @@ -45,7 +45,7 @@ public class DossierTesterAndProvider { Dossier result = dossierClient.addDossier(cru); - assertThat(result.getDossierName()).isEqualTo(filename); + assertThat(result.getDossierName()).isEqualTo(dossierName); Dossier loadedDossier = dossierClient.getDossierById(result.getId(),false); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierStatsTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierStatsTest.java index 1eccb1052..22320776c 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierStatsTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierStatsTest.java @@ -2,6 +2,7 @@ package com.iqser.red.service.peristence.v1.server.integration.tests; import com.iqser.red.service.peristence.v1.server.integration.client.DossierStatsClient; import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; +import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; @@ -22,6 +23,9 @@ import static org.assertj.core.api.Assertions.assertThat; public class DossierStatsTest extends AbstractPersistenceServerServiceTest { private static final int NUMBER_PAGES_ANALYZED = 5; + @Autowired + private DossierTemplateTesterAndProvider dossierTemplateTesterAndProvider; + @Autowired private DossierTesterAndProvider dossierTesterAndProvider; @@ -40,7 +44,8 @@ public class DossierStatsTest extends AbstractPersistenceServerServiceTest { @Before public void setupData() { - dossier1 = dossierTesterAndProvider.provideTestDossier(); + var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate(); + dossier1 = dossierTesterAndProvider.provideTestDossier(dossierTemplate); //provides 2 files var file1 = fileTesterAndProvider.testAndProvideFile(dossier1, "file1"); var file2 = fileTesterAndProvider.testAndProvideFile(dossier1, "file2"); @@ -66,7 +71,7 @@ public class DossierStatsTest extends AbstractPersistenceServerServiceTest { }); // second dossier - dossier2 = dossierTesterAndProvider.provideTestDossier("Dossier2"); + dossier2 = dossierTesterAndProvider.provideTestDossier(dossierTemplate,"Dossier2"); var file3 = fileTesterAndProvider.testAndProvideFile(dossier2, "file3"); var file4 = fileTesterAndProvider.testAndProvideFile(dossier2, "file4"); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java index 006844b27..ba729cc99 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java @@ -69,7 +69,7 @@ public class DownloadPreparationTest extends AbstractPersistenceServerServiceTes var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate(); - var dossier = dossierTesterAndProvider.provideTestDossier(); + var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate); var file = fileTesterAndProvider.testAndProvideFile(dossier); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java index 5ff037ced..058a9e759 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java @@ -78,7 +78,7 @@ public class TypeTest extends AbstractPersistenceServerServiceTest { assertThat(typesForTemplate).isEmpty(); - var dossier = dossierTesterAndProvider.provideTestDossier(); + var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate); var dossierType = typeProvider.testAndProvideType(dossierTemplate, dossier, "dossier-dict"); var typesForDossier = dictionaryClient.getAllTypesForDossier(dossierType.getDossierId());