From 42351f85010993d76877da147b16203cdb656333 Mon Sep 17 00:00:00 2001
From: burnettk <burnettk@users.noreply.github.com>
Date: Mon, 29 Aug 2022 10:08:10 -0400
Subject: [PATCH] update DMN

---
 category_number_one/workflow_one/sample.bpmn  |  4 +--
 .../import-tickets/import-tickets.bpmn        | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/category_number_one/workflow_one/sample.bpmn b/category_number_one/workflow_one/sample.bpmn
index d462a12c..c28eeb1c 100644
--- a/category_number_one/workflow_one/sample.bpmn
+++ b/category_number_one/workflow_one/sample.bpmn
@@ -17,9 +17,9 @@ Mike = "Awesome"
 person = "Kevin"</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="Flow_1hd6o66" sourceRef="Activity_0a21ntf" targetRef="Event_1qb1u6a" />
-    <bpmn:businessRuleTask id="Activity_0a21ntf" name="is wonderful?" camunda:decisionRef="wonderful">
+    <bpmn:businessRuleTask id="Activity_0a21ntf" name="is wonderful?">
       <bpmn:extensionElements>
-        <spiffworkflow:calledDecision decisionId="wonderful" />
+        <spiffworkflow:calledDecisionId>wonderful</spiffworkflow:calledDecisionId>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_0htxke7</bpmn:incoming>
       <bpmn:outgoing>Flow_1hd6o66</bpmn:outgoing>
diff --git a/sartography-admin/import-tickets/import-tickets.bpmn b/sartography-admin/import-tickets/import-tickets.bpmn
index f6d644de..44ae5ce1 100644
--- a/sartography-admin/import-tickets/import-tickets.bpmn
+++ b/sartography-admin/import-tickets/import-tickets.bpmn
@@ -29,6 +29,7 @@ def main():
     from spiffworkflow_backend.services.process_instance_service import (
         ProcessInstanceService,
     )
+    from spiffworkflow_backend.models.process_instance_report import ProcessInstanceReportModel
 
     process_model_identifier_ticket = "ticket"
     db.session.query(ProcessInstanceModel).filter(
@@ -56,7 +57,7 @@ def main():
     }
     columns_to_header_index_mappings = {}
 
-    user = UserModel.query.filter_by(username="test_user1").first()
+    user = UserModel.query.first()
 
     with open("tests/files/tickets.csv") as infile:
         reader = csv.reader(infile, delimiter=",")
@@ -111,6 +112,9 @@ def main():
                 process_instance_data = processor.get_data()
                 print(f"process_instance_data: {process_instance_data}")
 
+    ProcessInstanceReportModel.add_fixtures()
+    print("added report fixtures")
+
 
 main()
 
@@ -121,18 +125,6 @@ del main
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_bd2e724">
-      <bpmndi:BPMNEdge id="Flow_04qc4ur_di" bpmnElement="Flow_04qc4ur">
-        <di:waypoint x="390" y="165" />
-        <di:waypoint x="426" y="165" />
-        <di:waypoint x="426" y="177" />
-        <di:waypoint x="462" y="177" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0pvp5mz_di" bpmnElement="Flow_0pvp5mz">
-        <di:waypoint x="215" y="177" />
-        <di:waypoint x="253" y="177" />
-        <di:waypoint x="253" y="165" />
-        <di:waypoint x="290" y="165" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="179" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -142,6 +134,18 @@ del main
       <bpmndi:BPMNShape id="Activity_0lu5tuc_di" bpmnElement="Activity_17wwliq">
         <dc:Bounds x="290" y="125" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_0pvp5mz_di" bpmnElement="Flow_0pvp5mz">
+        <di:waypoint x="215" y="177" />
+        <di:waypoint x="253" y="177" />
+        <di:waypoint x="253" y="165" />
+        <di:waypoint x="290" y="165" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_04qc4ur_di" bpmnElement="Flow_04qc4ur">
+        <di:waypoint x="390" y="165" />
+        <di:waypoint x="426" y="165" />
+        <di:waypoint x="426" y="177" />
+        <di:waypoint x="462" y="177" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>