Core-nssmf - activate/deactivate flow

To fix the issues noticed during testing
- in activate and deactivate flow
- in allocate non-shared: update requestdb correctly when flow is
successful.

Issue-ID: SO-3527
Signed-off-by: aleemraja <ar00500721@techmahindra.com>
Change-Id: I37ce7d61eaba8ea60a95a9517509696b2cf3a357

1 files changed, 124 insertions, 155 deletions

diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoActivateCoreNSSI.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoActivateCoreNSSI.bpmn
index b422545e84..9ce25ed174 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoActivateCoreNSSI.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoActivateCoreNSSI.bpmn
@@ -4,7 +4,7 @@
     <bpmn:startEvent id="StartEvent_0lgslwq" name="Start">
       <bpmn:outgoing>SequenceFlow_0wwo1lh</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:scriptTask id="ScriptTask_1x13jc1" name="Pre-process  request&#10;Check operationType" scriptFormat="groovy">
+    <bpmn:scriptTask id="ScriptTask_1x13jc1" name="Pre-process  request&#10;Check operationType" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_0wwo1lh</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_139ejmn</bpmn:outgoing>
       <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
@@ -25,8 +25,8 @@ activateNssi.getServiceVNFAndVFsFromCatalogDB(execution)</bpmn:script>
 def activateNssi = new DoActivateCoreNSSI()
 activateNssi.prepareSOMacroRequestPayLoad(execution)</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:scriptTask id="ScriptTask_0lxbaxd" name="Call AAI &#10;update sliceProlie service Instance status" scriptFormat="groovy">
-      <bpmn:incoming>SequenceFlow_1e20i9g</bpmn:incoming>
+    <bpmn:scriptTask id="ScriptTask_0lxbaxd" name="Call AAIÂ &#10;update sliceProlie service Instance status" scriptFormat="groovy">
+      <bpmn:incoming>Flow_09eevay</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0j0egoi</bpmn:outgoing>
       <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def activateNssi = new DoActivateCoreNSSI()
@@ -46,38 +46,9 @@ activateNssi.getNetworkInstanceWithSPInstanceAssociatedWithNssiId(execution)</bp
 def activateNssi = new DoActivateCoreNSSI()
 activateNssi.sendPutRequestToSOMacro(execution)</bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:scriptTask id="ScriptTask_1frasll" name="Prepare Call CheckServiceProcessStatus" scriptFormat="groovy">
-      <bpmn:incoming>Flow_039sx2v</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_18x9gdi</bpmn:outgoing>
-      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
-def activateNssi = new DoActivateCoreNSSI()
-activateNssi.prepareCallCheckProcessStatus(execution)</bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:callActivity id="CallActivity_11hntoj" name="CallCheckServiceProcessStatus" calledElement="CheckServiceProcessStatus">
-      <bpmn:extensionElements>
-        <camunda:in source="networkServiceInstanceId" target="serviceInstanceId" />
-        <camunda:in source="macroOperationId" target="operationId" />
-        <camunda:in source="successConditions" target="successConditions" />
-        <camunda:in source="errorConditions" target="errorConditions" />
-        <camunda:in source="processServiceType" target="processServiceType" />
-        <camunda:in source="timeOut" target="timeOut" />
-        <camunda:out source="operationStatus" target="result" />
-        <camunda:out source="operationContent" target="reason" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-        <camunda:out source="isTimeOut" target="isTimeOut" />
-        <camunda:in source="subOperationType" target="operationType" />
-        <camunda:in source="initProgress" target="initProgress" />
-        <camunda:in source="endProgress" target="endProgress" />
-        <camunda:in source="serviceInstanceID" target="parentServiceInstanceId" />
-        <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
-        <camunda:in source="operationId" target="parentOperationId" />
-      </bpmn:extensionElements>
-      <bpmn:incoming>SequenceFlow_18x9gdi</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1l9ry0a</bpmn:outgoing>
-    </bpmn:callActivity>
-    <bpmn:scriptTask id="ScriptTask_1sfn88d" name="Prepare update Service operation status " scriptFormat="groovy">
-      <bpmn:incoming>SequenceFlow_1l9ry0a</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_0wx21io</bpmn:outgoing>
+    <bpmn:scriptTask id="ScriptTask_1sfn88d" name="Prepare update Service operation status " scriptFormat="groovy">
+      <bpmn:incoming>Flow_1a7o8s7</bpmn:incoming>
+      <bpmn:outgoing>Flow_09eevay</bpmn:outgoing>
       <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
 def activateNssi = new DoActivateCoreNSSI()
 activateNssi.prepareUpdateResourceOperationStatus(execution)</bpmn:script>
@@ -86,7 +57,6 @@ activateNssi.prepareUpdateResourceOperationStatus(execution)</bpmn:script>
     <bpmn:sequenceFlow id="SequenceFlow_139ejmn" sourceRef="ScriptTask_1x13jc1" targetRef="ScriptTask_1rjha8r" />
     <bpmn:sequenceFlow id="SequenceFlow_1654pt0" sourceRef="ScriptTask_1rjha8r" targetRef="ScriptTask_0usuysi" />
     <bpmn:sequenceFlow id="SequenceFlow_09nihof" sourceRef="ScriptTask_0usuysi" targetRef="ScriptTask_1t06mlw" />
-    <bpmn:sequenceFlow id="SequenceFlow_1l9ry0a" sourceRef="CallActivity_11hntoj" targetRef="ScriptTask_1sfn88d" />
     <bpmn:sequenceFlow id="SequenceFlow_0fbr356" sourceRef="ScriptTask_1t06mlw" targetRef="IntermediateThrowEvent_0gueutz" />
     <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0gueutz" name="Call SO macro api">
       <bpmn:incoming>SequenceFlow_0fbr356</bpmn:incoming>
@@ -98,25 +68,15 @@ activateNssi.prepareUpdateResourceOperationStatus(execution)</bpmn:script>
       <bpmn:linkEventDefinition name="CallSO" />
     </bpmn:intermediateCatchEvent>
     <bpmn:sequenceFlow id="SequenceFlow_0rjd7tg" sourceRef="ScriptTask_1tfpgcs" targetRef="Gateway_03lo8jx" />
-    <bpmn:exclusiveGateway id="ExclusiveGateway_02nqn2k" name="is TimeOut?" default="SequenceFlow_07u1gfw">
-      <bpmn:incoming>SequenceFlow_0wx21io</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_1e20i9g</bpmn:outgoing>
-      <bpmn:outgoing>SequenceFlow_07u1gfw</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="SequenceFlow_0wx21io" sourceRef="ScriptTask_1sfn88d" targetRef="ExclusiveGateway_02nqn2k" />
-    <bpmn:sequenceFlow id="SequenceFlow_1e20i9g" name="No" sourceRef="ExclusiveGateway_02nqn2k" targetRef="ScriptTask_0lxbaxd">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{(execution.getVariable("isTimeOut") == "NO")}</bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
     <bpmn:endEvent id="EndEvent_1061mty" name="End">
       <bpmn:incoming>SequenceFlow_0v0dntm</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_18x9gdi" sourceRef="ScriptTask_1frasll" targetRef="CallActivity_11hntoj" />
     <bpmn:exclusiveGateway id="Gateway_03lo8jx" name="is SO Response OK?" default="Flow_1jchhgj">
       <bpmn:incoming>SequenceFlow_0rjd7tg</bpmn:incoming>
       <bpmn:outgoing>Flow_039sx2v</bpmn:outgoing>
       <bpmn:outgoing>Flow_1jchhgj</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="Flow_039sx2v" name="Yes" sourceRef="Gateway_03lo8jx" targetRef="ScriptTask_1frasll">
+    <bpmn:sequenceFlow id="Flow_039sx2v" name="Yes" sourceRef="Gateway_03lo8jx" targetRef="Activity_14jev2r">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{(execution.getVariable("isSOResponseSucceed" )  == "yes")}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:serviceTask id="ServiceTask_02x7eqy" name="Update Service Operation Status">
@@ -130,7 +90,7 @@ activateNssi.prepareUpdateResourceOperationStatus(execution)</bpmn:script>
                 <camunda:entry key="Authorization">Basic YnBlbDpwYXNzd29yZDEk</camunda:entry>
               </camunda:map>
             </camunda:inputParameter>
-            <camunda:inputParameter name="payload">${updateOperationStatus}</camunda:inputParameter>
+            <camunda:inputParameter name="payload">${updateResourceOperationStatus}</camunda:inputParameter>
             <camunda:inputParameter name="method">POST</camunda:inputParameter>
             <camunda:outputParameter name="NSSMF_dbResponseCode">${statusCode}</camunda:outputParameter>
             <camunda:outputParameter name="NSSMF_dbResponse">${response}</camunda:outputParameter>
@@ -140,13 +100,11 @@ activateNssi.prepareUpdateResourceOperationStatus(execution)</bpmn:script>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1jchhgj</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_0j0egoi</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_07u1gfw</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0v0dntm</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="SequenceFlow_0v0dntm" sourceRef="ServiceTask_02x7eqy" targetRef="EndEvent_1061mty" />
     <bpmn:sequenceFlow id="Flow_1jchhgj" name="No" sourceRef="Gateway_03lo8jx" targetRef="ServiceTask_02x7eqy" />
     <bpmn:sequenceFlow id="SequenceFlow_0j0egoi" sourceRef="ScriptTask_0lxbaxd" targetRef="ServiceTask_02x7eqy" />
-    <bpmn:sequenceFlow id="SequenceFlow_07u1gfw" name="Yes" sourceRef="ExclusiveGateway_02nqn2k" targetRef="ServiceTask_02x7eqy" />
     <bpmn:subProcess id="Activity_1tmdw60" name="Sub-process for FalloutHandler and Rollback" triggeredByEvent="true">
       <bpmn:startEvent id="Event_159txw2">
         <bpmn:outgoing>Flow_149oqyp</bpmn:outgoing>
@@ -196,225 +154,236 @@ activateNssi.prepareFailedOperationStatusUpdate(execution)</bpmn:script>
       <bpmn:sequenceFlow id="Flow_149oqyp" sourceRef="Event_159txw2" targetRef="Activity_0u4a0ry" />
       <bpmn:sequenceFlow id="Flow_1qooaff" sourceRef="Activity_0u3yna7" targetRef="Event_0c1ec2y" />
     </bpmn:subProcess>
+    <bpmn:scriptTask id="Activity_14jev2r" name="Call Get SO PUT progress" scriptFormat="groovy">
+      <bpmn:incoming>Flow_0q5mlhf</bpmn:incoming>
+      <bpmn:incoming>Flow_039sx2v</bpmn:incoming>
+      <bpmn:outgoing>Flow_1mtsx52</bpmn:outgoing>
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
+def activateNssi = new DoActivateCoreNSSI()
+activateNssi.getSOPUTProgress(execution)</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:exclusiveGateway id="Gateway_0fdseyg" default="Flow_1a7o8s7">
+      <bpmn:incoming>Flow_1mtsx52</bpmn:incoming>
+      <bpmn:outgoing>Flow_1ocji6k</bpmn:outgoing>
+      <bpmn:outgoing>Flow_1a7o8s7</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:scriptTask id="Activity_0fbp09r" name="Time Delay 5s" scriptFormat="groovy">
+      <bpmn:incoming>Flow_1ocji6k</bpmn:incoming>
+      <bpmn:outgoing>Flow_0q5mlhf</bpmn:outgoing>
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
+def activateNssi = new DoActivateCoreNSSI()
+activateNssi.timeDelay()</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:sequenceFlow id="Flow_0q5mlhf" sourceRef="Activity_0fbp09r" targetRef="Activity_14jev2r" />
+    <bpmn:sequenceFlow id="Flow_1ocji6k" name="requestState=IN_PROGRESS" sourceRef="Gateway_0fdseyg" targetRef="Activity_0fbp09r">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{(execution.getVariable("requestState" ) == "IN_PROGRESS")}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="Flow_1mtsx52" sourceRef="Activity_14jev2r" targetRef="Gateway_0fdseyg" />
+    <bpmn:sequenceFlow id="Flow_1a7o8s7" sourceRef="Gateway_0fdseyg" targetRef="ScriptTask_1sfn88d" />
+    <bpmn:sequenceFlow id="Flow_09eevay" sourceRef="ScriptTask_1sfn88d" targetRef="ScriptTask_0lxbaxd" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoActivateCoreNSSI">
-      <bpmndi:BPMNEdge id="SequenceFlow_07u1gfw_di" bpmnElement="SequenceFlow_07u1gfw">
-        <di:waypoint x="976" y="319" />
-        <di:waypoint x="1123" y="319" />
+      <bpmndi:BPMNEdge id="Flow_09eevay_di" bpmnElement="Flow_09eevay">
+        <di:waypoint x="1020" y="319" />
+        <di:waypoint x="1090" y="319" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1a7o8s7_di" bpmnElement="Flow_1a7o8s7">
+        <di:waypoint x="845" y="319" />
+        <di:waypoint x="920" y="319" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1mtsx52_di" bpmnElement="Flow_1mtsx52">
+        <di:waypoint x="690" y="319" />
+        <di:waypoint x="795" y="319" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1ocji6k_di" bpmnElement="Flow_1ocji6k">
+        <di:waypoint x="820" y="344" />
+        <di:waypoint x="820" y="378" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1041" y="301" width="18" height="14" />
+          <dc:Bounds x="743" y="342" width="78" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0q5mlhf_di" bpmnElement="Flow_0q5mlhf">
+        <di:waypoint x="770" y="418" />
+        <di:waypoint x="640" y="418" />
+        <di:waypoint x="640" y="359" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0j0egoi_di" bpmnElement="SequenceFlow_0j0egoi">
-        <di:waypoint x="1099" y="258" />
-        <di:waypoint x="1173" y="258" />
-        <di:waypoint x="1173" y="279" />
+        <di:waypoint x="1190" y="319" />
+        <di:waypoint x="1253" y="319" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="376" y="387" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1jchhgj_di" bpmnElement="Flow_1jchhgj">
-        <di:waypoint x="400" y="344" />
-        <di:waypoint x="400" y="450" />
-        <di:waypoint x="1190" y="450" />
-        <di:waypoint x="1190" y="360" />
+        <di:waypoint x="460" y="344" />
+        <di:waypoint x="460" y="480" />
+        <di:waypoint x="1320" y="480" />
+        <di:waypoint x="1320" y="359" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="788" y="432" width="15" height="14" />
+          <dc:Bounds x="883" y="462" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0v0dntm_di" bpmnElement="SequenceFlow_0v0dntm">
-        <di:waypoint x="1223" y="319" />
-        <di:waypoint x="1263" y="319" />
+        <di:waypoint x="1353" y="319" />
+        <di:waypoint x="1393" y="319" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="483" y="448" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_039sx2v_di" bpmnElement="Flow_039sx2v">
-        <di:waypoint x="425" y="319" />
-        <di:waypoint x="470" y="319" />
+        <di:waypoint x="485" y="319" />
+        <di:waypoint x="590" y="319" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="439" y="301" width="18" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_18x9gdi_di" bpmnElement="SequenceFlow_18x9gdi">
-        <di:waypoint x="570" y="319" />
-        <di:waypoint x="610" y="319" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-180.5" y="448" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1e20i9g_di" bpmnElement="SequenceFlow_1e20i9g">
-        <di:waypoint x="951" y="294" />
-        <di:waypoint x="951" y="258" />
-        <di:waypoint x="999" y="258" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="959" y="273" width="15" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_0wx21io_di" bpmnElement="SequenceFlow_0wx21io">
-        <di:waypoint x="868" y="319" />
-        <di:waypoint x="926" y="319" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="137" y="448" width="0" height="12" />
+          <dc:Bounds x="532" y="301" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0rjd7tg_di" bpmnElement="SequenceFlow_0rjd7tg">
-        <di:waypoint x="330" y="319" />
-        <di:waypoint x="375" y="319" />
+        <di:waypoint x="380" y="319" />
+        <di:waypoint x="435" y="319" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="-336" y="448" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1mi4waj_di" bpmnElement="SequenceFlow_1mi4waj">
-        <di:waypoint x="178" y="319" />
-        <di:waypoint x="230" y="319" />
+        <di:waypoint x="218" y="319" />
+        <di:waypoint x="280" y="319" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="-489.5" y="448" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0fbr356_di" bpmnElement="SequenceFlow_0fbr356">
-        <di:waypoint x="1020" y="120" />
-        <di:waypoint x="1132" y="120" />
+        <di:waypoint x="1150" y="120" />
+        <di:waypoint x="1262" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="384" y="249" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="SequenceFlow_1l9ry0a_di" bpmnElement="SequenceFlow_1l9ry0a">
-        <di:waypoint x="710" y="319" />
-        <di:waypoint x="768" y="319" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-21" y="448" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_09nihof_di" bpmnElement="SequenceFlow_09nihof">
-        <di:waypoint x="820" y="120" />
-        <di:waypoint x="920" y="120" />
+        <di:waypoint x="950" y="120" />
+        <di:waypoint x="1050" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="-460" y="189" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1654pt0_di" bpmnElement="SequenceFlow_1654pt0">
-        <di:waypoint x="610" y="120" />
-        <di:waypoint x="720" y="120" />
+        <di:waypoint x="740" y="120" />
+        <di:waypoint x="850" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="-910" y="189" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_139ejmn_di" bpmnElement="SequenceFlow_139ejmn">
-        <di:waypoint x="430" y="120" />
-        <di:waypoint x="510" y="120" />
+        <di:waypoint x="560" y="120" />
+        <di:waypoint x="640" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="-381" y="245" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0wwo1lh_di" bpmnElement="SequenceFlow_0wwo1lh">
-        <di:waypoint x="242" y="120" />
-        <di:waypoint x="330" y="120" />
+        <di:waypoint x="372" y="120" />
+        <di:waypoint x="460" y="120" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="-489.5" y="249" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="StartEvent_0lgslwq_di" bpmnElement="StartEvent_0lgslwq">
-        <dc:Bounds x="206" y="102" width="36" height="36" />
+        <dc:Bounds x="336" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="211" y="142" width="25" height="14" />
+          <dc:Bounds x="341" y="142" width="25" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1x13jc1_di" bpmnElement="ScriptTask_1x13jc1">
-        <dc:Bounds x="330" y="80" width="100" height="80" />
+        <dc:Bounds x="460" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0usuysi_di" bpmnElement="ScriptTask_0usuysi">
-        <dc:Bounds x="720" y="80" width="100" height="80" />
+        <dc:Bounds x="850" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1t06mlw_di" bpmnElement="ScriptTask_1t06mlw">
-        <dc:Bounds x="920" y="80" width="100" height="80" />
+        <dc:Bounds x="1050" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0lxbaxd_di" bpmnElement="ScriptTask_0lxbaxd">
-        <dc:Bounds x="999" y="218" width="100" height="80" />
+        <dc:Bounds x="1090" y="279" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1rjha8r_di" bpmnElement="ScriptTask_1rjha8r">
-        <dc:Bounds x="510" y="80" width="100" height="80" />
+        <dc:Bounds x="640" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1tfpgcs_di" bpmnElement="ScriptTask_1tfpgcs">
-        <dc:Bounds x="230" y="279" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ScriptTask_1frasll_di" bpmnElement="ScriptTask_1frasll">
-        <dc:Bounds x="470" y="279" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="CallActivity_11hntoj_di" bpmnElement="CallActivity_11hntoj">
-        <dc:Bounds x="610" y="279" width="100" height="80" />
+        <dc:Bounds x="280" y="279" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1sfn88d_di" bpmnElement="ScriptTask_1sfn88d">
-        <dc:Bounds x="768" y="279" width="100" height="80" />
+        <dc:Bounds x="920" y="279" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateThrowEvent_1808y0j_di" bpmnElement="IntermediateThrowEvent_0gueutz">
-        <dc:Bounds x="1132" y="102" width="36" height="36" />
+        <dc:Bounds x="1262" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1106" y="142" width="90" height="14" />
+          <dc:Bounds x="1236" y="142" width="90" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_11m7660_di" bpmnElement="IntermediateThrowEvent_150o0dl">
-        <dc:Bounds x="142" y="301" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="115" y="341" width="90" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="ExclusiveGateway_02nqn2k_di" bpmnElement="ExclusiveGateway_02nqn2k" isMarkerVisible="true">
-        <dc:Bounds x="926" y="294" width="50" height="50" />
+        <dc:Bounds x="182" y="301" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="922" y="354" width="59" height="14" />
+          <dc:Bounds x="155" y="341" width="90" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1061mty_di" bpmnElement="EndEvent_1061mty">
-        <dc:Bounds x="1263" y="301" width="36" height="36" />
+        <dc:Bounds x="1393" y="301" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1271" y="344" width="20" height="14" />
+          <dc:Bounds x="1401" y="344" width="20" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_03lo8jx_di" bpmnElement="Gateway_03lo8jx" isMarkerVisible="true">
-        <dc:Bounds x="375" y="294" width="50" height="50" />
+        <dc:Bounds x="435" y="294" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="360" y="264" width="80" height="27" />
+          <dc:Bounds x="420" y="256.5" width="80" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_02x7eqy_di" bpmnElement="ServiceTask_02x7eqy">
-        <dc:Bounds x="1123" y="279" width="100" height="80" />
+        <dc:Bounds x="1253" y="279" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1tmdw60_di" bpmnElement="Activity_1tmdw60" isExpanded="true">
-        <dc:Bounds x="400" y="560" width="781" height="196" />
+        <dc:Bounds x="530" y="560" width="781" height="196" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1qooaff_di" bpmnElement="Flow_1qooaff">
-        <di:waypoint x="960" y="664" />
-        <di:waypoint x="1068" y="664" />
+        <di:waypoint x="1090" y="664" />
+        <di:waypoint x="1198" y="664" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_149oqyp_di" bpmnElement="Flow_149oqyp">
-        <di:waypoint x="466" y="664" />
-        <di:waypoint x="530" y="664" />
+        <di:waypoint x="596" y="664" />
+        <di:waypoint x="660" y="664" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1dh5sht_di" bpmnElement="Flow_1dh5sht">
-        <di:waypoint x="630" y="664" />
-        <di:waypoint x="690" y="664" />
+        <di:waypoint x="760" y="664" />
+        <di:waypoint x="820" y="664" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1iqw69c_di" bpmnElement="Flow_1iqw69c">
-        <di:waypoint x="790" y="664" />
-        <di:waypoint x="860" y="664" />
+        <di:waypoint x="920" y="664" />
+        <di:waypoint x="990" y="664" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Event_159txw2_di" bpmnElement="Event_159txw2">
-        <dc:Bounds x="430" y="646" width="36" height="36" />
+        <dc:Bounds x="560" y="646" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0c1ec2y_di" bpmnElement="Event_0c1ec2y">
-        <dc:Bounds x="1068" y="646" width="36" height="36" />
+        <dc:Bounds x="1198" y="646" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0u3yna7_di" bpmnElement="Activity_0u3yna7">
-        <dc:Bounds x="860" y="624" width="100" height="80" />
+        <dc:Bounds x="990" y="624" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0u4a0ry_di" bpmnElement="Activity_0u4a0ry">
-        <dc:Bounds x="530" y="624" width="100" height="80" />
+        <dc:Bounds x="660" y="624" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_11422x1_di" bpmnElement="Activity_11422x1">
-        <dc:Bounds x="690" y="624" width="100" height="80" />
+        <dc:Bounds x="820" y="624" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_14jev2r_di" bpmnElement="Activity_14jev2r">
+        <dc:Bounds x="590" y="279" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_0fdseyg_di" bpmnElement="Gateway_0fdseyg" isMarkerVisible="true">
+        <dc:Bounds x="795" y="294" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0fbp09r_di" bpmnElement="Activity_0fbp09r">
+        <dc:Bounds x="770" y="378" width="100" height="80" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn:definitions>
+</bpmn:definitions>
\ No newline at end of file