OZG-6748 Cleanup vorgang service

common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java

@@ -23,8 +23,6 @@
  */
 package de.ozgcloud.eingang.common.formdata;
 
-import static de.ozgcloud.eingang.common.formdata.ZustaendigeStelleTestFactory.*;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -53,6 +51,8 @@ public class FormDataTestFactory {
 
 	public static final String ATTACHMENT_GROUP_2 = "FileGroup2";
 
+	public static final String VORGANG_ID = "vorgangId";
+
 	public static FormData create() {
 		return createBuilder().build();
 	}

common/src/test/java/de/ozgcloud/eingang/common/formdata/ZustaendigeStelleTestFactory.java

@@ -23,8 +23,6 @@
  */
 package de.ozgcloud.eingang.common.formdata;
 
-import java.util.List;
-
 public class ZustaendigeStelleTestFactory {
 
 	public static final String ORGANISATIONSEINHEIT_ID = "08150815";

router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java

@@ -61,7 +61,7 @@ public interface GrpcEingangMapper {
 		return organisationsEinheitenId.flatMap(oeId -> formData.getZustaendigeStelles().stream()
 						.filter(zustaendigeStelle -> zustaendigeStelle.getOrganisationseinheitenId().equals(oeId))
 						.findFirst())
-				.orElse(ZustaendigeStelle.builder().build());
+				.orElseGet(() -> ZustaendigeStelle.builder().build());
 	}
 
 	@Mapping(source = "files", target = "filesList")

router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java

@@ -44,11 +44,11 @@ public class VorgangService {
 		var preparedFormData = preserveConsistency(formData);
 		var organisationseinheitIds = getOrganisationsEinheitIds(formData);
 		return organisationseinheitIds.isEmpty()
-				? List.of(createSingleVorgang(preparedFormData))
+				? List.of(createVorgangOnMissingZustaendigeStelle(preparedFormData))
 				: createMultipleVorgangs(preparedFormData, organisationseinheitIds);
 	}
 
-	String createSingleVorgang(FormData formData) {
+	String createVorgangOnMissingZustaendigeStelle(FormData formData) {
 		return remoteService.createVorgang(formData, Optional.empty());
 	}
 

router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java

@@ -23,6 +23,7 @@
  */
 package de.ozgcloud.eingang.router;
 
+import static de.ozgcloud.eingang.common.formdata.FormDataTestFactory.*;
 import static java.util.Collections.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.junit.jupiter.api.Assertions.*;
@@ -56,7 +57,6 @@ class VorgangServiceTest {
 	@Mock
 	private VorgangRemoteService remoteService;
 
-	private static final String VORGANG_ID_1 = "vorgangId1";
 	private static final String VORGANG_ID_2 = "vorgangId2";
 	private static final String ORGANISATIONSEINHEIT_ID_2 = "08150816";
 
@@ -89,22 +89,22 @@ class VorgangServiceTest {
 		@Test
 		void shouldReturnMultipleVorgangIdsForEachOrganisationseinheit() {
 			doReturn(ORGANISATIONSEINHEIT_IDS).when(service).getOrganisationsEinheitIds(formData);
-			doReturn(List.of(VORGANG_ID_1, VORGANG_ID_2)).when(service).createMultipleVorgangs(preservedFormData, ORGANISATIONSEINHEIT_IDS);
+			doReturn(List.of(VORGANG_ID, VORGANG_ID_2)).when(service).createMultipleVorgangs(preservedFormData, ORGANISATIONSEINHEIT_IDS);
 
 			var vorgangIds = createVorgangs();
 
-			assertThat(vorgangIds).containsExactly(VORGANG_ID_1, VORGANG_ID_2);
+			assertThat(vorgangIds).containsExactly(VORGANG_ID, VORGANG_ID_2);
 		}
 
 		@DisplayName("should return single vorgang id if organisationseinheit is missing")
 		@Test
 		void shouldReturnSingleVorgangIdIfOrganisationseinheitIsMissing() {
 			doReturn(emptyList()).when(service).getOrganisationsEinheitIds(formData);
-			doReturn(VORGANG_ID_1).when(service).createSingleVorgang(preservedFormData);
+			doReturn(VORGANG_ID).when(service).createVorgangOnMissingZustaendigeStelle(preservedFormData);
 
 			var vorgangIds = createVorgangs();
 
-			assertThat(vorgangIds).containsExactly(VORGANG_ID_1);
+			assertThat(vorgangIds).containsExactly(VORGANG_ID);
 		}
 
 		private List<String> createVorgangs() {
@@ -112,20 +112,20 @@ class VorgangServiceTest {
 		}
 	}
 
-	@DisplayName("create single vorgang")
+	@DisplayName("create vorgang on missing zustaendige stelle")
 	@Nested
-	class TestCreateSingleVorgang {
+	class TestVorgangOnMissingZustaendigeStelle {
 		@Mock
 		private FormData formData;
 
 		@DisplayName("should return")
 		@Test
 		void shouldReturn() {
-			when(remoteService.createVorgang(formData, Optional.empty())).thenReturn(VORGANG_ID_1);
+			when(remoteService.createVorgang(formData, Optional.empty())).thenReturn(VORGANG_ID);
 
-			var vorgangId = service.createSingleVorgang(formData);
+			var vorgangId = service.createVorgangOnMissingZustaendigeStelle(formData);
 
-			assertThat(vorgangId).isEqualTo(VORGANG_ID_1);
+			assertThat(vorgangId).isEqualTo(VORGANG_ID);
 		}
 	}
 
@@ -138,12 +138,12 @@ class VorgangServiceTest {
 		@DisplayName("should return")
 		@Test
 		void shouldReturn() {
-			when(remoteService.createVorgang(formData, Optional.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID))).thenReturn(VORGANG_ID_1);
+			when(remoteService.createVorgang(formData, Optional.of(ZustaendigeStelleTestFactory.ORGANISATIONSEINHEIT_ID))).thenReturn(VORGANG_ID);
 			when(remoteService.createVorgang(formData, Optional.of(ORGANISATIONSEINHEIT_ID_2))).thenReturn(VORGANG_ID_2);
 
 			var vorgangIds = service.createMultipleVorgangs(formData, ORGANISATIONSEINHEIT_IDS);
 
-			assertThat(vorgangIds).containsExactly(VORGANG_ID_1, VORGANG_ID_2);
+			assertThat(vorgangIds).containsExactly(VORGANG_ID, VORGANG_ID_2);
 		}
 	}
 

semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/SemantikAdapterTest.java

@@ -23,6 +23,7 @@
  */
 package de.ozgcloud.eingang.semantik;
 
+import static de.ozgcloud.eingang.common.formdata.FormDataTestFactory.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -93,8 +94,6 @@ class SemantikAdapterTest {
 		@Mock
 		private FormData formAdapterResponse;
 
-		private static final String VORGANG_ID = "vorgangId";
-
 		@BeforeEach
 		void mockEngineAdapter() {
 			doReturn(List.of(engineAdapter)).when(adapter).getResponsibleEngineAdapters(formData);