OZG-6991 don't create subCommands if vorgang is locked

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandService.java

@@ -54,6 +54,7 @@ import de.ozgcloud.vorgang.callcontext.CurrentUserService;
 import de.ozgcloud.vorgang.callcontext.User;
 import de.ozgcloud.vorgang.common.errorhandling.NotFoundException;
 import de.ozgcloud.vorgang.common.errorhandling.RevokeFailedException;
+import de.ozgcloud.vorgang.vorgang.VorgangService;
 import lombok.NonNull;
 
 @Service
@@ -65,15 +66,24 @@ public class CommandService {
 	@Autowired
 	private ApplicationEventPublisher publisher;
 
+	@Autowired
+	private VorgangService vorgangService;
 	@Autowired
 	private CurrentUserService userService;
 
 	public Command createCommand(CreateCommandRequest request) {
+		validateVorgang(request.getVorgangId());
 		var persisted = saveCommand(buildCommand(request));
 		publisher.publishEvent(new CommandCreatedEvent(persisted));
 		return persisted;
 	}
 
+	void validateVorgang(String vorgangId) {
+		if (vorgangService.isVorgangLocked(vorgangId)) {
+			throw new TechnicalException("Cannot create command. Vorgang %s is locked.".formatted(vorgangId));
+		}
+	}
+
 	private Command buildCommand(CreateCommandRequest request) {
 		var builder = PersistedCommand.builder()
 				.id(UUID.randomUUID().toString())

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandService.java

@@ -36,7 +36,6 @@ import org.springframework.context.ApplicationEventPublisher;
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandExecutedEvent;
 import de.ozgcloud.command.CommandStatus;
-import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.vorgang.command.CommandResponse.ResponseCode;
 import de.ozgcloud.vorgang.common.errorhandling.NotFoundException;
 import de.ozgcloud.vorgang.common.security.PolicyService;
@@ -55,7 +54,6 @@ import de.ozgcloud.vorgang.grpc.command.GrpcGetPendingCommandsRequest;
 import de.ozgcloud.vorgang.grpc.command.GrpcGetPendingCommandsResponse;
 import de.ozgcloud.vorgang.grpc.command.GrpcRevokeCommandRequest;
 import de.ozgcloud.vorgang.grpc.command.GrpcSetCommandExecutedRequest;
-import de.ozgcloud.vorgang.vorgang.VorgangService;
 import io.grpc.stub.StreamObserver;
 import lombok.extern.log4j.Log4j2;
 import net.devh.boot.grpc.server.service.GrpcService;
@@ -68,8 +66,6 @@ public class GrpcCommandService extends CommandServiceImplBase {
 	private GrpcCreateCommandRequestMapper createCommandRequestMapper;
 	@Autowired
 	private CommandService commandService;
-	@Autowired
-	private VorgangService vorgangService;
 
 	@Autowired
 	private GrpcCommandResponseMapper commandResponseMapper;
@@ -85,7 +81,6 @@ public class GrpcCommandService extends CommandServiceImplBase {
 
 	@Override
 	public void createCommand(GrpcCreateCommandRequest request, StreamObserver<GrpcCommandResponse> responseObserver) {
-		validateVorgang(request.getVorgangId());
 		policyService.checkPermission(request.getVorgangId());
 
 		var mappedRequest = createCommandRequestMapper.fromGrpc(request);
@@ -96,12 +91,6 @@ public class GrpcCommandService extends CommandServiceImplBase {
 		responseObserver.onCompleted();
 	}
 
-	void validateVorgang(String vorgangId) {
-		if (vorgangService.isVorgangLocked(vorgangId)) {
-			throw new TechnicalException("Cannot create command. Vorgang %s is locked.".formatted(vorgangId));
-		}
-	}
-
 	@Override
 	public void getCommand(GrpcGetCommandRequest request, StreamObserver<GrpcCommand> responseObserver) {
 		policyService.checkPermissionByCommand(request.getId());

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java

@@ -35,6 +35,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -59,6 +60,7 @@ import de.ozgcloud.vorgang.callcontext.CurrentUserService;
 import de.ozgcloud.vorgang.callcontext.UserTestFactory;
 import de.ozgcloud.vorgang.common.errorhandling.NotFoundException;
 import de.ozgcloud.vorgang.common.errorhandling.RevokeFailedException;
+import de.ozgcloud.vorgang.vorgang.VorgangService;
 import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
 
 class CommandServiceTest {
@@ -73,6 +75,8 @@ class CommandServiceTest {
 	private ApplicationEventPublisher publisher;
 	@Mock
 	private CurrentUserService currentUserService;
+	@Mock
+	private VorgangService vorgangService;
 
 	@Nested
 	class TestCreateCommand {
@@ -82,6 +86,13 @@ class CommandServiceTest {
 		@Captor
 		private ArgumentCaptor<Command> commandCaptor;
 
+		@Test
+		void shouldCallValidateVorgang() {
+			service.createCommand(request);
+
+			verify(service).validateVorgang(VorgangTestFactory.ID);
+		}
+
 		@Test
 		void shouldCallOperationRepository() {
 			service.createCommand(request);
@@ -166,6 +177,25 @@ class CommandServiceTest {
 		}
 	}
 
+	@Nested
+	class TestValidateVorgang {
+
+		@Test
+		void shouldCallIsVorgangLocked() {
+			service.validateVorgang(VorgangTestFactory.ID);
+
+			verify(vorgangService).isVorgangLocked(anyString());
+		}
+
+		@Test
+		void shouldThrowExceptionIfVorgangLocked() {
+			when(vorgangService.isVorgangLocked(anyString())).thenReturn(true);
+
+			Assertions.assertThrows(TechnicalException.class, () -> service.validateVorgang(VorgangTestFactory.ID));
+		}
+
+	}
+
 	@Nested
 	class TestGetVorgangCommand {
 

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandServiceITCase.java

@@ -10,6 +10,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -233,6 +234,14 @@ class GrpcCommandServiceITCase {
 			});
 		}
 
+		@Test
+		void shouldFailOnLockedVorgang() {
+			mongoOperations.save(vorgang.toBuilder().header(VorgangHeadTestFactory.createBuilder().lock(LockTestFactory.create()).build()).build());
+			var request = buildAddSubCommandsRequest(parentCommand.getId(), buildCreateCommand());
+
+			Assertions.assertThrows(StatusRuntimeException.class, () -> serviceBlockingStub.addSubCommands(request));
+		}
+
 		private GrpcCommand createParentCommand() {
 			var createParentCommandRequest = GrpcCreateCommandRequestTestFactory.createBuilder()
 					.setVorgangId(vorgang.getId())

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/GrpcCommandServiceTest.java

@@ -32,7 +32,6 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -47,7 +46,6 @@ import org.springframework.context.ApplicationEventPublisher;
 import de.ozgcloud.command.Command;
 import de.ozgcloud.command.CommandExecutedEvent;
 import de.ozgcloud.command.CommandStatus;
-import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.vorgang.common.security.PolicyService;
 import de.ozgcloud.vorgang.grpc.command.GrpcAddSubCommandsRequest;
 import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
@@ -63,7 +61,6 @@ import de.ozgcloud.vorgang.grpc.command.GrpcGetPendingCommandsRequest;
 import de.ozgcloud.vorgang.grpc.command.GrpcGetPendingCommandsResponse;
 import de.ozgcloud.vorgang.grpc.command.GrpcRevokeCommandRequest;
 import de.ozgcloud.vorgang.grpc.command.GrpcSetCommandExecutedRequest;
-import de.ozgcloud.vorgang.vorgang.VorgangService;
 import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
 import io.grpc.stub.StreamObserver;
 
@@ -76,8 +73,6 @@ class GrpcCommandServiceTest {
 	private GrpcCreateCommandRequestMapper createCommandRequestMapper;
 	@Mock
 	private CommandService commandService;
-	@Mock
-	private VorgangService vorgangService;
 
 	@Mock
 	private GrpcCommandResponseMapper commandResponseMapper;
@@ -112,13 +107,6 @@ class GrpcCommandServiceTest {
 			when(commandResponseMapper.toGrpc(any(CommandResponse.class))).thenReturn(response);
 		}
 
-		@Test
-		void shouldCallValidateVorgang() {
-			callCreateCommand();
-
-			verify(service).validateVorgang(VorgangTestFactory.ID);
-		}
-
 		@Test
 		void shouldCallPolicyService() {
 			callCreateCommand();
@@ -156,25 +144,6 @@ class GrpcCommandServiceTest {
 		}
 	}
 
-	@Nested
-	class TestValidateVorgang {
-
-		@Test
-		void shouldCallIsVorgangLocked() {
-			service.validateVorgang(VorgangTestFactory.ID);
-
-			verify(vorgangService).isVorgangLocked(anyString());
-		}
-
-		@Test
-		void shouldThrowExceptionIfVorgangLocked() {
-			when(vorgangService.isVorgangLocked(anyString())).thenReturn(true);
-
-			Assertions.assertThrows(TechnicalException.class, () -> service.validateVorgang(VorgangTestFactory.ID));
-		}
-
-	}
-
 	@DisplayName("Get command")
 	@Nested
 	class TestGetCommand {

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangHeadTestFactory.java

@@ -4,8 +4,6 @@ import de.ozgcloud.vorgang.servicekonto.ServiceKontoTestFactory;
 
 public class VorgangHeadTestFactory {
 
-	public static final Lock LOCK = LockTestFactory.create();
-
 	public static VorgangHead create() {
 		return createBuilder().build();
 	}

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangRepositoryITCase.java

@@ -367,7 +367,7 @@ class VorgangRepositoryITCase {
 		@Test
 		void shouldReturnTrue() {
 			var vorgang = mongoOperations.save(VorgangTestFactory.createBuilder().id(null).version(0)
-					.header(VorgangHeadTestFactory.createBuilder().lock(VorgangHeadTestFactory.LOCK).build())
+					.header(VorgangHeadTestFactory.createBuilder().lock(LockTestFactory.create()).build())
 					.build());
 
 			var isLocked = repository.isVorgangLocked(vorgang.getId());