TE-612: Fix loop with SubProcessCall

axonivy-market · Jun 17, 2024 · 9800658 · 9800658
1 parent 629d544
commit 9800658
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 14 deletions.
diff --git a/...s-analyzer-test/dataclasses/com/axonivy/utils/estimator/test/FlowTriggerCallData.ivyClass b/...s-analyzer-test/dataclasses/com/axonivy/utils/estimator/test/FlowTriggerCallData.ivyClass
@@ -0,0 +1,2 @@
+FlowTriggerCallData #class
+com.axonivy.utils.estimator.test #namespace
diff --git a/process-analyzer-test/processes/FlowSubprocess.p.json b/process-analyzer-test/processes/FlowSubprocess.p.json
@@ -163,7 +163,7 @@
         "findTasksOnPath( start.ivp ) => TaskA, TaskB"
       ],
       "visual" : {
-        "at" : { "x" : 824, "y" : 167 },
+        "at" : { "x" : 968, "y" : 63 },
         "size" : { "width" : 476, "height" : 97 }
       }
     }, {
@@ -191,7 +191,7 @@
         "size" : { "width" : 128, "height" : 60 }
       },
       "connect" : [
-        { "id" : "f9", "to" : "f8" }
+        { "id" : "f9", "to" : "S80" }
       ]
     }, {
       "id" : "f6",
@@ -210,7 +210,7 @@
       "id" : "f8",
       "type" : "TaskEnd",
       "visual" : {
-        "at" : { "x" : 488, "y" : 192 }
+        "at" : { "x" : 728, "y" : 192 }
       }
     }, {
       "id" : "f10",
@@ -969,6 +969,63 @@
       "connect" : [
         { "id" : "f29", "to" : "f17", "var" : "in1" }
       ]
+    }, {
+      "id" : "S80",
+      "type" : "EmbeddedProcess",
+      "name" : "Sub2",
+      "elements" : [ {
+          "id" : "S80-g0",
+          "type" : "EmbeddedStart",
+          "visual" : {
+            "at" : { "x" : 64, "y" : 256 }
+          },
+          "parentConnector" : "f9",
+          "connect" : [
+            { "id" : "S80-f0", "to" : "S80-f3" }
+          ]
+        }, {
+          "id" : "S80-g1",
+          "type" : "EmbeddedEnd",
+          "visual" : {
+            "at" : { "x" : 520, "y" : 256 }
+          },
+          "parentConnector" : "f32"
+        }, {
+          "id" : "S80-f1",
+          "type" : "UserTask",
+          "name" : "Sub2-TaskA",
+          "config" : {
+            "dialog" : "com.axonivy.utils.process.analyzer.test.Dummy:start()",
+            "task" : {
+              "name" : "Sub2-TaskA"
+            }
+          },
+          "visual" : {
+            "at" : { "x" : 368, "y" : 256 }
+          },
+          "connect" : [
+            { "id" : "S80-f2", "to" : "S80-g1" }
+          ]
+        }, {
+          "id" : "S80-f3",
+          "type" : "TriggerCall",
+          "name" : "Sub2-TriggerA",
+          "config" : {
+            "processCall" : "FlowTriggerCall:start()"
+          },
+          "visual" : {
+            "at" : { "x" : 192, "y" : 256 }
+          },
+          "connect" : [
+            { "id" : "S80-f4", "to" : "S80-f1" }
+          ]
+        } ],
+      "visual" : {
+        "at" : { "x" : 512, "y" : 192 }
+      },
+      "connect" : [
+        { "id" : "f32", "to" : "f8" }
+      ]
     } ],
   "layout" : {
     "colors" : {

diff --git a/process-analyzer-test/processes/FlowTriggerCall.p.json b/process-analyzer-test/processes/FlowTriggerCall.p.json
@@ -0,0 +1,44 @@
+{
+  "$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json",
+  "id" : "19024F53FFE1E44F",
+  "config" : {
+    "data" : "com.axonivy.utils.estimator.test.FlowTriggerCallData"
+  },
+  "elements" : [ {
+      "id" : "f0",
+      "type" : "RequestStart",
+      "name" : "start",
+      "config" : {
+        "signature" : "start",
+        "triggerable" : true
+      },
+      "visual" : {
+        "at" : { "x" : 96, "y" : 64 }
+      },
+      "connect" : [
+        { "id" : "f2", "to" : "f3" }
+      ]
+    }, {
+      "id" : "f1",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 352, "y" : 64 }
+      }
+    }, {
+      "id" : "f3",
+      "type" : "UserTask",
+      "name" : "Trigger-TaskA",
+      "config" : {
+        "dialog" : "com.axonivy.utils.process.analyzer.test.Dummy:start()",
+        "task" : {
+          "name" : "Trigger-TaskA"
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 224, "y" : 64 }
+      },
+      "connect" : [
+        { "id" : "f4", "to" : "f1" }
+      ]
+    } ]
+}
diff --git a/...nalyzer-test/src_test/com/axonivy/utils/process/analyzer/test/FlowExampleComplexTest.java b/...nalyzer-test/src_test/com/axonivy/utils/process/analyzer/test/FlowExampleComplexTest.java
@@ -109,7 +109,7 @@ void shouldFindTasksOnPathAtStart() throws Exception {
 		var start = ProcessGraphHelper.findByElementName(process, "start");
 		var detectedTasks = processAnalyzer.findTasksOnPath(start, UseCase.BIGPROJECT, "internal");
 
-		var expected = Arrays.array("Task A", "Task B", "Task2B", "Task G", "Task2A", "Task H");
+		var expected = Arrays.array("Task A", "Task B", "Task2A", "Task H", "Task2B", "Task G");
 		var taskNames = (getTaskNames(detectedTasks));
 		assertArrayEquals(expected, taskNames);
 	}
@@ -120,7 +120,7 @@ void shouldCalculateEstimateDuratioUseCaseBIGPROJECTAtTaskBAndTaskC() throws Exc
 		var taskC = ProcessGraphHelper.findByElementName(process, "Task C");
 		Duration duration = processAnalyzer.calculateWorstCaseDuration(List.of(taskB, taskC), UseCase.BIGPROJECT);
 
-		assertEquals(Duration.ofHours(18), duration);
+		assertEquals(Duration.ofHours(15), duration);
 	}
 
 	@Test

diff --git a/...ss-analyzer-test/src_test/com/axonivy/utils/process/analyzer/test/FlowSubProcessTest.java b/...ss-analyzer-test/src_test/com/axonivy/utils/process/analyzer/test/FlowSubProcessTest.java
@@ -79,12 +79,15 @@ void shouldFindTaskParentNames() throws Exception {
 	}
 
 	@Test
-	void shouldFindSubProcessTest() throws Exception {
+	void shouldFindSubProcessTestAtStart2() throws Exception {
 		var start2 = ProcessGraphHelper.findByElementName(process, "start2");
 		var detectedTasks = processAnalyzer.findAllTasks(start2, UseCase.BIGPROJECT);
+
+		var expected = Arrays.array("Task sub", "Sub2-TaskA");
+		var taskNames = getTaskNames(detectedTasks);		
+		assertArrayEquals(expected, taskNames);
+
 		var detectedTask = (DetectedTask) detectedTasks.get(0);
-
-		assertEquals(1, detectedTasks.size());
 		assertEquals("18DE58E0441486DF-f5", detectedTask.getPid());
 		assertEquals("Custom info", detectedTask.getCustomInfo());
 		assertEquals("FlowSubProcessCall", detectedTask.getElementName());

diff --git a/process-analyzer/src/com/axonivy/utils/process/analyzer/internal/PathFinder.java b/process-analyzer/src/com/axonivy/utils/process/analyzer/internal/PathFinder.java
@@ -110,7 +110,7 @@ private List<AnalysisPath> getParentPathOf(ProcessElement startElement,String fl
 
 		List<AnalysisPath> result = paths;
 		if(parentElement != null) {
-			SubProcessGroup subProcess = new SubProcessGroup(parentElement.getElement(), paths);
+			SubProcessGroup subProcess = new SubProcessGroup((EmbeddedProcessElement) parentElement.getElement(), paths);
 
 			Map<ProcessElement, List<AnalysisPath>> parentPaths = findPath(List.of(parentElement), flowName, findType);
 			List<AnalysisPath> subPaths = parentPaths.getOrDefault(parentElement, emptyList());
@@ -458,8 +458,8 @@ private Map<SequenceFlow, List<AnalysisPath>> findAnalysisPathForNextNode(Proces
 
 	private boolean isContains(List<AnalysisPath> currentPaths, final ProcessElement from) {
 		boolean isContains = false;
-		if (from.getElement() instanceof SingleTaskCreator && from.getElement() instanceof RequestStart == false) {
-			SingleTaskCreator node = (SingleTaskCreator) from.getElement();
+		if (from.getElement() instanceof NodeElement && from.getElement() instanceof RequestStart == false) {
+			NodeElement node = (NodeElement) from.getElement();
 			if (node.getIncoming().size() > 0) {
 				SequenceFlow sequenceFlow = node.getIncoming().get(0);
 				List<AnalysisPath> pathWithConnectToFrom = currentPaths.stream().filter(path -> {

diff --git a/process-analyzer/src/com/axonivy/utils/process/analyzer/internal/model/SubProcessGroup.java b/process-analyzer/src/com/axonivy/utils/process/analyzer/internal/model/SubProcessGroup.java
@@ -6,17 +6,18 @@
 import java.util.Objects;
 
 import ch.ivyteam.ivy.process.model.BaseElement;
+import ch.ivyteam.ivy.process.model.element.EmbeddedProcessElement;
 import ch.ivyteam.ivy.process.model.value.PID;
 
 public class SubProcessGroup implements ProcessElement {
-	private BaseElement element;
+	private EmbeddedProcessElement element;
 	List<AnalysisPath> internalPaths;
 
-	public SubProcessGroup(BaseElement element) {
+	public SubProcessGroup(EmbeddedProcessElement element) {
 		this.element = element;
 	}
 
-	public SubProcessGroup(BaseElement element, List<AnalysisPath> internalPaths) {
+	public SubProcessGroup(EmbeddedProcessElement element, List<AnalysisPath> internalPaths) {
 		this(element);
 		this.internalPaths = internalPaths;
 	}