combine task and checker

parodos-dev · Apr 18, 2023 · 5f8a95d · 5f8a95d
1 parent d5f89a8
commit 5f8a95d
Show file tree

Hide file tree

Showing 12 changed files with 404 additions and 26 deletions.
diff --git a/parodos-model-api/src/main/java/com/redhat/parodos/workflow/enums/ParodosWorkStatus.java b/parodos-model-api/src/main/java/com/redhat/parodos/workflow/enums/ParodosWorkStatus.java
@@ -24,6 +24,6 @@
  */
 public enum ParodosWorkStatus {
 
-	FAILED, COMPLETED, PENDING, IN_PROGRESS
+	FAILED, COMPLETED, PENDING, IN_PROGRESS, REJECTED
 
 }
diff --git a/workflow-service-sdk/api/openapi.yaml b/workflow-service-sdk/api/openapi.yaml
@@ -297,7 +297,7 @@ components:
         outputs:
         - EXCEPTION
         - EXCEPTION
-        processingType: processingType
+        processingType: SEQUENTIAL
         works:
         - null
         - null
@@ -331,6 +331,10 @@ components:
             type: object
           type: object
         processingType:
+          enum:
+          - SEQUENTIAL
+          - PARALLEL
+          - OTHER
           type: string
         workType:
           type: string
@@ -354,12 +358,12 @@ components:
       type: object
     WorkFlowDefinitionResponseDTO:
       example:
-        processingType: processingType
+        processingType: SEQUENTIAL
         works:
         - outputs:
           - EXCEPTION
           - EXCEPTION
-          processingType: processingType
+          processingType: SEQUENTIAL
           works:
           - null
           - null
@@ -373,7 +377,7 @@ components:
         - outputs:
           - EXCEPTION
           - EXCEPTION
-          processingType: processingType
+          processingType: SEQUENTIAL
           works:
           - null
           - null
@@ -416,6 +420,10 @@ components:
             type: object
           type: object
         processingType:
+          enum:
+          - SEQUENTIAL
+          - PARALLEL
+          - OTHER
           type: string
         properties:
           $ref: '#/components/schemas/WorkFlowPropertiesDefinitionDTO'
@@ -766,6 +774,7 @@ components:
           - COMPLETED
           - PENDING
           - IN_PROGRESS
+          - REJECTED
           type: string
         type:
           enum:

diff --git a/workflow-service-sdk/docs/WorkDefinitionResponseDTO.md b/workflow-service-sdk/docs/WorkDefinitionResponseDTO.md
@@ -12,7 +12,7 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 **outputs** | [**List&lt;OutputsEnum&gt;**](#List&lt;OutputsEnum&gt;) |  |  [optional]
 **parameters** | **Map&lt;String, Map&lt;String, Object&gt;&gt;** |  |  [optional]
-**processingType** | **String** |  |  [optional]
+**processingType** | [**ProcessingTypeEnum**](#ProcessingTypeEnum) |  |  [optional]
 **workType** | **String** |  |  [optional]
 **works** | [**List&lt;WorkDefinitionResponseDTO&gt;**](WorkDefinitionResponseDTO.md) |  |  [optional]
 
@@ -29,3 +29,13 @@ OTHER | &quot;OTHER&quot;
 
 
 
+## Enum: ProcessingTypeEnum
+
+Name | Value
+---- | -----
+SEQUENTIAL | &quot;SEQUENTIAL&quot;
+PARALLEL | &quot;PARALLEL&quot;
+OTHER | &quot;OTHER&quot;
+
+
+
diff --git a/workflow-service-sdk/docs/WorkFlowDefinitionResponseDTO.md b/workflow-service-sdk/docs/WorkFlowDefinitionResponseDTO.md
@@ -13,10 +13,20 @@ Name | Type | Description | Notes
 **modifyDate** | **Date** |  |  [optional]
 **name** | **String** |  |  [optional]
 **parameters** | **Map&lt;String, Map&lt;String, Object&gt;&gt;** |  |  [optional]
-**processingType** | **String** |  |  [optional]
+**processingType** | [**ProcessingTypeEnum**](#ProcessingTypeEnum) |  |  [optional]
 **properties** | [**WorkFlowPropertiesDefinitionDTO**](WorkFlowPropertiesDefinitionDTO.md) |  |  [optional]
 **type** | **String** |  |  [optional]
 **works** | [**List&lt;WorkDefinitionResponseDTO&gt;**](WorkDefinitionResponseDTO.md) |  |  [optional]
 
 
 
+## Enum: ProcessingTypeEnum
+
+Name | Value
+---- | -----
+SEQUENTIAL | &quot;SEQUENTIAL&quot;
+PARALLEL | &quot;PARALLEL&quot;
+OTHER | &quot;OTHER&quot;
+
+
+
diff --git a/workflow-service-sdk/docs/WorkStatusResponseDTO.md b/workflow-service-sdk/docs/WorkStatusResponseDTO.md
@@ -21,6 +21,7 @@ FAILED | &quot;FAILED&quot;
 COMPLETED | &quot;COMPLETED&quot;
 PENDING | &quot;PENDING&quot;
 IN_PROGRESS | &quot;IN_PROGRESS&quot;
+REJECTED | &quot;REJECTED&quot;
 
 
 

diff --git a/...low-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkDefinitionResponseDTO.java b/...low-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkDefinitionResponseDTO.java
@@ -116,10 +116,63 @@ public OutputsEnum read(final JsonReader jsonReader) throws IOException {
 	@SerializedName(SERIALIZED_NAME_PARAMETERS)
 	private Map<String, Map<String, Object>> parameters = null;
 
+	/**
+	 * Gets or Sets processingType
+	 */
+	@JsonAdapter(ProcessingTypeEnum.Adapter.class)
+	public enum ProcessingTypeEnum {
+
+		SEQUENTIAL("SEQUENTIAL"),
+
+		PARALLEL("PARALLEL"),
+
+		OTHER("OTHER");
+
+		private String value;
+
+		ProcessingTypeEnum(String value) {
+			this.value = value;
+		}
+
+		public String getValue() {
+			return value;
+		}
+
+		@Override
+		public String toString() {
+			return String.valueOf(value);
+		}
+
+		public static ProcessingTypeEnum fromValue(String value) {
+			for (ProcessingTypeEnum b : ProcessingTypeEnum.values()) {
+				if (b.value.equals(value)) {
+					return b;
+				}
+			}
+			throw new IllegalArgumentException("Unexpected value '" + value + "'");
+		}
+
+		public static class Adapter extends TypeAdapter<ProcessingTypeEnum> {
+
+			@Override
+			public void write(final JsonWriter jsonWriter, final ProcessingTypeEnum enumeration) throws IOException {
+				jsonWriter.value(enumeration.getValue());
+			}
+
+			@Override
+			public ProcessingTypeEnum read(final JsonReader jsonReader) throws IOException {
+				String value = jsonReader.nextString();
+				return ProcessingTypeEnum.fromValue(value);
+			}
+
+		}
+
+	}
+
 	public static final String SERIALIZED_NAME_PROCESSING_TYPE = "processingType";
 
 	@SerializedName(SERIALIZED_NAME_PROCESSING_TYPE)
-	private String processingType;
+	private ProcessingTypeEnum processingType;
 
 	public static final String SERIALIZED_NAME_WORK_TYPE = "workType";
 
@@ -255,7 +308,7 @@ public void setParameters(Map<String, Map<String, Object>> parameters) {
 		this.parameters = parameters;
 	}
 
-	public WorkDefinitionResponseDTO processingType(String processingType) {
+	public WorkDefinitionResponseDTO processingType(ProcessingTypeEnum processingType) {
 
 		this.processingType = processingType;
 		return this;
@@ -268,11 +321,11 @@ public WorkDefinitionResponseDTO processingType(String processingType) {
 	@javax.annotation.Nullable
 	@ApiModelProperty(value = "")
 
-	public String getProcessingType() {
+	public ProcessingTypeEnum getProcessingType() {
 		return processingType;
 	}
 
-	public void setProcessingType(String processingType) {
+	public void setProcessingType(ProcessingTypeEnum processingType) {
 		this.processingType = processingType;
 	}
 

diff --git a/...service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowDefinitionResponseDTO.java b/...service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowDefinitionResponseDTO.java
@@ -70,10 +70,63 @@ public class WorkFlowDefinitionResponseDTO {
 	@SerializedName(SERIALIZED_NAME_PARAMETERS)
 	private Map<String, Map<String, Object>> parameters = null;
 
+	/**
+	 * Gets or Sets processingType
+	 */
+	@JsonAdapter(ProcessingTypeEnum.Adapter.class)
+	public enum ProcessingTypeEnum {
+
+		SEQUENTIAL("SEQUENTIAL"),
+
+		PARALLEL("PARALLEL"),
+
+		OTHER("OTHER");
+
+		private String value;
+
+		ProcessingTypeEnum(String value) {
+			this.value = value;
+		}
+
+		public String getValue() {
+			return value;
+		}
+
+		@Override
+		public String toString() {
+			return String.valueOf(value);
+		}
+
+		public static ProcessingTypeEnum fromValue(String value) {
+			for (ProcessingTypeEnum b : ProcessingTypeEnum.values()) {
+				if (b.value.equals(value)) {
+					return b;
+				}
+			}
+			throw new IllegalArgumentException("Unexpected value '" + value + "'");
+		}
+
+		public static class Adapter extends TypeAdapter<ProcessingTypeEnum> {
+
+			@Override
+			public void write(final JsonWriter jsonWriter, final ProcessingTypeEnum enumeration) throws IOException {
+				jsonWriter.value(enumeration.getValue());
+			}
+
+			@Override
+			public ProcessingTypeEnum read(final JsonReader jsonReader) throws IOException {
+				String value = jsonReader.nextString();
+				return ProcessingTypeEnum.fromValue(value);
+			}
+
+		}
+
+	}
+
 	public static final String SERIALIZED_NAME_PROCESSING_TYPE = "processingType";
 
 	@SerializedName(SERIALIZED_NAME_PROCESSING_TYPE)
-	private String processingType;
+	private ProcessingTypeEnum processingType;
 
 	public static final String SERIALIZED_NAME_PROPERTIES = "properties";
 
@@ -227,7 +280,7 @@ public void setParameters(Map<String, Map<String, Object>> parameters) {
 		this.parameters = parameters;
 	}
 
-	public WorkFlowDefinitionResponseDTO processingType(String processingType) {
+	public WorkFlowDefinitionResponseDTO processingType(ProcessingTypeEnum processingType) {
 
 		this.processingType = processingType;
 		return this;
@@ -240,11 +293,11 @@ public WorkFlowDefinitionResponseDTO processingType(String processingType) {
 	@javax.annotation.Nullable
 	@ApiModelProperty(value = "")
 
-	public String getProcessingType() {
+	public ProcessingTypeEnum getProcessingType() {
 		return processingType;
 	}
 
-	public void setProcessingType(String processingType) {
+	public void setProcessingType(ProcessingTypeEnum processingType) {
 		this.processingType = processingType;
 	}
 

diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkStatusResponseDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkStatusResponseDTO.java
@@ -49,7 +49,9 @@ public enum StatusEnum {
 
 		PENDING("PENDING"),
 
-		IN_PROGRESS("IN_PROGRESS");
+		IN_PROGRESS("IN_PROGRESS"),
+
+		REJECTED("REJECTED");
 
 		private String value;
 

diff --git a/workflow-service/generated/openapi/openapi.json b/workflow-service/generated/openapi/openapi.json
@@ -624,7 +624,7 @@
           },
           "status" : {
             "type" : "string",
-            "enum" : [ "FAILED", "COMPLETED", "PENDING", "IN_PROGRESS" ]
+            "enum" : [ "FAILED", "COMPLETED", "PENDING", "IN_PROGRESS", "REJECTED" ]
           },
           "type" : {
             "type" : "string",

diff --git a/...in/java/com/redhat/parodos/workflow/definition/service/WorkFlowDefinitionServiceImpl.java b/...in/java/com/redhat/parodos/workflow/definition/service/WorkFlowDefinitionServiceImpl.java
@@ -247,6 +247,7 @@ private void getWorksFromWorkDefinition(List<WorkFlowWorkDefinition> workFlowWor
 						return;
 					}
 					responseDTOs.add(WorkDefinitionResponseDTO.fromWorkFlowTaskDefinition(wdt.get()));
+					break;
 				case WORKFLOW:
 					Optional<WorkFlowDefinition> wd = workFlowDefinitionRepository
 							.findById(workFlowWorkDefinition.getWorkDefinitionId());
@@ -260,6 +261,7 @@ private void getWorksFromWorkDefinition(List<WorkFlowWorkDefinition> workFlowWor
 
 					responseDTOs.add(WorkDefinitionResponseDTO.fromWorkFlowDefinitionEntity(wd.get(),
 							wdWorkFlowWorkDependencies));
+					break;
 				default:
 					return;
 			}

diff --git a/.../src/main/java/com/redhat/parodos/workflow/execution/service/WorkFlowServiceDelegate.java b/.../src/main/java/com/redhat/parodos/workflow/execution/service/WorkFlowServiceDelegate.java
@@ -29,7 +29,6 @@
 import com.redhat.parodos.workflow.execution.entity.WorkFlowTaskExecution;
 import com.redhat.parodos.workflow.execution.repository.WorkFlowRepository;
 import com.redhat.parodos.workflow.execution.repository.WorkFlowTaskRepository;
-import com.redhat.parodos.workflow.task.enums.WorkFlowTaskStatus;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -148,12 +147,18 @@ private WorkStatusResponseDTO getWorkStatusResponseDTOFromWorkFlow(WorkFlowWorkD
 
 		WorkFlowExecution workExecution = workFlowRepository.findFirstByMainWorkFlowExecutionAndWorkFlowDefinitionId(
 				workFlowExecution, workFlowWorkDefinition.getWorkDefinitionId());
+
 		/*
 		 * the workflow execution might be null when there is pending checker before it
 		 */
-		ParodosWorkStatus workStatus = workExecution == null
-				|| WorkFlowStatus.IN_PROGRESS.equals(workExecution.getStatus()) ? ParodosWorkStatus.PENDING
-						: ParodosWorkStatus.valueOf(workExecution.getStatus().name());
+		ParodosWorkStatus workStatus;
+
+		if (workExecution == null) {
+			workStatus = ParodosWorkStatus.PENDING;
+		}
+		else {
+			workStatus = ParodosWorkStatus.valueOf(workExecution.getStatus().name());
+		}
 
 		return WorkStatusResponseDTO.builder().name(workFlowDefinition.getName()).type(WorkType.WORKFLOW)
 				.status(workStatus).works(new ArrayList<>()).workExecution(workExecution)
@@ -175,9 +180,19 @@ private WorkStatusResponseDTO getWorkStatusResponseDTOFromWorkFlowTask(
 		ParodosWorkStatus workStatus = ParodosWorkStatus.PENDING;
 
 		if (workFlowTaskExecutionOptional.isPresent()) {
-			workStatus = WorkFlowTaskStatus.IN_PROGRESS.equals(workFlowTaskExecutionOptional.get().getStatus())
-					? ParodosWorkStatus.PENDING
-					: ParodosWorkStatus.valueOf(workFlowTaskExecutionOptional.get().getStatus().name());
+			workStatus = ParodosWorkStatus.valueOf(workFlowTaskExecutionOptional.get().getStatus().name());
+			if (workFlowTaskDefinition.getWorkFlowCheckerMappingDefinition() != null) {
+				workStatus = Optional
+						.ofNullable(workFlowRepository.findFirstByMainWorkFlowExecutionAndWorkFlowDefinitionId(
+								workFlowExecution.getMainWorkFlowExecution(),
+								workFlowTaskDefinition
+										.getWorkFlowCheckerMappingDefinition().getCheckWorkFlow().getId()))
+						.map(WorkFlowExecution::getStatus)
+						.map(checkerStatus -> WorkFlowStatus.FAILED.equals(checkerStatus)
+								? ParodosWorkStatus.IN_PROGRESS : ParodosWorkStatus.valueOf(checkerStatus.name()))
+						.orElse(ParodosWorkStatus.COMPLETED.equals(workStatus) ? ParodosWorkStatus.IN_PROGRESS
+								: workStatus);
+			}
 		}
 
 		return WorkStatusResponseDTO.builder().name(workFlowTaskDefinition.getName()).type(WorkType.TASK)