From 06a0a3f091a24b2aba58e8266a974f63e96a02ba Mon Sep 17 00:00:00 2001
From: midhun-aot <midhun.murali@aot-technologies.com>
Date: Fri, 20 Oct 2023 10:36:29 -0700
Subject: [PATCH] fixed previous reviewre for NIR and NOM

---
 .../subProcess/NIRBundleWorkflow.bpmn         | 77 +++++++++++++------
 .../subProcess/NOMBundleWorkflow.bpmn         | 59 ++++++++++----
 2 files changed, 95 insertions(+), 41 deletions(-)

diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NIRBundleWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NIRBundleWorkflow.bpmn
index 15aa6b9f..29d804ad 100644
--- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NIRBundleWorkflow.bpmn
+++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NIRBundleWorkflow.bpmn
@@ -29,6 +29,7 @@
       <bpmn:lane id="Lane_1b29lwn" name="CSSA Manager Reviewr">
         <bpmn:flowNodeRef>Activity_132ba5z</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0g23guk</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Gateway_1w01edb</bpmn:flowNodeRef>
       </bpmn:lane>
     </bpmn:laneSet>
     <bpmn:callActivity id="Activity_1gjzpac" name="Send Decision Email" calledElement="common-email-workflow">
@@ -101,6 +102,7 @@ task.execution.setVariable('userRole','Site Information Advisor');</camunda:scri
         </camunda:taskListener>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0unffch</bpmn:incoming>
+      <bpmn:incoming>Flow_1wavf5u</bpmn:incoming>
       <bpmn:outgoing>Flow_1ua4w6m</bpmn:outgoing>
       <bpmn:outgoing>Flow_1oam11w</bpmn:outgoing>
       <bpmn:outgoing>Flow_1g1b94u</bpmn:outgoing>
@@ -125,26 +127,6 @@ task.execution.setVariable('deleteReason', "completed");</camunda:script>
       <bpmn:incoming>Flow_115hro3</bpmn:incoming>
       <bpmn:outgoing>Flow_09ugz49</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:scriptTask id="Activity_0g23guk" name="Set Reviewers" scriptFormat="javascript">
-      <bpmn:incoming>Flow_09ugz49</bpmn:incoming>
-      <bpmn:outgoing>Flow_176uggp</bpmn:outgoing>
-      <bpmn:script>var system = java.lang.System;
-var selectSdm= execution.getVariable('selectSdm');
-system.out.println ("selectSdm"+selectSdm);
-execution.setVariable('sdmAssignment',selectSdm);
-system.out.println ("sdmAssignment"+execution.getVariable('sdmAssignment'));
-
-var selectCaseworker= execution.getVariable('selectCaseworker');
-system.out.println ("selectCaseworker"+selectCaseworker);
-execution.setVariable('caseworkerAssignment',selectCaseworker);
-system.out.println ("caseworkerAssignment"+execution.getVariable('caseworkerAssignment'));
-
-var selectSrco= execution.getVariable('selectSrco');
-system.out.println ("selectSrco"+selectSrco);
-execution.setVariable('srcoAssignment',selectSrco);
-system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
-</bpmn:script>
-    </bpmn:scriptTask>
     <bpmn:subProcess id="Activity_0truthe" name="SRCR Flow">
       <bpmn:incoming>Flow_176uggp</bpmn:incoming>
       <bpmn:outgoing>Flow_0ixmsle</bpmn:outgoing>
@@ -646,7 +628,7 @@ execution.setVariable('nirStatus', "Resubmitted");</camunda:script>
       </bpmn:extensionElements>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="Flow_176uggp" sourceRef="Activity_0g23guk" targetRef="Activity_0truthe" />
-    <bpmn:sequenceFlow id="Flow_09ugz49" sourceRef="Activity_132ba5z" targetRef="Activity_0g23guk">
+    <bpmn:sequenceFlow id="Flow_09ugz49" sourceRef="Activity_132ba5z" targetRef="Gateway_1w01edb">
       <bpmn:extensionElements>
         <camunda:executionListener class="org.camunda.bpm.extension.hooks.listeners.FormBPMFilteredDataPipelineListener" event="take" />
       </bpmn:extensionElements>
@@ -707,6 +689,37 @@ execution.setVariable('nirStatus', "Resubmitted");</camunda:script>
       <bpmn:outgoing>Flow_1rvfhly</bpmn:outgoing>
     </bpmn:parallelGateway>
     <bpmn:sequenceFlow id="Flow_1rvfhly" sourceRef="Gateway_1awj7az" targetRef="Activity_1os7sys" />
+    <bpmn:scriptTask id="Activity_0g23guk" name="Set Reviewers" scriptFormat="javascript">
+      <bpmn:incoming>Flow_0rqhohs</bpmn:incoming>
+      <bpmn:outgoing>Flow_176uggp</bpmn:outgoing>
+      <bpmn:script>var system = java.lang.System;
+var selectSdm= execution.getVariable('selectSdm');
+system.out.println ("selectSdm"+selectSdm);
+execution.setVariable('sdmAssignment',selectSdm);
+system.out.println ("sdmAssignment"+execution.getVariable('sdmAssignment'));
+
+var selectCaseworker= execution.getVariable('selectCaseworker');
+system.out.println ("selectCaseworker"+selectCaseworker);
+execution.setVariable('caseworkerAssignment',selectCaseworker);
+system.out.println ("caseworkerAssignment"+execution.getVariable('caseworkerAssignment'));
+
+var selectSrco= execution.getVariable('selectSrco');
+system.out.println ("selectSrco"+selectSrco);
+execution.setVariable('srcoAssignment',selectSrco);
+system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
+</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:exclusiveGateway id="Gateway_1w01edb">
+      <bpmn:incoming>Flow_09ugz49</bpmn:incoming>
+      <bpmn:outgoing>Flow_0rqhohs</bpmn:outgoing>
+      <bpmn:outgoing>Flow_1wavf5u</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_0rqhohs" sourceRef="Gateway_1w01edb" targetRef="Activity_0g23guk">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${action == 'Accepted'}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="Flow_1wavf5u" sourceRef="Gateway_1w01edb" targetRef="Activity_06nypz0">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${action == 'Recheck'}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
   </bpmn:process>
   <bpmn:message id="Message_1ngb2eg" name="application_resubmitted" />
   <bpmn:message id="Message_0lm44we" name="application_resubmitted" />
@@ -770,11 +783,11 @@ execution.setVariable('nirStatus', "Resubmitted");</camunda:script>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_1sxs1io" bpmnElement="Flow_09ugz49">
         <di:waypoint x="751" y="950" />
-        <di:waypoint x="790" y="950" />
+        <di:waypoint x="825" y="950" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_176uggp_di" bpmnElement="Flow_176uggp">
-        <di:waypoint x="840" y="990" />
-        <di:waypoint x="840" y="1090" />
+        <di:waypoint x="990" y="990" />
+        <di:waypoint x="990" y="1090" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_180n8hx" bpmnElement="Flow_1la2yud">
         <di:waypoint x="259" y="245" />
@@ -829,6 +842,17 @@ execution.setVariable('nirStatus', "Resubmitted");</camunda:script>
           <dc:Bounds x="614" y="502" width="44" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0rqhohs_di" bpmnElement="Flow_0rqhohs">
+        <di:waypoint x="875" y="950" />
+        <di:waypoint x="940" y="950" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1wavf5u_di" bpmnElement="Flow_1wavf5u">
+        <di:waypoint x="850" y="975" />
+        <di:waypoint x="850" y="1020" />
+        <di:waypoint x="450" y="1020" />
+        <di:waypoint x="450" y="470" />
+        <di:waypoint x="411" y="470" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="BPMNShape_1aljg9k" bpmnElement="Activity_1gjzpac">
         <dc:Bounds x="570" y="2830" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -858,9 +882,12 @@ execution.setVariable('nirStatus', "Resubmitted");</camunda:script>
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_1wcobls" bpmnElement="Activity_0g23guk">
-        <dc:Bounds x="790" y="910" width="100" height="80" />
+        <dc:Bounds x="940" y="910" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1w01edb_di" bpmnElement="Gateway_1w01edb" isMarkerVisible="true">
+        <dc:Bounds x="825" y="925" width="50" height="50" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1d2xehj_di" bpmnElement="Activity_0truthe" isExpanded="true">
         <dc:Bounds x="231" y="1090" width="1200" height="1670" />
         <bpmndi:BPMNLabel />
diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NOMBundleWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NOMBundleWorkflow.bpmn
index 581d4014..a900461e 100644
--- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NOMBundleWorkflow.bpmn
+++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/NOMBundleWorkflow.bpmn
@@ -27,8 +27,9 @@
         <bpmn:flowNodeRef>Activity_0w5t5av</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_15uoiyo</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_123733v</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_0hieobd</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0ml6v2t</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0hieobd</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Gateway_06j5m9d</bpmn:flowNodeRef>
       </bpmn:lane>
     </bpmn:laneSet>
     <bpmn:startEvent id="Event_02fettt" name="Submit Form">
@@ -104,6 +105,7 @@ task.execution.setVariable('userRole','Site Information Advisor');</camunda:scri
         </camunda:taskListener>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0unffch</bpmn:incoming>
+      <bpmn:incoming>Flow_0gzrwfr</bpmn:incoming>
       <bpmn:outgoing>Flow_1ua4w6m</bpmn:outgoing>
       <bpmn:outgoing>Flow_1oam11w</bpmn:outgoing>
       <bpmn:outgoing>Flow_0l71ern</bpmn:outgoing>
@@ -737,8 +739,16 @@ task.execution.setVariable('deleteReason', "completed");</camunda:script>
       <bpmn:outgoing>Flow_077ihmr</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:sequenceFlow id="Flow_1ld9bfn" sourceRef="Activity_0hieobd" targetRef="Activity_0truthe" />
+    <bpmn:sequenceFlow id="Flow_077ihmr" sourceRef="Activity_123733v" targetRef="Gateway_06j5m9d">
+      <bpmn:extensionElements>
+        <camunda:executionListener class="org.camunda.bpm.extension.hooks.listeners.FormBPMFilteredDataPipelineListener" event="take" />
+      </bpmn:extensionElements>
+    </bpmn:sequenceFlow>
+    <bpmn:endEvent id="Event_0ml6v2t" name="End">
+      <bpmn:incoming>Flow_0x0w3ip</bpmn:incoming>
+    </bpmn:endEvent>
     <bpmn:scriptTask id="Activity_0hieobd" name="Set Reviewers" scriptFormat="javascript">
-      <bpmn:incoming>Flow_077ihmr</bpmn:incoming>
+      <bpmn:incoming>Flow_1l3pe3s</bpmn:incoming>
       <bpmn:outgoing>Flow_1ld9bfn</bpmn:outgoing>
       <bpmn:script>var system = java.lang.System;
 var selectSdm= execution.getVariable('selectSdm');
@@ -757,14 +767,17 @@ execution.setVariable('srcoAssignment',selectSrco);
 system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
 </bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:sequenceFlow id="Flow_077ihmr" sourceRef="Activity_123733v" targetRef="Activity_0hieobd">
-      <bpmn:extensionElements>
-        <camunda:executionListener class="org.camunda.bpm.extension.hooks.listeners.FormBPMFilteredDataPipelineListener" event="take" />
-      </bpmn:extensionElements>
+    <bpmn:exclusiveGateway id="Gateway_06j5m9d">
+      <bpmn:incoming>Flow_077ihmr</bpmn:incoming>
+      <bpmn:outgoing>Flow_1l3pe3s</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0gzrwfr</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_1l3pe3s" sourceRef="Gateway_06j5m9d" targetRef="Activity_0hieobd">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${action == 'Accepted'}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="Flow_0gzrwfr" sourceRef="Gateway_06j5m9d" targetRef="Activity_06nypz0">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${action == 'Recheck'}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:endEvent id="Event_0ml6v2t" name="End">
-      <bpmn:incoming>Flow_0x0w3ip</bpmn:incoming>
-    </bpmn:endEvent>
   </bpmn:process>
   <bpmn:message id="Message_1ngb2eg" name="application_resubmitted" />
   <bpmn:message id="Message_0lm44we" name="application_resubmitted" />
@@ -788,11 +801,11 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_077ihmr_di" bpmnElement="Flow_077ihmr">
         <di:waypoint x="751" y="770" />
-        <di:waypoint x="790" y="770" />
+        <di:waypoint x="825" y="770" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1ld9bfn_di" bpmnElement="Flow_1ld9bfn">
-        <di:waypoint x="840" y="810" />
-        <di:waypoint x="840" y="870" />
+        <di:waypoint x="1051" y="810" />
+        <di:waypoint x="1051" y="870" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_00msr8t_di" bpmnElement="Flow_00msr8t">
         <di:waypoint x="480" y="640" />
@@ -897,6 +910,17 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
         <di:waypoint x="259" y="145" />
         <di:waypoint x="311" y="145" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1l3pe3s_di" bpmnElement="Flow_1l3pe3s">
+        <di:waypoint x="875" y="770" />
+        <di:waypoint x="1001" y="770" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0gzrwfr_di" bpmnElement="Flow_0gzrwfr">
+        <di:waypoint x="850" y="795" />
+        <di:waypoint x="850" y="820" />
+        <di:waypoint x="240" y="820" />
+        <di:waypoint x="240" y="410" />
+        <di:waypoint x="311" y="410" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="BPMNShape_0s7tget" bpmnElement="Event_02fettt">
         <dc:Bounds x="223" y="127" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -924,6 +948,13 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
       <bpmndi:BPMNShape id="Event_01t23k0_di" bpmnElement="Event_01t23k0">
         <dc:Bounds x="852" y="2632" width="36" height="36" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_16j8qg5" bpmnElement="Activity_0hieobd">
+        <dc:Bounds x="1001" y="730" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_06j5m9d_di" bpmnElement="Gateway_06j5m9d" isMarkerVisible="true">
+        <dc:Bounds x="825" y="745" width="50" height="50" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1d2xehj_di" bpmnElement="Activity_0truthe" isExpanded="true">
         <dc:Bounds x="231" y="870" width="978" height="1670" />
         <bpmndi:BPMNLabel />
@@ -1247,10 +1278,6 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment'));
         <dc:Bounds x="651" y="730" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_16j8qg5" bpmnElement="Activity_0hieobd">
-        <dc:Bounds x="790" y="730" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0ml6v2t_di" bpmnElement="Event_0ml6v2t">
         <dc:Bounds x="1203" y="662" width="36" height="36" />
         <bpmndi:BPMNLabel>