From 5ffd8c1fb77fb8e33244a6eabcc267aacfe705ee Mon Sep 17 00:00:00 2001
From: demo <demo@example.com>
Date: Wed, 23 Nov 2022 20:06:47 +0000
Subject: [PATCH] User: alex clicked save for
 misc/waku-messages/message/waku-message-body.dmn

---
 .../cc-invoice-approval}/approval-check.dmn   |   2 +-
 .../cc-invoice-approval-process-v2.bpmn       |  20 +-
 .../cc-invoice-approval/process_model.json    |   6 +-
 .../submit_invoice_validation.dmn             | 177 ------------------
 .../message/waku-message-body.dmn             |  26 +--
 5 files changed, 27 insertions(+), 204 deletions(-)
 rename manage-procurement/procurement/{vendor-invoice-management/invoice-approval => core-contributor-invoice-management/cc-invoice-approval}/approval-check.dmn (92%)
 rename manage-procurement/procurement/{vendor-invoice-management/invoice-approval => core-contributor-invoice-management/cc-invoice-approval}/cc-invoice-approval-process-v2.bpmn (99%)
 delete mode 100644 manage-procurement/procurement/vendor-invoice-management/invoice-approval/submit_invoice_validation.dmn

diff --git a/manage-procurement/procurement/vendor-invoice-management/invoice-approval/approval-check.dmn b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/approval-check.dmn
similarity index 92%
rename from manage-procurement/procurement/vendor-invoice-management/invoice-approval/approval-check.dmn
rename to manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/approval-check.dmn
index 2cd154d7..65e91029 100644
--- a/manage-procurement/procurement/vendor-invoice-management/invoice-approval/approval-check.dmn
+++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/approval-check.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" id="Definitions_76910d7x" name="DRD" namespace="http://camunda.org/schema/1.0/dmn">
+<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" id="Definitions_76910d7" name="DRD" namespace="http://camunda.org/schema/1.0/dmn">
   <decision id="Invoice_Approval_Check" name="Invoice Approval Check">
     <decisionTable id="decisionTable_1">
       <input id="input_1" label="Annual Salary/12 = Invoice Amount?" biodi:width="315">
diff --git a/manage-procurement/procurement/vendor-invoice-management/invoice-approval/cc-invoice-approval-process-v2.bpmn b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/cc-invoice-approval-process-v2.bpmn
similarity index 99%
rename from manage-procurement/procurement/vendor-invoice-management/invoice-approval/cc-invoice-approval-process-v2.bpmn
rename to manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/cc-invoice-approval-process-v2.bpmn
index 3eac4e33..8e99d5de 100644
--- a/manage-procurement/procurement/vendor-invoice-management/invoice-approval/cc-invoice-approval-process-v2.bpmn
+++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/cc-invoice-approval-process-v2.bpmn
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:spiffworkflow="http://spiffworkflow.org/bpmn/schema/1.0/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" camunda:diagramRelationId="f01e22f1-a50b-42ba-afad-22f56fc3e635">
-  <bpmn:collaboration id="Collaboration_130jph2x">
-    <bpmn:participant id="Participant_1fsb6gv" name="Core Contributor" processRef="Process_cc_invoice_approval_process_v2_bx" />
-    <bpmn:participant id="Participant_11ab2hx" name="Process management platform" processRef="Process_cc_invoice_approval_process_v2_ax" />
+  <bpmn:collaboration id="Collaboration_130jph2">
+    <bpmn:participant id="Participant_1fsb6gv" name="Core Contributor" processRef="Process_cc_invoice_approval_process_v2_b" />
+    <bpmn:participant id="Participant_11ab2hx" name="Process management platform" processRef="Process_cc_invoice_approval_process_v2_a" />
     <bpmn:participant id="Participant_0a8arrz" name="AWS DynamoDB" />
     <bpmn:participant id="Participant_1qabwrg" name="AWS S3" />
     <bpmn:participant id="Participant_0b27sri" name="Xero" />
@@ -21,8 +21,8 @@
       <bpmn:correlationPropertyRef>CorrelationProperty_Submit_Invoice</bpmn:correlationPropertyRef>
     </bpmn:correlationKey>
   </bpmn:collaboration>
-  <bpmn:process id="Process_cc_invoice_approval_process_v2_bx" isExecutable="false" />
-  <bpmn:process id="Process_cc_invoice_approval_process_v2_ax" isExecutable="true">
+  <bpmn:process id="Process_cc_invoice_approval_process_v2_b" isExecutable="false" />
+  <bpmn:process id="Process_cc_invoice_approval_process_v2_a" isExecutable="true">
     <bpmn:laneSet id="LaneSet_0txkzqg">
       <bpmn:lane id="Lane_1a0qu8e" name="Process Initiator">
         <bpmn:flowNodeRef>Submit_the_invoice</bpmn:flowNodeRef>
@@ -1090,7 +1090,7 @@ ___
     </bpmn:extensionElements>
   </bpmn:message>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_130jph2x">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_130jph2">
       <bpmndi:BPMNShape id="Participant_1fsb6gv_di" bpmnElement="Participant_1fsb6gv" isHorizontal="true">
         <dc:Bounds x="280" y="-70" width="4950" height="220" />
       </bpmndi:BPMNShape>
@@ -1615,10 +1615,6 @@ ___
         <di:waypoint x="4985" y="650" />
         <di:waypoint x="4944" y="715" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="DataOutputAssociation_033uumo_di" bpmnElement="DataOutputAssociation_033uumo">
-        <di:waypoint x="4712" y="649" />
-        <di:waypoint x="4772" y="706" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Association_1eygti7_di" bpmnElement="Association_1eygti7">
         <di:waypoint x="1086" y="-70" />
         <di:waypoint x="1153" y="-140" />
@@ -1651,6 +1647,10 @@ ___
         <di:waypoint x="3329" y="1290" />
         <di:waypoint x="3329" y="570" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="DataOutputAssociation_033uumo_di" bpmnElement="DataOutputAssociation_033uumo">
+        <di:waypoint x="4712" y="649" />
+        <di:waypoint x="4772" y="706" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
   <bpmndi:BPMNDiagram>
diff --git a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/process_model.json b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/process_model.json
index 14301115..f0857ab0 100644
--- a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/process_model.json
+++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/process_model.json
@@ -5,7 +5,7 @@
     "exception_notification_addresses": [],
     "fault_or_suspend_on_exception": "fault",
     "files": [],
-    "is_review": false,
-    "primary_file_name": null,
-    "primary_process_id": null
+    "is_review": true,
+    "primary_file_name": "cc-invoice-approval-process-v2.bpmn",
+    "primary_process_id": "Process_cc_invoice_approval_process_v2_a"
 }
\ No newline at end of file
diff --git a/manage-procurement/procurement/vendor-invoice-management/invoice-approval/submit_invoice_validation.dmn b/manage-procurement/procurement/vendor-invoice-management/invoice-approval/submit_invoice_validation.dmn
deleted file mode 100644
index c9473825..00000000
--- a/manage-procurement/procurement/vendor-invoice-management/invoice-approval/submit_invoice_validation.dmn
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" id="Definitions_76910d7x" name="DRD" namespace="http://camunda.org/schema/1.0/dmn">
-  <decision id="Submit_Involce_Validation" name="Submit Involce Validation">
-    <decisionTable id="decisionTable_1">
-      <input id="input_1" label="Number in Name?">
-        <inputExpression id="inputExpression_1" typeRef="boolean">
-          <text>svc_is_num_in_name</text>
-        </inputExpression>
-      </input>
-      <input id="InputClause_0yu8sal" label="Invoice Amount Decimal Places?" biodi:width="290">
-        <inputExpression id="LiteralExpression_00vxuvt" typeRef="number">
-          <text>svc_decimal_cnt</text>
-        </inputExpression>
-      </input>
-      <input id="InputClause_0d8pwgu" label="Due Date After?">
-        <inputExpression id="LiteralExpression_0ji7ayg" typeRef="boolean">
-          <text>svc_is_due_date_after</text>
-        </inputExpression>
-      </input>
-      <output id="output_1" label="Validation Outcome" name="svc_is_invoice_submit_pass" typeRef="boolean" />
-      <output id="OutputClause_1kwdp3o" label="Validation Message" name="submitInvoiceValidationMessage" typeRef="string" biodi:width="496" />
-      <rule id="DecisionRule_1lo9qbk">
-        <inputEntry id="UnaryTests_1nhzb74">
-          <text>False</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_1k6u17q">
-          <text>&lt;=2</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_1g1c3pq">
-          <text>True</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0nllohu">
-          <text>True</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_1deujhc">
-          <text>"No numbers in name, involce amount decimal places not greated than two, invoice due date after today's date"</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0fspdx3">
-        <inputEntry id="UnaryTests_1t84tf5">
-          <text>True</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_12mqm10">
-          <text>&lt;=2</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_02k712g">
-          <text>True</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1lb6oh8">
-          <text>False</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_0574dis">
-          <text>"""**Validation Error:**  
- - Numbers are not allowed in the Contributor's Name   """</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_143lm93">
-        <inputEntry id="UnaryTests_03cd5lg">
-          <text>False</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_02u9iam">
-          <text>&gt;2</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_061ri1c">
-          <text>True</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1mbfz4b">
-          <text>False</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_0fn0pln">
-          <text>"""**Validation error:**  
- - The involce amount must not have more than two decimal places   """</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0u8ubah">
-        <inputEntry id="UnaryTests_1foeufx">
-          <text>True</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_0f6hqwy">
-          <text>&gt;2</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_12dplyn">
-          <text>True</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_085lex0">
-          <text>False</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_0db07fz">
-          <text>"""**Validation errors:**  
- - Numbers are not allowed in the Contributor's Name   
- - The involce amount must not have more than two decimal places  """</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_1jc37dk">
-        <inputEntry id="UnaryTests_1pgm4hk">
-          <text>False</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_13kykmb">
-          <text>&lt;=2</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_1bsp4mb">
-          <text>False</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1rwhn23">
-          <text>False</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_087snw9">
-          <text>"""**Validation error:**  
- - The invoice due date must be after today's date.  """</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0nec3r1">
-        <inputEntry id="UnaryTests_0qc9563">
-          <text>True</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_0nfh2th">
-          <text>&gt;2</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_1owttdo">
-          <text>False</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_12bkrav">
-          <text>False</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_0ibz84h">
-          <text>"""**Validation errors:**  
- - Numbers are not allowed in the Contributor's Name   
- - The involce amount must not have more than two decimal places   
- - The invoice due date must be after today's date.  """</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_1gt9lgg">
-        <inputEntry id="UnaryTests_14v9g6u">
-          <text>False</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_0awikna">
-          <text>&gt;2</text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_1xb650e">
-          <text>False</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1ua958p">
-          <text>False</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_19wowp7">
-          <text>"""**Validation errors:**  
- - The involce amount must not have more than two decimal places   
- - The invoice due date must be after today's date.  """</text>
-        </outputEntry>
-      </rule>
-      <rule id="DecisionRule_0vgovf5">
-        <inputEntry id="UnaryTests_0qil3im">
-          <text></text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_1o5b92b">
-          <text></text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_1cdqgc5">
-          <text></text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_0s3k5pm">
-          <text>False</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_1565cvg">
-          <text>"Something is wrong with the Invoice validation process.  Please notify support"</text>
-        </outputEntry>
-      </rule>
-    </decisionTable>
-  </decision>
-  <dmndi:DMNDI>
-    <dmndi:DMNDiagram id="DMNDiagram_1cykosu">
-      <dmndi:DMNShape id="DMNShape_1dhfq2s" dmnElementRef="Submit_Involce_Validation">
-        <dc:Bounds height="80" width="180" x="157" y="151" />
-      </dmndi:DMNShape>
-    </dmndi:DMNDiagram>
-  </dmndi:DMNDI>
-</definitions>
diff --git a/misc/waku-messages/message/waku-message-body.dmn b/misc/waku-messages/message/waku-message-body.dmn
index 6339c1c4..521906e4 100644
--- a/misc/waku-messages/message/waku-message-body.dmn
+++ b/misc/waku-messages/message/waku-message-body.dmn
@@ -25,7 +25,7 @@
       <output id="output_1" label="Message Body" name="waku_message_body" typeRef="string" biodi:width="532" />
       <rule id="DecisionRule_05kyeu8">
         <inputEntry id="UnaryTests_1bdf6i0">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1w8fhi9">
           <text>"waku_invoice_submitted"</text>
@@ -42,7 +42,7 @@
       </rule>
       <rule id="DecisionRule_1tbh4zu">
         <inputEntry id="UnaryTests_1wwhury">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_09sdx7c">
           <text>"waku_payment_pending_ismatch"</text>
@@ -59,7 +59,7 @@
       </rule>
       <rule id="DecisionRule_1f99vwz">
         <inputEntry id="UnaryTests_0g0vr80">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1m5ktce">
           <text>"waku_payment_pending_not_ismatch"</text>
@@ -76,7 +76,7 @@
       </rule>
       <rule id="DecisionRule_1o253qj">
         <inputEntry id="UnaryTests_14apazl">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1w1fy1f">
           <text>"waku_invoice_rejected_ismatch"</text>
@@ -93,7 +93,7 @@
       </rule>
       <rule id="DecisionRule_12npkto">
         <inputEntry id="UnaryTests_00k1ecu">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_01elx40">
           <text>"waku_invoice_rejected_ismatch"</text>
@@ -110,7 +110,7 @@
       </rule>
       <rule id="DecisionRule_1fsmo6y">
         <inputEntry id="UnaryTests_0gfys7d">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0br4fie">
           <text>"waku_invoice_rejected_not_ismatch_not_pl_approve"</text>
@@ -127,7 +127,7 @@
       </rule>
       <rule id="DecisionRule_1955f0y">
         <inputEntry id="UnaryTests_0jzkuld">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1ll25at">
           <text>"waku_invoice_rejected_not_ismatch_not_pl_approve"</text>
@@ -144,7 +144,7 @@
       </rule>
       <rule id="DecisionRule_1jbtx5i">
         <inputEntry id="UnaryTests_0hlthm5">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1hnyfo7">
           <text>"waku_invoice_rejected_not_ismatch_pl_approve"</text>
@@ -161,7 +161,7 @@
       </rule>
       <rule id="DecisionRule_0lz9jzm">
         <inputEntry id="UnaryTests_0gglkj3">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1euab6x">
           <text>"waku_invoice_rejected_not_ismatch_pl_approve"</text>
@@ -178,7 +178,7 @@
       </rule>
       <rule id="DecisionRule_0jirsd8">
         <inputEntry id="UnaryTests_0i90dzr">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0f4sig0">
           <text>"waku_notify_finance"</text>
@@ -195,7 +195,7 @@
       </rule>
       <rule id="DecisionRule_1jw4h85">
         <inputEntry id="UnaryTests_0ecdfsh">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1ddqyad">
           <text>"waku_notify_project_lead"</text>
@@ -212,7 +212,7 @@
       </rule>
       <rule id="DecisionRule_1sqor96">
         <inputEntry id="UnaryTests_0j5tr8f">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0kn31ob">
           <text>"waku_no_team_lead_response"</text>
@@ -229,7 +229,7 @@
       </rule>
       <rule id="DecisionRule_0zxv93p">
         <inputEntry id="UnaryTests_0v20opd">
-          <text>"manage-procurement/procurement/vendor-invoice-management/invoice-approval"</text>
+          <text>"manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0j8l83a">
           <text></text>