add original execution id in WorkFlowResponseDTO

parodos-dev · Jul 27, 2023 · 6263160 · 6263160
1 parent 3299079
commit 6263160
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/workflow-service/generated/openapi/openapi.json b/workflow-service/generated/openapi/openapi.json
@@ -1899,6 +1899,10 @@
           "executeBy" : {
             "type" : "string"
           },
+          "originalExecutionId" : {
+            "type" : "string",
+            "format" : "uuid"
+          },
           "projectId" : {
             "type" : "string",
             "format" : "uuid"

diff --git a/...-service/src/main/java/com/redhat/parodos/workflow/execution/dto/WorkFlowResponseDTO.java b/...-service/src/main/java/com/redhat/parodos/workflow/execution/dto/WorkFlowResponseDTO.java
@@ -56,6 +56,8 @@ public class WorkFlowResponseDTO {
 
 	private List<AdditionalInfo> additionalInfos;
 
+	private UUID originalExecutionId;
+
 	private WorkFlowType workFlowType;
 
 	public record AdditionalInfo(String key, String value) {

diff --git a/...vice/src/main/java/com/redhat/parodos/workflow/execution/service/WorkFlowServiceImpl.java b/...vice/src/main/java/com/redhat/parodos/workflow/execution/service/WorkFlowServiceImpl.java
@@ -26,6 +26,7 @@
 
 import javax.annotation.PreDestroy;
 
+import com.redhat.parodos.common.entity.AbstractEntity;
 import com.redhat.parodos.common.exceptions.IllegalWorkFlowStateException;
 import com.redhat.parodos.common.exceptions.ResourceNotFoundException;
 import com.redhat.parodos.common.exceptions.ResourceType;
@@ -537,6 +538,8 @@ private WorkFlowResponseDTO buildWorkflowResponseDTO(WorkFlowExecution workflowE
 				.startDate(Optional.ofNullable(workflowExecution.getStartDate()).map(Date::toString).orElse(null))
 				.endDate(Optional.ofNullable(workflowExecution.getEndDate()).map(Date::toString).orElse(null))
 				.executeBy(workflowExecution.getUser().getUsername())
+				.originalExecutionId(Optional.ofNullable(workflowExecution.getOriginalWorkFlowExecution())
+						.map(AbstractEntity::getId).orElse(null))
 				.additionalInfos(Optional.ofNullable(workflowExecution.getWorkFlowExecutionContext())
 						.flatMap(workFlowExecutionContext -> Optional
 								.ofNullable(

diff --git a/.../src/test/java/com/redhat/parodos/workflow/execution/service/WorkFlowServiceImplTest.java b/.../src/test/java/com/redhat/parodos/workflow/execution/service/WorkFlowServiceImplTest.java
@@ -1083,6 +1083,9 @@ void getWorkFlowsByProjectId_when_projectIsFound_then_returnWorkFlowStatus() {
 				.status(WorkStatus.COMPLETED).workFlowDefinition(workFlowDefinition)
 				.workFlowExecutionContext(WorkFlowExecutionContext.builder().workContext(workContext).build()).build();
 		workFlowExecution.setId(workflowExecutionId);
+		WorkFlowExecution originalWorkFlowExecution = new WorkFlowExecution();
+		originalWorkFlowExecution.setId(UUID.randomUUID());
+		workFlowExecution.setOriginalWorkFlowExecution(originalWorkFlowExecution);
 
 		when(workFlowRepository.findAllByProjectId(projectId)).thenReturn(List.of(workFlowExecution));
 		when(projectService.getProjectByIdAndUserId(eq(projectId), eq(userId)))
@@ -1094,6 +1097,7 @@ void getWorkFlowsByProjectId_when_projectIsFound_then_returnWorkFlowStatus() {
 		assertThat(workFlowService.getWorkFlowsByProjectId(projectId)).hasSize(1).satisfies(workflowStatus -> {
 			assertEquals(workflowStatus.get(0).getAdditionalInfos().get(0),
 					new WorkFlowResponseDTO.AdditionalInfo(TEST_ADDITIONAL_INFO_KEY, TEST_ADDITIONAL_INFO_VALUE));
+			assertEquals(workflowStatus.get(0).getOriginalExecutionId(), originalWorkFlowExecution.getId());
 			assertEquals(WorkStatus.COMPLETED, workflowStatus.get(0).getWorkStatus());
 		});
 	}