From ee6d5dde29ea324f4239013b300d6afad7861f6e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 6 Apr 2022 08:12:35 +0200
Subject: [PATCH] =?UTF-8?q?OZG-1695=20Vorgang.nummer=20zu=20VorgangWithEIn?=
=?UTF-8?q?gangHinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../goofy/vorgang/VorgangWithEingang.java | 1 +
...VorgangWithEingangResponseTestFactory.java | 14 ++++
.../GrpcVorgangWithEingangTestFactory.java | 8 +-
.../GrpcVorgangWthEingangTestFactory.java | 29 --------
.../vorgang/VorgangRemoteServiceTest.java | 3 +-
.../vorgang/VorgangWithEingangMapperTest.java | 74 +++++++++++++++++++
.../VorgangWithEingangTestFactory.java | 1 +
package-lock.json | 6 ++
8 files changed, 105 insertions(+), 31 deletions(-)
create mode 100644 goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWithEingangResponseTestFactory.java
delete mode 100644 goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWthEingangTestFactory.java
create mode 100644 goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangWithEingangMapperTest.java
create mode 100644 package-lock.json
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/vorgang/VorgangWithEingang.java b/goofy-server/src/main/java/de/itvsh/goofy/vorgang/VorgangWithEingang.java
index 6f87db0521..d400d09e98 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/vorgang/VorgangWithEingang.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/vorgang/VorgangWithEingang.java
@@ -26,6 +26,7 @@ public class VorgangWithEingang implements Vorgang {
private VorgangStatus status;
private ZonedDateTime createdAt;
private String aktenzeichen;
+ private String nummer;
private Eingang eingang;
}
\ No newline at end of file
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWithEingangResponseTestFactory.java b/goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWithEingangResponseTestFactory.java
new file mode 100644
index 0000000000..2a9795acce
--- /dev/null
+++ b/goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWithEingangResponseTestFactory.java
@@ -0,0 +1,14 @@
+package de.itvsh.goofy.vorgang;
+
+import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangResponse;
+
+class GrpcVorgangWithEingangResponseTestFactory {
+
+ static GrpcFindVorgangWithEingangResponse createVorgangWithEingangResponse() {
+ return createVorgangWithEingangResponseBuilder().build();
+ }
+
+ private static GrpcFindVorgangWithEingangResponse.Builder createVorgangWithEingangResponseBuilder() {
+ return GrpcFindVorgangWithEingangResponse.newBuilder().setVorgangWithEingang(GrpcVorgangWithEingangTestFactory.create());
+ }
+}
\ No newline at end of file
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWithEingangTestFactory.java b/goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWithEingangTestFactory.java
index 5118485034..e7aa825012 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWithEingangTestFactory.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWithEingangTestFactory.java
@@ -1,5 +1,7 @@
package de.itvsh.goofy.vorgang;
+import static de.itvsh.goofy.vorgang.VorgangHeaderTestFactory.*;
+
import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
import de.itvsh.ozg.pluto.vorgang.GrpcVorgangWithEingang;
@@ -15,7 +17,11 @@ class GrpcVorgangWithEingangTestFactory {
static GrpcVorgangWithEingang.Builder createBuilder() {
return GrpcVorgangWithEingang.newBuilder()
- .setStatus(VorgangHeaderTestFactory.STATUS.name())
+ .setStatus(STATUS.name())
+ .setNummer(NUMMER)
+ .setAktenzeichen(AKTENZEICHEN)
+ .setAssignedTo(ASSIGNED_TO)
+ .setCreatedAt(CREATED_AT_STR)
.setEingang(GrpcEingangTestFactory.create());
}
}
\ No newline at end of file
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWthEingangTestFactory.java b/goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWthEingangTestFactory.java
deleted file mode 100644
index 66a03fc0cd..0000000000
--- a/goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWthEingangTestFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package de.itvsh.goofy.vorgang;
-
-import static de.itvsh.goofy.vorgang.VorgangHeaderTestFactory.*;
-
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangResponse;
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangWithEingang;
-
-public class GrpcVorgangWthEingangTestFactory {
-
- public static GrpcFindVorgangWithEingangResponse createVorgangWithEingangResponse() {
- return createVorgangWithEingangResponseBuilder().build();
- }
-
- private static GrpcFindVorgangWithEingangResponse.Builder createVorgangWithEingangResponseBuilder() {
- return GrpcFindVorgangWithEingangResponse.newBuilder().setVorgangWithEingang(createVorgangWithEingang());
- }
-
- public static GrpcVorgangWithEingang createVorgangWithEingang() {
- return createVorgangWithEingangBuilder().build();
- }
-
- private static GrpcVorgangWithEingang.Builder createVorgangWithEingangBuilder() {
- return GrpcVorgangWithEingang.newBuilder()
- .setId(ID)
- .setName(NAME)
- .setCreatedAt(CREATED_AT_STR)
- .setStatus(STATUS.toString());
- }
-}
\ No newline at end of file
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangRemoteServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangRemoteServiceTest.java
index 36de788b14..0400afb646 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangRemoteServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangRemoteServiceTest.java
@@ -285,7 +285,8 @@ class VorgangRemoteServiceTest {
@BeforeEach
void mockReturnValue() {
- when(serviceStub.findVorgangWithEingang(any())).thenReturn(GrpcVorgangWthEingangTestFactory.createVorgangWithEingangResponse());
+ when(serviceStub.findVorgangWithEingang(any()))
+ .thenReturn(GrpcVorgangWithEingangResponseTestFactory.createVorgangWithEingangResponse());
when(vorgangWithEingangMapper.toVorgangWithEingang(any())).thenReturn(vorgangWithEingang);
doReturn(filterBy).when(service).createFilterBy(any());
}
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangWithEingangMapperTest.java b/goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangWithEingangMapperTest.java
new file mode 100644
index 0000000000..32ec16e9e2
--- /dev/null
+++ b/goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangWithEingangMapperTest.java
@@ -0,0 +1,74 @@
+package de.itvsh.goofy.vorgang;
+
+import static de.itvsh.goofy.vorgang.VorgangHeaderTestFactory.*;
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.mapstruct.factory.Mappers;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+
+import de.itvsh.goofy.common.BaseTypesMapper;
+import de.itvsh.goofy.common.user.UserId;
+import de.itvsh.goofy.common.user.UserIdMapper;
+import de.itvsh.goofy.vorgang.Vorgang.VorgangStatus;
+
+class VorgangWithEingangMapperTest {
+
+ @Spy
+ @InjectMocks
+ private VorgangWithEingangMapper mapper = Mappers.getMapper(VorgangWithEingangMapper.class);
+
+ @Spy
+ private UserIdMapper userIdMapper = Mappers.getMapper(UserIdMapper.class);
+
+ @Spy
+ private BaseTypesMapper baseTypesMapper = Mappers.getMapper(BaseTypesMapper.class);
+
+ @Mock
+ private EingangMapper eingangMapper;
+
+ @Nested
+ class TestGrpcVorgangWithEingangToGoofyVorgangWithEingang {
+ @Test
+ void shouldMapCreatedAt() {
+ var vorgang = callMapper();
+
+ assertThat(vorgang.getCreatedAt()).isEqualTo(CREATED_AT);
+ }
+
+ @Test
+ void shouldMapNummer() {
+ var vorgang = callMapper();
+
+ assertThat(vorgang.getNummer()).isEqualTo(NUMMER);
+ }
+
+ @Test
+ void shouldMapAktenzeichen() {
+ var vorgang = callMapper();
+
+ assertThat(vorgang.getAktenzeichen()).isEqualTo(AKTENZEICHEN);
+ }
+
+ @Test
+ void shouldMapStatus() {
+ var vorgang = callMapper();
+
+ assertThat(vorgang.getStatus()).isEqualTo(VorgangStatus.NEU);
+ }
+
+ @Test
+ void shouldMapAssignedTo() {
+ var vorgang = callMapper();
+
+ assertThat(vorgang.getAssignedTo()).isEqualTo(UserId.from(ASSIGNED_TO));
+ }
+
+ private VorgangWithEingang callMapper() {
+ return mapper.toVorgangWithEingang(GrpcVorgangWithEingangTestFactory.create());
+ }
+ }
+}
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangWithEingangTestFactory.java b/goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangWithEingangTestFactory.java
index 38737bbe85..45c4fc3b89 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangWithEingangTestFactory.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangWithEingangTestFactory.java
@@ -17,6 +17,7 @@ public class VorgangWithEingangTestFactory {
.assignedTo(UserProfileTestFactory.ID)
.name(NAME)
.status(STATUS)
+ .nummer(NUMMER)
.createdAt(CREATED_AT)
.eingang(EingangTestFactory.create());
}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000..1d53587185
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+ "name": "goofy",
+ "lockfileVersion": 2,
+ "requires": true,
+ "packages": {}
+}
--
GitLab