From 7e13d8d4663fdbe3ed172a168c32ef28963dddc6 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 16 Sep 2021 16:28:34 +0300 Subject: [PATCH] work on tests --- .../model/data/notification/Notification.java | 2 +- .../client/ManualRedactionClient.java | 9 +++++ .../tests/ManualRedactionTest.java | 37 +++++++++++++++++++ .../integration/tests/NotificationTest.java | 16 +++++++- 4 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ManualRedactionClient.java create mode 100644 persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/notification/Notification.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/notification/Notification.java index 5cda67d08..00e1066c2 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/notification/Notification.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/notification/Notification.java @@ -44,7 +44,7 @@ public class Notification { private String notificationDetails; @Basic(fetch = FetchType.EAGER) - @Column(columnDefinition = "json") + @Column(columnDefinition = "text") @Convert(converter = JSONConverter.class) private Map target = new HashMap<>(); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ManualRedactionClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ManualRedactionClient.java new file mode 100644 index 000000000..2236acf5e --- /dev/null +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ManualRedactionClient.java @@ -0,0 +1,9 @@ +package com.iqser.red.service.peristence.v1.server.integration.client; + +import com.iqser.red.service.persistence.service.v1.api.resources.ManualRedactionResource; +import org.springframework.cloud.openfeign.FeignClient; + +@FeignClient(name = "ManualRedactionClient", url = "http://localhost:${server.port}") +public interface ManualRedactionClient extends ManualRedactionResource { + +} 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 new file mode 100644 index 000000000..b94f6c74e --- /dev/null +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java @@ -0,0 +1,37 @@ +package com.iqser.red.service.peristence.v1.server.integration.tests; + +import com.iqser.red.service.peristence.v1.server.integration.client.ManualRedactionClient; +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; +import com.iqser.red.service.persistence.service.v1.api.model.CommentRequest; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThat; + +public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { + + @Autowired + private FileTesterAndProvider fileTesterAndProvider; + + @Autowired + private DossierTesterAndProvider dossierTesterAndProvider; + + + @Autowired + private ManualRedactionClient manualRedactionClient; + + @Test + public void testManualRedaction() { + + var dossier = dossierTesterAndProvider.provideTestDossier(); + + var file = fileTesterAndProvider.testAndProvideFile(dossier); + + var comment = manualRedactionClient.addComment(dossier.getId(), file.getId(), "1", CommentRequest.builder().text("test").user("1").build()); + var loadedComment = manualRedactionClient.getComment(comment.getId()); + assertThat(loadedComment.getText()).isEqualTo("test"); + + } +} diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationTest.java index 6c96f51ff..0715b87a4 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationTest.java @@ -1,13 +1,27 @@ package com.iqser.red.service.peristence.v1.server.integration.tests; -import com.iqser.red.service.peristence.v1.server.integration.client.AuditClient; import com.iqser.red.service.peristence.v1.server.integration.client.NotificationClient; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.service.v1.api.model.data.audit.AddNotificationRequest; +import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; public class NotificationTest extends AbstractPersistenceServerServiceTest { @Autowired private NotificationClient notificationClient; + + @Test + public void testNotification() { + + notificationClient.addNotification(AddNotificationRequest.builder().notificationType("test").issuerId("1").userId("1").target(Map.of("test", "test")).build()); + + var currentNotifications = notificationClient.getNotifications("1", true); + assertThat(currentNotifications.size()).isEqualTo(1); + + } }