✨ Endpoint to stop batch execution in API

4sh · Mar 5, 2024 · c2efe9a · c2efe9a
1 parent 36f1c79
commit c2efe9a
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 7 deletions.
diff --git a/.../src/main/kotlin/datamaintain/monitoring/api/execution/report/api/ExecutionStopRequest.kt b/.../src/main/kotlin/datamaintain/monitoring/api/execution/report/api/ExecutionStopRequest.kt
@@ -0,0 +1,16 @@
+package datamaintain.monitoring.api.execution.report.api
+
+import kotlinx.serialization.Serializable
+import java.time.Instant
+
+@Serializable
+data class ExecutionStopRequest(
+    @Serializable(with = InstantSerializer::class)
+    val endDate: Instant,
+    val batchEndStatus: BatchEndStatus
+)
+
+enum class BatchEndStatus {
+    COMPLETED,
+    ERROR
+}
diff --git a/...ion-report/client/src/main/kotlin/api/execution/report/client/BatchExecutionGrpcClient.kt b/...ion-report/client/src/main/kotlin/api/execution/report/client/BatchExecutionGrpcClient.kt
@@ -1,13 +1,21 @@
 package api.execution.report.client
 
+import api.execution.report.domain.module.batch.execution.BatchEndStatus
 import api.execution.report.domain.module.batch.execution.BatchExecutionRepository
 import io.grpc.ManagedChannel
 import proto.BatchExecutionApi
 import proto.BatchExecutionServiceGrpcKt
 import proto.batchExecutionCreationRequest
+import proto.batchExecutionStopRequest
 import java.time.Instant
 import java.util.*
 
+private fun BatchEndStatus.toApi(): BatchExecutionApi.BatchExecutionStopRequest.BatchExecutionEndStatus =
+    when (this) {
+        BatchEndStatus.COMPLETED -> BatchExecutionApi.BatchExecutionStopRequest.BatchExecutionEndStatus.COMPLETED
+        BatchEndStatus.ERROR -> BatchExecutionApi.BatchExecutionStopRequest.BatchExecutionEndStatus.ERROR
+    }
+
 class BatchExecutionGrpcClient(channel: ManagedChannel) : AbstractGrpcClient(channel), BatchExecutionRepository{
     private val stub = BatchExecutionServiceGrpcKt.BatchExecutionServiceCoroutineStub(channel)
 
@@ -25,4 +33,17 @@ class BatchExecutionGrpcClient(channel: ManagedChannel) : AbstractGrpcClient(cha
         }
         return UUID.fromString(stub.createBatchExecution(request).id)
     }
+
+    override suspend fun stopBatchExecution(
+        executionId: UUID,
+        batchExecutionEndDate: Instant,
+        endStatusValue: BatchEndStatus
+    ) {
+        val request = batchExecutionStopRequest {
+            batchExecutionId = executionId.toString()
+            endStatus = endStatusValue.toApi()
+            endDate = batchExecutionEndDate.toTimestamp()
+        }
+        stub.stopBatchExecution(request)
+    }
 }
diff --git a/...main/src/main/kotlin/api/execution/report/domain/module/batch/execution/BatchEndStatus.kt b/...main/src/main/kotlin/api/execution/report/domain/module/batch/execution/BatchEndStatus.kt
@@ -0,0 +1,6 @@
+package api.execution.report.domain.module.batch.execution
+
+enum class BatchEndStatus {
+    COMPLETED,
+    ERROR
+}
diff --git a/...ain/kotlin/api/execution/report/domain/module/batch/execution/BatchExecutionRepository.kt b/...ain/kotlin/api/execution/report/domain/module/batch/execution/BatchExecutionRepository.kt
@@ -9,4 +9,6 @@ interface BatchExecutionRepository {
         batchExecutionModuleRef: UUID,
         batchExecutionEnvironmentRef: UUID,
     ): UUID
+
+    suspend fun stopBatchExecution(executionId: UUID, batchExecutionEndDate: Instant, endStatusValue: BatchEndStatus)
 }
diff --git a/...c/main/kotlin/api/execution/report/domain/module/batch/execution/BatchExecutionService.kt b/...c/main/kotlin/api/execution/report/domain/module/batch/execution/BatchExecutionService.kt
@@ -20,4 +20,8 @@ class BatchExecutionService(
             batchExecutionEnvironmentRef = moduleEnvironmentToken.environmentRef
         )
     }
+
+    suspend fun stopBatchExecution(executionId: UUID, batchExecutionEndDate: Instant, endStatusValue: BatchEndStatus) {
+        batchExecutionRepository.stopBatchExecution(executionId, batchExecutionEndDate, endStatusValue)
+    }
 }
diff --git a/...ecution-report/rest/src/main/kotlin/api/execution/report/rest/v1/route/ExecutionsRoute.kt b/...ecution-report/rest/src/main/kotlin/api/execution/report/rest/v1/route/ExecutionsRoute.kt
@@ -7,6 +7,8 @@ import io.ktor.server.application.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
+import io.ktor.server.util.*
+import java.util.*
 
 internal fun Route.executionsV1Routes(batchExecutionService: BatchExecutionService) {
     route("/executions") {
@@ -23,8 +25,13 @@ internal fun Route.executionsV1Routes(batchExecutionService: BatchExecutionServi
         }
         put("/stop/{executionId}") {
             call.respond(HttpStatusCode.OK).also {
-                val executionId = call.parameters["executionId"]!!.toInt()
-                println("Execution with id $executionId has ended, it created report ${MonitoringReport(executionId)}}")
+                val executionId = UUID.fromString(call.parameters.getOrFail("executionId"))
+                val request = call.receive<ExecutionStopRequest>()
+                batchExecutionService.stopBatchExecution(
+                    executionId,
+                    request.endDate,
+                    request.batchEndStatus.toDomain()
+                )
             }
         }
         post("/{executionId}/scripts/start") {
@@ -42,4 +49,10 @@ internal fun Route.executionsV1Routes(batchExecutionService: BatchExecutionServi
             }
         }
     }
-}
+}
+
+private fun BatchEndStatus.toDomain(): api.execution.report.domain.module.batch.execution.BatchEndStatus =
+    when(this) {
+        BatchEndStatus.COMPLETED -> api.execution.report.domain.module.batch.execution.BatchEndStatus.COMPLETED
+        BatchEndStatus.ERROR -> api.execution.report.domain.module.batch.execution.BatchEndStatus.ERROR
+    }
diff --git a/modules/app-server/server/src/main/kotlin/BatchExecutionGrpcServiceImpl.kt b/modules/app-server/server/src/main/kotlin/BatchExecutionGrpcServiceImpl.kt
@@ -1,10 +1,9 @@
-import execution.batch.BatchExecutionCreationRequest
-import execution.batch.BatchExecutionService
-import execution.batch.Origin
-import execution.batch.Type
+import execution.Status
+import execution.batch.*
 import proto.BatchExecutionApi
 import proto.BatchExecutionServiceGrpcKt
 import proto.batchExecutionCreationResponse
+import proto.batchExecutionStopResponse
 import java.util.*
 
 class BatchExecutionGrpcServiceImpl(private val batchExecutionService: BatchExecutionService) :
@@ -15,8 +14,28 @@ class BatchExecutionGrpcServiceImpl(private val batchExecutionService: BatchExec
         batchExecutionCreationResponse {
             id = batchExecutionService.insert(request.toDomain()).id.toString()
         }
+
+    override suspend fun stopBatchExecution(request: BatchExecutionApi.BatchExecutionStopRequest): BatchExecutionApi.BatchExecutionStopResponse {
+        batchExecutionService.updateBatchExecutionEndData(
+            UUID.fromString(request.batchExecutionId),
+            BatchExecutionEndUpdateRequest(
+                request.endDate.toInstant(),
+                request.endStatus.toDomain()
+            )
+        )
+        return batchExecutionStopResponse { }
+    }
 }
 
+private fun BatchExecutionApi.BatchExecutionStopRequest.BatchExecutionEndStatus.toDomain(): Status =
+    when(this) {
+        BatchExecutionApi.BatchExecutionStopRequest.BatchExecutionEndStatus.ERROR -> Status.ERROR
+        BatchExecutionApi.BatchExecutionStopRequest.BatchExecutionEndStatus.COMPLETED -> Status.COMPLETED
+        BatchExecutionApi.BatchExecutionStopRequest.BatchExecutionEndStatus.UNRECOGNIZED -> throw UnrecognizedBatchExecutionEndStatus()
+    }
+
+class UnrecognizedBatchExecutionEndStatus: IllegalArgumentException("Given batch execution end status was not recognized")
+
 private fun BatchExecutionApi.BatchExecutionCreationRequest.toDomain(): BatchExecutionCreationRequest =
     BatchExecutionCreationRequest(
         startDate = startDate.toInstant(),

diff --git a/modules/proto/src/main/proto/batchExecution_api.proto b/modules/proto/src/main/proto/batchExecution_api.proto
@@ -6,6 +6,7 @@ package proto;
 
 service BatchExecutionService {
   rpc createBatchExecution(BatchExecutionCreationRequest) returns (BatchExecutionCreationResponse) {}
+  rpc stopBatchExecution(BatchExecutionStopRequest) returns (BatchExecutionStopResponse) {}
 }
 
 message BatchExecutionCreationRequest {
@@ -29,4 +30,19 @@ message BatchExecutionCreationRequest {
 
 message BatchExecutionCreationResponse {
   string id = 1;
+}
+
+message BatchExecutionStopRequest {
+  string batchExecutionId = 1;
+  BatchExecutionEndStatus endStatus = 2;
+  google.protobuf.Timestamp endDate = 3;
+
+  enum BatchExecutionEndStatus {
+      COMPLETED = 0;
+      ERROR = 1;
+  }
+}
+
+message BatchExecutionStopResponse {
+
 }