Merge pull request 'OZG-4392: Timeout + Exception, wenn Command mit einem...

Merge pull request 'OZG-4392: Timeout + Exception, wenn Command mit einem Fehler abgeschlossen' (#4) from OZG-4392-Antwort-von-VorgangProcessor-verarbeiten into master

Reviewed-on: https://git.ozg-sh.de/mgm/ozgcloud-api-lib/pulls/4

api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandService.java

 package de.ozgcloud.apilib.common.command.grpc;
 
+import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
 import de.itvsh.ozg.pluto.grpc.command.GrpcGetCommandRequest;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
@@ -7,6 +8,7 @@ import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
 import de.ozgcloud.apilib.common.command.OzgCloudCommand;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandId;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
+import de.ozgcloud.apilib.common.command.OzgCloudCommandStatus;
 import lombok.RequiredArgsConstructor;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
@@ -14,6 +16,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
 public class GrpcOzgCloudCommandService implements OzgCloudCommandService {
 
 	private static final int WAIT_TIME_MS = 500;
+	public static final int DEFAULT_COMMAND_REQUEST_THRESHOLD_MILLIS = 10000;
 
 	@GrpcClient("command-manager")
 	private final CommandServiceBlockingStub commandServiceStub;
@@ -22,6 +25,8 @@ public class GrpcOzgCloudCommandService implements OzgCloudCommandService {
 
 	private final OzgCloudCallContextProvider contextProvider;
 
+	private final int commandRequestThresholdMillis;
+
 	@Override
 	public OzgCloudCommand createAndWaitUntilDone(OzgCloudCommand commandToCreate) {
 		return waitUntilDone(create(commandToCreate));
@@ -34,8 +39,8 @@ public class GrpcOzgCloudCommandService implements OzgCloudCommandService {
 
 	OzgCloudCommand waitUntilDone(OzgCloudCommand commandToWaitFor) {
 		var command = commandToWaitFor;
-//		TODO timeout
-		while (!command.getStatus().isFinalState()) {
+		var timeout = System.currentTimeMillis() + commandRequestThresholdMillis;
+		while (!command.getStatus().isFinalState() && System.currentTimeMillis() < timeout) {
 			synchronized (this) {
 				try {
 					wait(WAIT_TIME_MS);
@@ -45,10 +50,11 @@ public class GrpcOzgCloudCommandService implements OzgCloudCommandService {
 				}
 			}
 		}
+		verifyCommand(command);
 		return command;
 	}
 
-	private OzgCloudCommand reloadCommand(OzgCloudCommandId commandId) {
+	OzgCloudCommand reloadCommand(OzgCloudCommandId commandId) {
 		GrpcGetCommandRequest request = GrpcGetCommandRequest.newBuilder().setId(commandId.toString()).build();
 		return mapper.fromGrpc(getCommandServiceStub().getCommand(request));
 	}
@@ -56,4 +62,10 @@ public class GrpcOzgCloudCommandService implements OzgCloudCommandService {
 	CommandServiceBlockingStub getCommandServiceStub() {
 		return commandServiceStub.withInterceptors(new OzgCloudCallContextAttachingInterceptor(contextProvider));
 	}
+
+	void verifyCommand(OzgCloudCommand command) {
+		if (command.getStatus() == OzgCloudCommandStatus.ERROR) {
+			throw new TechnicalException("Command (id=%s) failed: %s".formatted(command.getId(), command.getErrorMessage()));
+		}
+	}
 }

api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandServiceTest.java

 package de.ozgcloud.apilib.common.command.grpc;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.Spy;
+import org.mockito.Mockito;
 
+import de.itvsh.kop.common.errorhandling.TechnicalException;
 import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
+import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
 import de.ozgcloud.apilib.common.command.OzgCloudCommand;
+import de.ozgcloud.apilib.common.command.OzgCloudCommandStatus;
 
 class GrpcOzgCloudCommandServiceTest {
 
-	@Spy
-	@InjectMocks
 	private GrpcOzgCloudCommandService service;
 
 	@Mock
 	private CommandServiceBlockingStub serviceStub;
 	@Mock
 	private CommandMapper mapper;
+	@Mock
+	private OzgCloudCallContextProvider contextProvider;
+
+	@BeforeEach
+	void init() {
+		service = spy(new GrpcOzgCloudCommandService(serviceStub, mapper, contextProvider, 600));
+	}
 
 	@Nested
 	class TestCreateAndWaitUntilDone {
@@ -49,6 +58,23 @@ class GrpcOzgCloudCommandServiceTest {
 			verify(service).waitUntilDone(created);
 		}
 
+		@Test
+		void shouldTerminateByTimeout() {
+			var command = OzgCloudCommandTestFactory.createBuilder().status(OzgCloudCommandStatus.PENDING).build();
+			doReturn(command).when(service).reloadCommand(any());
+
+			service.waitUntilDone(command);
+
+			Mockito.verify(service, Mockito.times(2)).reloadCommand(command.getId());
+		}
+
+		@Test
+		void shouldCallVerifyCommand() {
+			service.waitUntilDone(command);
+
+			verify(service).verifyCommand(command);
+		}
+
 		@Nested
 		class Create {
 
@@ -94,4 +120,15 @@ class GrpcOzgCloudCommandServiceTest {
 		}
 	}
 
+	@Nested
+	class TestStatus {
+
+		@Test
+		void shouldThrowException() {
+			var command = OzgCloudCommandTestFactory.createBuilder().status(OzgCloudCommandStatus.ERROR).build();
+
+			assertThrows(TechnicalException.class, () ->  service.verifyCommand(command));
+		}
+
+	}
 }
\ No newline at end of file

ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java

@@ -142,7 +142,8 @@ public class OzgCloudClientAutoConfiguration {
 	@ConditionalOnProperty("ozgcloud.command-manager.address")
 	OzgCloudCommandService grpcOzgCloudCommandService(@GrpcClient("command-manager") CommandServiceBlockingStub commandServiceStub,
 		CommandMapper commandMapper, OzgCloudCallContextProvider contextProvider) {
-		return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider);
+		return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider,
+			GrpcOzgCloudCommandService.DEFAULT_COMMAND_REQUEST_THRESHOLD_MILLIS);
 	}
 
 	@Bean