OZG-1695 Vorgang.nummer zu VorgangWithEIngangHinzugefügt

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

goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWthEingangTestFactory.java → goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWithEingangResponseTestFactory.java

 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 {
+class GrpcVorgangWithEingangResponseTestFactory {
 
-	public static GrpcFindVorgangWithEingangResponse createVorgangWithEingangResponse() {
+	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());
+		return GrpcFindVorgangWithEingangResponse.newBuilder().setVorgangWithEingang(GrpcVorgangWithEingangTestFactory.create());
 	}
 }
\ No newline at end of file

goofy-server/src/test/java/de/itvsh/goofy/vorgang/GrpcVorgangWithEingangTestFactory.java

 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

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());
 			}

goofy-server/src/test/java/de/itvsh/goofy/vorgang/VorgangWithEingangMapperTest.java

+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());
+		}
+	}
+}

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());
 	}

package-lock.json

+{
+  "name": "goofy",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {}
+}