From 0e2cda138f35ee6a7a8a54c29a6c4edf07d51745 Mon Sep 17 00:00:00 2001
From: "Plummer, Brittany" <brittany.plummer@att.com>
Date: Fri, 5 Jul 2019 10:23:16 -0400
Subject: update bpmn to save extsystemerrorsource

Added ext error source to workflow exception
Updated all lines that create this exception with source
Added unit tests and updated existing ones

Change-Id: Id9b3b1e6e24368224214a6370ea2d450ae667bfb
Issue-ID: SO-2092
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 .../BuildingBlock/ExecuteBuildingBlock.bpmn        | 134 ++++++++++++---------
 .../subprocess/BuildingBlock/HomingBB.bpmn         |   1 +
 .../subprocess/BuildingBlock/WorkflowActionBB.bpmn |   1 +
 3 files changed, 77 insertions(+), 59 deletions(-)

(limited to 'bpmn/so-bpmn-building-blocks')

diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ExecuteBuildingBlock.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ExecuteBuildingBlock.bpmn
index 0a6a7731ce..e64c44eb94 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ExecuteBuildingBlock.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/ExecuteBuildingBlock.bpmn
@@ -11,6 +11,7 @@
         <camunda:in source="mso-request-id" target="mso-request-id" />
         <camunda:out source="WorkflowExceptionErrorMessage" target="WorkflowExceptionErrorMessage" />
         <camunda:out source="StatusMessage" target="StatusMessage" />
+        <camunda:in source="isRollback" target="isRollback" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_19wuics</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_01h9qmz</bpmn:outgoing>
@@ -37,13 +38,8 @@
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="SequenceFlow_0je0y25" sourceRef="StatusPolicy" targetRef="CheckOrchestrationStatusValidationResults" />
     <bpmn:subProcess id="SubProcess_0tv8zda" name="Error Handling&#10;&#10;" triggeredByEvent="true">
-      <bpmn:startEvent id="StartEvent_0tmcs9g">
-        <bpmn:outgoing>SequenceFlow_09synl9</bpmn:outgoing>
-        <bpmn:errorEventDefinition camunda:errorCodeVariable="WorkflowExceptionCode" camunda:errorMessageVariable="WorkflowExceptionMessage" />
-      </bpmn:startEvent>
-      <bpmn:sequenceFlow id="SequenceFlow_09synl9" sourceRef="StartEvent_0tmcs9g" targetRef="Task_QueryRainyDayTable" />
       <bpmn:serviceTask id="Task_QueryRainyDayTable" name="QueryRainyDayTable" camunda:expression="${ExecuteBuildingBlockRainyDay.queryRainyDayTable(execution,true)}">
-        <bpmn:incoming>SequenceFlow_09synl9</bpmn:incoming>
+        <bpmn:incoming>SequenceFlow_0vdeqxv</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_0a62t4c</bpmn:outgoing>
       </bpmn:serviceTask>
       <bpmn:exclusiveGateway id="ExclusiveGateway_1aonzik" name="Check HandlingCode" default="SequenceFlow_0h8v45y">
@@ -93,6 +89,16 @@
         <bpmn:incoming>SequenceFlow_0541bid</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_12ps9at</bpmn:outgoing>
       </bpmn:serviceTask>
+      <bpmn:sequenceFlow id="SequenceFlow_0vdeqxv" sourceRef="Task_UpdateExtErrorSource" targetRef="Task_QueryRainyDayTable" />
+      <bpmn:sequenceFlow id="SequenceFlow_09synl9" sourceRef="StartEvent_0tmcs9g" targetRef="Task_UpdateExtErrorSource" />
+      <bpmn:startEvent id="StartEvent_0tmcs9g">
+        <bpmn:outgoing>SequenceFlow_09synl9</bpmn:outgoing>
+        <bpmn:errorEventDefinition camunda:errorCodeVariable="WorkflowExceptionCode" camunda:errorMessageVariable="WorkflowExceptionMessage" />
+      </bpmn:startEvent>
+      <bpmn:serviceTask id="Task_UpdateExtErrorSource" name="Update ExtErrorSource" camunda:expression="${ExecuteBuildingBlockRainyDay.updateExtSystemErrorSource(execution)}">
+        <bpmn:incoming>SequenceFlow_09synl9</bpmn:incoming>
+        <bpmn:outgoing>SequenceFlow_0vdeqxv</bpmn:outgoing>
+      </bpmn:serviceTask>
     </bpmn:subProcess>
     <bpmn:sequenceFlow id="SequenceFlow_16lmcxp" sourceRef="Task_setHandlingCodeSuccess" targetRef="End_ExecuteBuildingBlock" />
     <bpmn:sequenceFlow id="SequenceFlow_1j0vskt" name="Silent Success" sourceRef="CheckOrchestrationStatusValidationResults" targetRef="Task_setHandlingCodeSuccess">
@@ -163,63 +169,63 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_0ey4zpt_di" bpmnElement="ExclusiveGateway_0ey4zpt" isMarkerVisible="true">
-        <dc:Bounds x="721" y="385" width="50" height="50" />
+        <dc:Bounds x="692" y="389" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="716" y="360" width="63" height="13" />
+          <dc:Bounds x="686" y="364" width="65" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="IntermediateCatchEvent_0qjyidb_di" bpmnElement="IntermediateCatchEvent_RetryTimer">
-        <dc:Bounds x="965" y="392" width="36" height="36" />
+        <dc:Bounds x="936" y="396" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="956" y="367" width="55" height="13" />
+          <dc:Bounds x="927" y="371" width="56" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_1aonzik_di" bpmnElement="ExclusiveGateway_1aonzik" isMarkerVisible="true">
-        <dc:Bounds x="568" y="385" width="50" height="50" />
+        <dc:Bounds x="539" y="389" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="558" y="347" width="70" height="25" />
+          <dc:Bounds x="528" y="351" width="72" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1wbevp0_di" bpmnElement="SequenceFlow_1wbevp0">
-        <di:waypoint xsi:type="dc:Point" x="771" y="410" />
-        <di:waypoint xsi:type="dc:Point" x="836" y="410" />
+        <di:waypoint xsi:type="dc:Point" x="742" y="414" />
+        <di:waypoint xsi:type="dc:Point" x="807" y="414" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="788" y="385" width="18" height="13" />
+          <dc:Bounds x="759" y="389" width="19" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0fwsjva_di" bpmnElement="SequenceFlow_0fwsjva">
-        <di:waypoint xsi:type="dc:Point" x="618" y="410" />
-        <di:waypoint xsi:type="dc:Point" x="721" y="410" />
+        <di:waypoint xsi:type="dc:Point" x="589" y="414" />
+        <di:waypoint xsi:type="dc:Point" x="692" y="414" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="656" y="418" width="27" height="13" />
+          <dc:Bounds x="627" y="422" width="28" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0h8v45y_di" bpmnElement="SequenceFlow_0h8v45y">
-        <di:waypoint xsi:type="dc:Point" x="593" y="435" />
-        <di:waypoint xsi:type="dc:Point" x="593" y="491" />
+        <di:waypoint xsi:type="dc:Point" x="564" y="439" />
+        <di:waypoint xsi:type="dc:Point" x="564" y="495" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="600" y="456" width="85" height="13" />
+          <dc:Bounds x="570" y="460" width="88" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_1tifgqh_di" bpmnElement="Task_QueryRainyDayTable">
-        <dc:Bounds x="425" y="370" width="100" height="80" />
+        <dc:Bounds x="396" y="374" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0ndt8ft_di" bpmnElement="SequenceFlow_0ndt8ft">
-        <di:waypoint xsi:type="dc:Point" x="936" y="410" />
-        <di:waypoint xsi:type="dc:Point" x="965" y="410" />
+        <di:waypoint xsi:type="dc:Point" x="907" y="414" />
+        <di:waypoint xsi:type="dc:Point" x="936" y="414" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="906" y="389" width="90" height="12" />
+          <dc:Bounds x="877" y="393" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_07a1ytc_di" bpmnElement="SequenceFlow_07a1ytc">
-        <di:waypoint xsi:type="dc:Point" x="1001" y="410" />
-        <di:waypoint xsi:type="dc:Point" x="1039" y="410" />
+        <di:waypoint xsi:type="dc:Point" x="972" y="414" />
+        <di:waypoint xsi:type="dc:Point" x="1010" y="414" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="975" y="389" width="90" height="12" />
+          <dc:Bounds x="946" y="393" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ServiceTask_1obvxht_di" bpmnElement="Task_SetRetryTimer">
-        <dc:Bounds x="836" y="370" width="100" height="80" />
+        <dc:Bounds x="807" y="374" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0kdjsnx_di" bpmnElement="Continue">
         <di:waypoint xsi:type="dc:Point" x="508" y="180" />
@@ -245,38 +251,25 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0a62t4c_di" bpmnElement="SequenceFlow_0a62t4c">
-        <di:waypoint xsi:type="dc:Point" x="525" y="410" />
-        <di:waypoint xsi:type="dc:Point" x="568" y="410" />
+        <di:waypoint xsi:type="dc:Point" x="496" y="414" />
+        <di:waypoint xsi:type="dc:Point" x="539" y="414" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="502" y="389" width="90" height="13" />
+          <dc:Bounds x="473" y="393" width="90" height="13" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="SubProcess_0tv8zda_di" bpmnElement="SubProcess_0tv8zda" isExpanded="true">
-        <dc:Bounds x="320" y="294" width="802" height="290" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="StartEvent_0tmcs9g_di" bpmnElement="StartEvent_0tmcs9g">
-        <dc:Bounds x="340" y="392" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="223" y="428" width="90" height="12" />
-        </bpmndi:BPMNLabel>
+        <dc:Bounds x="171" y="298" width="922" height="295" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_09synl9_di" bpmnElement="SequenceFlow_09synl9">
-        <di:waypoint xsi:type="dc:Point" x="376" y="410" />
-        <di:waypoint xsi:type="dc:Point" x="425" y="410" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="356" y="389" width="90" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_0mvmk3i_di" bpmnElement="EndEvent_0mvmk3i">
-        <dc:Bounds x="575" y="491" width="36" height="36" />
+        <dc:Bounds x="546" y="495" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="548" y="531" width="90" height="12" />
+          <dc:Bounds x="519" y="535" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1aww7yx_di" bpmnElement="EndEvent_1sez2lh">
-        <dc:Bounds x="1039" y="392" width="36" height="36" />
+        <dc:Bounds x="1010" y="396" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1049" y="432" width="19" height="13" />
+          <dc:Bounds x="1020" y="436" width="20" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_16lmcxp_di" bpmnElement="SequenceFlow_16lmcxp">
@@ -319,27 +312,50 @@
         <dc:Bounds x="906" y="140" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0541bid_di" bpmnElement="SequenceFlow_0541bid">
-        <di:waypoint xsi:type="dc:Point" x="746" y="435" />
-        <di:waypoint xsi:type="dc:Point" x="746" y="459" />
+        <di:waypoint xsi:type="dc:Point" x="717" y="439" />
+        <di:waypoint xsi:type="dc:Point" x="717" y="463" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="757" y="436" width="13" height="13" />
+          <dc:Bounds x="728" y="440" width="13" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_12ps9at_di" bpmnElement="SequenceFlow_12ps9at">
-        <di:waypoint xsi:type="dc:Point" x="796" y="499" />
-        <di:waypoint xsi:type="dc:Point" x="868" y="499" />
+        <di:waypoint xsi:type="dc:Point" x="767" y="503" />
+        <di:waypoint xsi:type="dc:Point" x="839" y="503" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="787" y="478" width="90" height="12" />
+          <dc:Bounds x="758" y="482" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_05vw85n_di" bpmnElement="EndEvent_0ex9298">
-        <dc:Bounds x="868" y="481" width="36" height="36" />
+        <dc:Bounds x="839" y="485" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="877" y="521" width="19" height="13" />
+          <dc:Bounds x="848" y="525" width="20" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_11f2c91_di" bpmnElement="Task_QuerySecondaryPolicy">
-        <dc:Bounds x="696" y="459" width="100" height="80" />
+        <dc:Bounds x="667" y="463" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_0vdeqxv_di" bpmnElement="SequenceFlow_0vdeqxv">
+        <di:waypoint xsi:type="dc:Point" x="361" y="414" />
+        <di:waypoint xsi:type="dc:Point" x="396" y="414" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="378.5" y="393" width="0" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="StartEvent_0tmcs9g_di" bpmnElement="StartEvent_0tmcs9g">
+        <dc:Bounds x="196" y="396" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="79" y="432" width="90" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_09synl9_di" bpmnElement="SequenceFlow_09synl9">
+        <di:waypoint xsi:type="dc:Point" x="232" y="414" />
+        <di:waypoint xsi:type="dc:Point" x="261" y="414" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="201.5" y="393" width="90" height="12" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ServiceTask_10v49qn_di" bpmnElement="Task_UpdateExtErrorSource">
+        <dc:Bounds x="261" y="374" width="100" height="80" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/HomingBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/HomingBB.bpmn
index b66ecfa329..11227ede4d 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/HomingBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/HomingBB.bpmn
@@ -50,6 +50,7 @@ ex.processJavaException(execution)]]></bpmn2:script>
         <camunda:in source="asyncCorrelator" target="RCVWFMSG_correlator" />
         <camunda:in source="asyncTimeout" target="RCVWFMSG_timeout" />
         <camunda:out source="WorkflowResponse" target="asyncResponse" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_0qrwjzu</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_03cy5y5</bpmn2:outgoing>
diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/WorkflowActionBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/WorkflowActionBB.bpmn
index 35b77d9189..47b9efeb6d 100644
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/WorkflowActionBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/WorkflowActionBB.bpmn
@@ -23,6 +23,7 @@
         <camunda:out source="RetryDuration" target="RetryDuration" />
         <camunda:in source="suppressRollback" target="suppressRollback" />
         <camunda:out source="StatusMessage" target="StatusMessage" />
+        <camunda:in source="isRollback" target="isRollback" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0mew9im</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1hsqed1</bpmn:outgoing>
-- 
cgit 1.2.3-korg