OZG-5988 implement comments from code review

bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidService.java

@@ -50,7 +50,7 @@ class BescheidService {
 	private final VorgangService vorgangService;
 	private final AttachedItemService attachedItemService;
 	private final UserProfileService userProfileService;
-	@Qualifier("bescheid_OzgCloudCommandService")
+	@Qualifier(BescheidManagerConfiguration.COMMAND_SERVICE_NAME)
 	private final OzgCloudCommandService commandService;
 	private final CommandMapper commandMapper;
 	private final ClientAttributeService bescheidClientAttributeService;

bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidServiceTest.java

@@ -52,6 +52,7 @@ import de.ozgcloud.bescheid.vorgang.Vorgang;
 import de.ozgcloud.bescheid.vorgang.VorgangId;
 import de.ozgcloud.bescheid.vorgang.VorgangService;
 import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandTestFactory;
 import de.ozgcloud.common.binaryfile.FileId;
 import de.ozgcloud.common.datatype.StringBasedValue;
@@ -144,6 +145,7 @@ class BescheidServiceTest {
 			doNothing().when(service).validateBescheidSendManually(any(), anyLong());
 			doNothing().when(service).addSubCommands(any(), any());
 			doReturn(USER_ID).when(service).getUserId();
+			doReturn(List.of(subCommand)).when(service).buildSetBescheidSentSubCommands(any(), any(), any());
 			when(vorgangService.getById(any())).thenReturn(VORGANG);
 		}
 
@@ -178,12 +180,9 @@ class BescheidServiceTest {
 
 		@Test
 		void shouldCallAddSubCommands() {
-			doReturn(List.of(subCommand)).when(service).buildSetBescheidSentSubCommands(any(), any(), any());
-
 			sendBescheid();
 
-			verify(service).addSubCommands(eq(CommandTestFactory.ID), subCommandsCaptor.capture());
-			assertThat(subCommandsCaptor.getValue()).containsExactly(subCommand);
+			verify(service).addSubCommands(CommandTestFactory.ID, List.of(subCommand));
 		}
 
 		private void sendBescheid() {
@@ -227,6 +226,7 @@ class BescheidServiceTest {
 	@Nested
 	class TestSendBescheidPostfachMail {
 
+		private static final Command PARENT_COMMAND = CommandTestFactory.createBuilder().relationVersion(AttachedItemTestFactory.VERSION).build();
 		private static final Vorgang.ServiceKonto SERVICE_KONTO = ServiceKontoTestFactory.create();
 		private static final Vorgang VORGANG = VorgangTestFactory.createBuilder().serviceKonto(SERVICE_KONTO).build();
 
@@ -298,8 +298,7 @@ class BescheidServiceTest {
 		}
 
 		private void sendBescheid() {
-			var parentCommand = CommandTestFactory.createBuilder().relationVersion(AttachedItemTestFactory.VERSION).build();
-			service.sendBescheidPostfachMail(BESCHEID_ITEM, parentCommand);
+			service.sendBescheidPostfachMail(BESCHEID_ITEM, PARENT_COMMAND);
 		}
 	}
 
@@ -820,6 +819,8 @@ class BescheidServiceTest {
 
 		private static final AttachedItem BESCHEID_ITEM = AttachedItemTestFactory.createBescheid();
 		private static final Vorgang.PostfachAddress POSTFACH_ADDRESS = PostfachAddressTestFactory.create();
+		private static final Vorgang.ServiceKonto SERVICE_KONTO = ServiceKontoTestFactory.createBuilder().clearPostfachAddresses()
+				.postfachAddress(POSTFACH_ADDRESS).build();
 		private static final OzgCloudUserId OZG_CLOUD_USER_ID = OzgCloudUserId.from(USER_ID);
 		private static final Map<String, Object> OBJECT_MAP = Map.of("key", "value");
 		private static final OzgCloudVorgangId VORGANG_ID = OzgCloudVorgangId.from(VorgangTestFactory.ID.toString());
@@ -907,8 +908,7 @@ class BescheidServiceTest {
 		}
 
 		private OzgCloudCommand buildSendPostfachNachrichtCommand() {
-			var serviceKonto = ServiceKontoTestFactory.createBuilder().clearPostfachAddresses().postfachAddress(POSTFACH_ADDRESS).build();
-			return service.buildSendPostfachNachrichtCommand(BESCHEID_ITEM, serviceKonto, USER_ID);
+			return service.buildSendPostfachNachrichtCommand(BESCHEID_ITEM, SERVICE_KONTO, USER_ID);
 		}
 	}