From f41406a6d90b2991fecfb8441dac9bb64520b270 Mon Sep 17 00:00:00 2001
From: mike cullerton <michaelc@cullerton.com>
Date: Tue, 12 Oct 2021 13:46:05 -0400
Subject: [PATCH] Fixes from changing workflow_id to workflow_spec_id

---
 .../get_email_data_by_workflow.bpmn             |  4 ++--
 tests/scripts/test_get_email_data.py            | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/tests/data/get_email_data_by_workflow/get_email_data_by_workflow.bpmn b/tests/data/get_email_data_by_workflow/get_email_data_by_workflow.bpmn
index 70c71531..2bf8769d 100644
--- a/tests/data/get_email_data_by_workflow/get_email_data_by_workflow.bpmn
+++ b/tests/data/get_email_data_by_workflow/get_email_data_by_workflow.bpmn
@@ -8,7 +8,7 @@
     <bpmn:userTask id="Activity_GetData" name="Get Data" camunda:formKey="DataForm">
       <bpmn:extensionElements>
         <camunda:formData>
-          <camunda:formField id="workflow_id" label="Workflow ID" type="string" />
+          <camunda:formField id="workflow_spec_id" label="Workflow Spec ID" type="string" />
         </camunda:formData>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1erkgz2</bpmn:incoming>
@@ -18,7 +18,7 @@
     <bpmn:scriptTask id="Activity_GetEmailData" name="Get Email Data">
       <bpmn:incoming>Flow_1ira7x5</bpmn:incoming>
       <bpmn:outgoing>Flow_1bt23l3</bpmn:outgoing>
-      <bpmn:script>email_data = get_email_data(email_workflow_id=workflow_id)</bpmn:script>
+      <bpmn:script>email_data = get_email_data(workflow_spec_id=workflow_spec_id)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="Flow_1bt23l3" sourceRef="Activity_GetEmailData" targetRef="Activity_DisplayEmailData" />
     <bpmn:manualTask id="Activity_DisplayEmailData" name="Display Email Data">
diff --git a/tests/scripts/test_get_email_data.py b/tests/scripts/test_get_email_data.py
index df324d48..89bc3050 100644
--- a/tests/scripts/test_get_email_data.py
+++ b/tests/scripts/test_get_email_data.py
@@ -9,7 +9,8 @@ class TestGetEmailData(BaseTest):
 
     def test_get_email_data_by_email_id(self):
         self.load_example_data()
-        study = session.query(StudyModel).first()
+        workflow = self.create_workflow('get_email_data')
+        study = workflow.study
         with mail.record_messages() as outbox:
             # Send an email we can use for get_email_data
             email_model = EmailService.add_email(subject='My Email Subject',
@@ -17,7 +18,6 @@ class TestGetEmailData(BaseTest):
                                                  recipients=['joe@example.com'],
                                                  content='asdf', content_html=None, study_id=study.id)
 
-            workflow = self.create_workflow('get_email_data')
             workflow_api = self.get_workflow_api(workflow)
             task = workflow_api.next_task
 
@@ -34,10 +34,12 @@ class TestGetEmailData(BaseTest):
             self.assertEqual('sender@example.com', email_data[0]['sender'])
             self.assertEqual('[\'joe@example.com\']', email_data[0]['recipients'])
 
-    def test_get_email_data_by_workflow_id(self):
+    def test_get_email_data_by_workflow_spec_id(self):
         self.load_example_data()
-        study = session.query(StudyModel).first()
+        workflow = self.create_workflow('get_email_data_by_workflow')
+        study = workflow.study
         email_workflow = session.query(WorkflowModel).first()
+        email_workflow_spec_id = email_workflow.workflow_spec_id
 
         with mail.record_messages() as outbox:
             # Send an email we can use for get_email_data
@@ -47,21 +49,20 @@ class TestGetEmailData(BaseTest):
                                                      content='asdf',
                                                      content_html=None,
                                                      study_id=study.id,
-                                                     workflow_id=email_workflow.id)
+                                                     workflow_spec_id=email_workflow_spec_id)
             email_model_two = EmailService.add_email(subject='My Other Email Subject',
                                                      sender='sender2@example.com',
                                                      recipients=['joanne@example.com'],
                                                      content='xyzpdq',
                                                      content_html=None,
                                                      study_id=study.id,
-                                                     workflow_id=email_workflow.id)
+                                                     workflow_spec_id=email_workflow_spec_id)
 
-            workflow = self.create_workflow('get_email_data_by_workflow')
             workflow_api = self.get_workflow_api(workflow)
             task = workflow_api.next_task
 
             # Run workflow with get_email_data
-            workflow_api = self.complete_form(workflow, task, {'workflow_id': email_workflow.id})
+            workflow_api = self.complete_form(workflow, task, {'workflow_spec_id': email_workflow_spec_id})
             task = workflow_api.next_task
             data = task.data