From aac3d5c16ee17497c75c5ccb6a882ae9b846ff14 Mon Sep 17 00:00:00 2001
From: Dan <daniel.h.funk@gmail.com>
Date: Mon, 1 Mar 2021 14:54:04 -0500
Subject: [PATCH 1/4] Bug #255, this requires the front end to pass in the name
 of the task, when doing a lookup.  This will prevent a bug where we have
 multiple user tasks, with enum fields that set the same variable, but use
 different lookup tables to populate the dropbown or search feature.

---
 crc/api.yml                                   |   8 +-
 crc/api/workflow.py                           |   4 +-
 crc/models/file.py                            |   1 +
 crc/services/lookup_service.py                |  21 +--
 crc/services/workflow_processor.py            |   4 +-
 migrations/versions/7ec759f994c8_.py          |  33 ++++
 .../enum_options_competing_files/animals.xlsx | Bin 0 -> 5402 bytes
 .../enum_options_competing_files.bpmn         | 145 ++++++++++++++++++
 .../enum_options_competing_files/fruits.xlsx  | Bin 0 -> 5404 bytes
 .../enum_options_from_file.bpmn               |   8 +-
 .../enum_options_with_search.bpmn             |   8 +-
 tests/test_lookup_service.py                  |  71 ++++++---
 tests/test_tasks_api.py                       |  20 +--
 13 files changed, 269 insertions(+), 54 deletions(-)
 create mode 100644 migrations/versions/7ec759f994c8_.py
 create mode 100644 tests/data/enum_options_competing_files/animals.xlsx
 create mode 100644 tests/data/enum_options_competing_files/enum_options_competing_files.bpmn
 create mode 100644 tests/data/enum_options_competing_files/fruits.xlsx

diff --git a/crc/api.yml b/crc/api.yml
index 949b7b77..9d6089a6 100644
--- a/crc/api.yml
+++ b/crc/api.yml
@@ -954,7 +954,7 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Workflow"
-  /workflow/{workflow_id}/lookup/{field_id}:
+  /workflow/{workflow_id}/lookup/{task_spec_name}/{field_id}:
     parameters:
       - name: workflow_id
         in: path
@@ -963,6 +963,12 @@ paths:
         schema:
           type: integer
           format: int32
+      - name: task_spec_name
+        in: path
+        required: true
+        description: The name of the current task
+        schema:
+          type: string
       - name: field_id
         in: path
         required: true
diff --git a/crc/api/workflow.py b/crc/api/workflow.py
index 20fdd781..5925abb8 100644
--- a/crc/api/workflow.py
+++ b/crc/api/workflow.py
@@ -250,7 +250,7 @@ def delete_workflow_spec_category(cat_id):
     session.commit()
 
 
-def lookup(workflow_id, field_id, query=None, value=None, limit=10):
+def lookup(workflow_id, task_spec_name, field_id, query=None, value=None, limit=10):
     """
     given a field in a task, attempts to find the lookup table or function associated
     with that field and runs a full-text query against it to locate the values and
@@ -258,7 +258,7 @@ def lookup(workflow_id, field_id, query=None, value=None, limit=10):
     Tries to be fast, but first runs will be very slow.
     """
     workflow = session.query(WorkflowModel).filter(WorkflowModel.id == workflow_id).first()
-    lookup_data = LookupService.lookup(workflow, field_id, query, value, limit)
+    lookup_data = LookupService.lookup(workflow, task_spec_name, field_id, query, value, limit)
     return LookupDataSchema(many=True).dump(lookup_data)
 
 
diff --git a/crc/models/file.py b/crc/models/file.py
index d01dc2a3..b1269f78 100644
--- a/crc/models/file.py
+++ b/crc/models/file.py
@@ -148,6 +148,7 @@ class LookupFileModel(db.Model):
     __tablename__ = 'lookup_file'
     id = db.Column(db.Integer, primary_key=True)
     workflow_spec_id = db.Column(db.String)
+    task_spec_id = db.Column(db.String)
     field_id = db.Column(db.String)
     is_ldap = db.Column(db.Boolean)  # Allows us to run an ldap query instead of a db lookup.
     file_data_model_id = db.Column(db.Integer, db.ForeignKey('file_data.id'))
diff --git a/crc/services/lookup_service.py b/crc/services/lookup_service.py
index 6aba5410..c1960354 100644
--- a/crc/services/lookup_service.py
+++ b/crc/services/lookup_service.py
@@ -40,13 +40,14 @@ class LookupService(object):
     def get_lookup_model(spiff_task, field):
         workflow_id = spiff_task.workflow.data[WorkflowProcessor.WORKFLOW_ID_KEY]
         workflow = db.session.query(WorkflowModel).filter(WorkflowModel.id == workflow_id).first()
-        return LookupService.__get_lookup_model(workflow, field.id)
+        return LookupService.__get_lookup_model(workflow, spiff_task.task_spec.name, field.id)
 
     @staticmethod
-    def __get_lookup_model(workflow, field_id):
+    def __get_lookup_model(workflow, task_spec_id, field_id):
         lookup_model = db.session.query(LookupFileModel) \
             .filter(LookupFileModel.workflow_spec_id == workflow.workflow_spec_id) \
             .filter(LookupFileModel.field_id == field_id) \
+            .filter(LookupFileModel.task_spec_id == task_spec_id) \
             .order_by(desc(LookupFileModel.id)).first()
 
         # one more quick query, to see if the lookup file is still related to this workflow.
@@ -59,14 +60,14 @@ class LookupService(object):
 
         if not is_current:
             # Very very very expensive, but we don't know need this till we do.
-            lookup_model = LookupService.create_lookup_model(workflow, field_id)
+            lookup_model = LookupService.create_lookup_model(workflow, task_spec_id, field_id)
 
         return lookup_model
 
     @staticmethod
-    def lookup(workflow, field_id, query, value=None, limit=10):
+    def lookup(workflow, task_spec_id, field_id, query, value=None, limit=10):
 
-        lookup_model = LookupService.__get_lookup_model(workflow, field_id)
+        lookup_model = LookupService.__get_lookup_model(workflow, task_spec_id, field_id)
 
         if lookup_model.is_ldap:
             return LookupService._run_ldap_query(query, limit)
@@ -74,7 +75,7 @@ class LookupService(object):
             return LookupService._run_lookup_query(lookup_model, query, value, limit)
 
     @staticmethod
-    def create_lookup_model(workflow_model, field_id):
+    def create_lookup_model(workflow_model, task_spec_id, field_id):
         """
         This is all really expensive, but should happen just once (per file change).
 
@@ -84,11 +85,12 @@ class LookupService(object):
         Returns:  an array of LookupData, suitable for returning to the API.
         """
         processor = WorkflowProcessor(workflow_model)  # VERY expensive, Ludicrous for lookup / type ahead
-        spec, field = processor.find_spec_and_field_by_field_id(field_id)
+        spec, field = processor.find_spec_and_field(task_spec_id, field_id)
 
         # Clear out all existing lookup models for this workflow and field.
         existing_models = db.session.query(LookupFileModel) \
             .filter(LookupFileModel.workflow_spec_id == workflow_model.workflow_spec_id) \
+            .filter(LookupFileModel.task_spec_id == task_spec_id) \
             .filter(LookupFileModel.field_id == field_id).all()
         for model in existing_models:  # Do it one at a time to cause the required cascade of deletes.
             db.session.delete(model)
@@ -117,7 +119,7 @@ class LookupService(object):
                 data_model = latest_files[0]
 
             lookup_model = LookupService.build_lookup_table(data_model, value_column, label_column,
-                                                            workflow_model.workflow_spec_id, field_id)
+                                                            workflow_model.workflow_spec_id, task_spec_id, field_id)
 
         #  Use the results of an LDAP request to populate enum field options
         elif field.has_property(Task.FIELD_PROP_LDAP_LOOKUP):
@@ -134,7 +136,7 @@ class LookupService(object):
         return lookup_model
 
     @staticmethod
-    def build_lookup_table(data_model: FileDataModel, value_column, label_column, workflow_spec_id, field_id):
+    def build_lookup_table(data_model: FileDataModel, value_column, label_column, workflow_spec_id, task_spec_id, field_id):
         """ In some cases the lookup table can be very large.  This method will add all values to the database
          in a way that can be searched and returned via an api call - rather than sending the full set of
           options along with the form.  It will only open the file and process the options if something has
@@ -153,6 +155,7 @@ class LookupService(object):
 
         lookup_model = LookupFileModel(workflow_spec_id=workflow_spec_id,
                                        field_id=field_id,
+                                       task_spec_id=task_spec_id,
                                        file_data_model_id=data_model.id,
                                        is_ldap=False)
 
diff --git a/crc/services/workflow_processor.py b/crc/services/workflow_processor.py
index 4eb7b027..2c83edd4 100644
--- a/crc/services/workflow_processor.py
+++ b/crc/services/workflow_processor.py
@@ -473,11 +473,11 @@ class WorkflowProcessor(object):
             if nav_item['task_id'] == task.id:
                 return nav_item
 
-    def find_spec_and_field_by_field_id(self, field_id):
+    def find_spec_and_field(self, spec_name, field_id):
         """Tracks down a form field by name in the workflow spec,
          only looks at ready tasks. Returns a tuple of the task, and form"""
         for spec in self.bpmn_workflow.spec.task_specs.values():
-            if hasattr(spec, "form"):
+            if spec.name == spec_name and hasattr(spec, "form"):
                 for field in spec.form.fields:
                     if field.id == field_id:
                         return spec, field
diff --git a/migrations/versions/7ec759f994c8_.py b/migrations/versions/7ec759f994c8_.py
new file mode 100644
index 00000000..3478d384
--- /dev/null
+++ b/migrations/versions/7ec759f994c8_.py
@@ -0,0 +1,33 @@
+"""empty message
+
+Revision ID: 7ec759f994c8
+Revises: cb892916166a
+Create Date: 2021-03-01 12:51:53.681624
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+from sqlalchemy.dialects import postgresql
+
+revision = '7ec759f994c8'
+down_revision = 'cb892916166a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.execute('delete from lookup_data')
+    op.execute('delete from lookup_file')
+    op.add_column('lookup_file', sa.Column('task_spec_id', sa.String(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('lookup_file', 'task_spec_id')
+    # ### end Alembic commands ###
diff --git a/tests/data/enum_options_competing_files/animals.xlsx b/tests/data/enum_options_competing_files/animals.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..45ddfe3c9cadfb4659ae7416dcd51e4677c0ebef
GIT binary patch
literal 5402
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
GUi}|CI|CE|

literal 0
HcmV?d00001

diff --git a/tests/data/enum_options_competing_files/enum_options_competing_files.bpmn b/tests/data/enum_options_competing_files/enum_options_competing_files.bpmn
new file mode 100644
index 00000000..41670c4d
--- /dev/null
+++ b/tests/data/enum_options_competing_files/enum_options_competing_files.bpmn
@@ -0,0 +1,145 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_13oadue" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.3">
+  <bpmn:process id="Process_1e56be7" isExecutable="true">
+    <bpmn:startEvent id="StartEvent_1">
+      <bpmn:outgoing>Flow_07vc55t</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:sequenceFlow id="Flow_07vc55t" sourceRef="StartEvent_1" targetRef="Activity_0s5qx04" />
+    <bpmn:exclusiveGateway id="Gateway_1j2ytgn">
+      <bpmn:incoming>Flow_1m73p95</bpmn:incoming>
+      <bpmn:outgoing>Flow_0gb1k4g</bpmn:outgoing>
+      <bpmn:outgoing>Flow_08kr305</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_0gb1k4g" sourceRef="Gateway_1j2ytgn" targetRef="animals">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">type == 'fruit'</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="Flow_08kr305" sourceRef="Gateway_1j2ytgn" targetRef="fruits">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">type=="fruit"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:exclusiveGateway id="Gateway_14eyj6z">
+      <bpmn:incoming>Flow_09ik0zr</bpmn:incoming>
+      <bpmn:incoming>Flow_1tzwe06</bpmn:incoming>
+      <bpmn:outgoing>Flow_1ym0gex</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_09ik0zr" sourceRef="animals" targetRef="Gateway_14eyj6z" />
+    <bpmn:sequenceFlow id="Flow_1tzwe06" sourceRef="fruits" targetRef="Gateway_14eyj6z" />
+    <bpmn:endEvent id="Event_0guzzkq">
+      <bpmn:incoming>Flow_1ym0gex</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_1ym0gex" sourceRef="Gateway_14eyj6z" targetRef="Event_0guzzkq" />
+    <bpmn:userTask id="animals" name="Animals" camunda:formKey="FormA">
+      <bpmn:extensionElements>
+        <camunda:formData>
+          <camunda:formField id="selectedItem" label="Select An Item" type="enum">
+            <camunda:properties>
+              <camunda:property id="spreadsheet.name" value="animals.xlsx" />
+              <camunda:property id="spreadsheet.value.column" value="Value" />
+              <camunda:property id="spreadsheet.label.column" value="Label" />
+            </camunda:properties>
+          </camunda:formField>
+        </camunda:formData>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0gb1k4g</bpmn:incoming>
+      <bpmn:outgoing>Flow_09ik0zr</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:userTask id="fruits" name="Fruits" camunda:formKey="FromB">
+      <bpmn:extensionElements>
+        <camunda:formData>
+          <camunda:formField id="selectedItem" type="enum">
+            <camunda:properties>
+              <camunda:property id="spreadsheet.name" value="fruits.xlsx" />
+              <camunda:property id="spreadsheet.value.column" value="Value" />
+              <camunda:property id="spreadsheet.label.column" value="Label" />
+            </camunda:properties>
+          </camunda:formField>
+        </camunda:formData>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_08kr305</bpmn:incoming>
+      <bpmn:outgoing>Flow_1tzwe06</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:sequenceFlow id="Flow_1m73p95" sourceRef="Activity_0s5qx04" targetRef="Gateway_1j2ytgn" />
+    <bpmn:userTask id="Activity_0s5qx04" name="What do you like" camunda:formKey="choose">
+      <bpmn:extensionElements>
+        <camunda:formData>
+          <camunda:formField id="type" type="enum">
+            <camunda:validation>
+              <camunda:constraint name="required" config="True" />
+            </camunda:validation>
+            <camunda:value id="animals" name="Animals" />
+            <camunda:value id="fruits" name="Fruits" />
+          </camunda:formField>
+        </camunda:formData>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_07vc55t</bpmn:incoming>
+      <bpmn:outgoing>Flow_1m73p95</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:textAnnotation id="TextAnnotation_1vfpzfh">
+      <bpmn:text>Sheet one and sheet two each reference different spread sheets, but  they use  the same form name.</bpmn:text>
+    </bpmn:textAnnotation>
+    <bpmn:association id="Association_0w3ioqq" sourceRef="animals" targetRef="TextAnnotation_1vfpzfh" />
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1e56be7">
+      <bpmndi:BPMNShape id="TextAnnotation_1vfpzfh_di" bpmnElement="TextAnnotation_1vfpzfh">
+        <dc:Bounds x="640" y="80" width="200" height="60" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_07vc55t_di" bpmnElement="Flow_07vc55t">
+        <di:waypoint x="188" y="307" />
+        <di:waypoint x="250" y="307" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0gb1k4g_di" bpmnElement="Flow_0gb1k4g">
+        <di:waypoint x="410" y="282" />
+        <di:waypoint x="410" y="240" />
+        <di:waypoint x="490" y="240" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_08kr305_di" bpmnElement="Flow_08kr305">
+        <di:waypoint x="410" y="332" />
+        <di:waypoint x="410" y="370" />
+        <di:waypoint x="490" y="370" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_09ik0zr_di" bpmnElement="Flow_09ik0zr">
+        <di:waypoint x="590" y="240" />
+        <di:waypoint x="670" y="240" />
+        <di:waypoint x="670" y="282" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1tzwe06_di" bpmnElement="Flow_1tzwe06">
+        <di:waypoint x="590" y="370" />
+        <di:waypoint x="670" y="370" />
+        <di:waypoint x="670" y="332" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1ym0gex_di" bpmnElement="Flow_1ym0gex">
+        <di:waypoint x="695" y="307" />
+        <di:waypoint x="752" y="307" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1m73p95_di" bpmnElement="Flow_1m73p95">
+        <di:waypoint x="350" y="307" />
+        <di:waypoint x="385" y="307" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="Gateway_1j2ytgn_di" bpmnElement="Gateway_1j2ytgn" isMarkerVisible="true">
+        <dc:Bounds x="385" y="282" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_14eyj6z_di" bpmnElement="Gateway_14eyj6z" isMarkerVisible="true">
+        <dc:Bounds x="645" y="282" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0guzzkq_di" bpmnElement="Event_0guzzkq">
+        <dc:Bounds x="752" y="289" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0eua66n_di" bpmnElement="animals">
+        <dc:Bounds x="490" y="200" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0kcbe51_di" bpmnElement="fruits">
+        <dc:Bounds x="490" y="330" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="152" y="289" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1fixobo_di" bpmnElement="Activity_0s5qx04">
+        <dc:Bounds x="250" y="267" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Association_0w3ioqq_di" bpmnElement="Association_0w3ioqq">
+        <di:waypoint x="589" y="208" />
+        <di:waypoint x="694" y="140" />
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
diff --git a/tests/data/enum_options_competing_files/fruits.xlsx b/tests/data/enum_options_competing_files/fruits.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..c38173a2b86857ecf9d261482140e30433deb26e
GIT binary patch
literal 5404
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
K;u=MTz4|{SSPMD;

literal 0
HcmV?d00001

diff --git a/tests/data/enum_options_from_file/enum_options_from_file.bpmn b/tests/data/enum_options_from_file/enum_options_from_file.bpmn
index 6497d1f7..ccb10f6c 100644
--- a/tests/data/enum_options_from_file/enum_options_from_file.bpmn
+++ b/tests/data/enum_options_from_file/enum_options_from_file.bpmn
@@ -4,12 +4,12 @@
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>SequenceFlow_0lvudp8</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_0lvudp8" sourceRef="StartEvent_1" targetRef="Task_14svgcu" />
+    <bpmn:sequenceFlow id="SequenceFlow_0lvudp8" sourceRef="StartEvent_1" targetRef="TaskEnumLookup" />
     <bpmn:endEvent id="EndEvent_0q4qzl9">
       <bpmn:incoming>SequenceFlow_02vev7n</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_02vev7n" sourceRef="Task_14svgcu" targetRef="EndEvent_0q4qzl9" />
-    <bpmn:userTask id="Task_14svgcu" name="Enum Lookup Form" camunda:formKey="EnumForm">
+    <bpmn:sequenceFlow id="SequenceFlow_02vev7n" sourceRef="TaskEnumLookup" targetRef="EndEvent_0q4qzl9" />
+    <bpmn:userTask id="TaskEnumLookup" name="Enum Lookup Form" camunda:formKey="EnumForm">
       <bpmn:extensionElements>
         <camunda:formData>
           <camunda:formField id="AllTheNames" label="Select a value" type="enum">
@@ -41,7 +41,7 @@
       <bpmndi:BPMNShape id="EndEvent_0q4qzl9_di" bpmnElement="EndEvent_0q4qzl9">
         <dc:Bounds x="432" y="99" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="UserTask_18ly1yq_di" bpmnElement="Task_14svgcu">
+      <bpmndi:BPMNShape id="UserTask_18ly1yq_di" bpmnElement="TaskEnumLookup">
         <dc:Bounds x="270" y="77" width="100" height="80" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
diff --git a/tests/data/enum_options_with_search/enum_options_with_search.bpmn b/tests/data/enum_options_with_search/enum_options_with_search.bpmn
index 584dd261..cd971e54 100644
--- a/tests/data/enum_options_with_search/enum_options_with_search.bpmn
+++ b/tests/data/enum_options_with_search/enum_options_with_search.bpmn
@@ -4,12 +4,12 @@
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>SequenceFlow_0lvudp8</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_0lvudp8" sourceRef="StartEvent_1" targetRef="Task_14svgcu" />
+    <bpmn:sequenceFlow id="SequenceFlow_0lvudp8" sourceRef="StartEvent_1" targetRef="Task_Enum_Lookup" />
     <bpmn:endEvent id="EndEvent_0q4qzl9">
       <bpmn:incoming>SequenceFlow_02vev7n</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_02vev7n" sourceRef="Task_14svgcu" targetRef="EndEvent_0q4qzl9" />
-    <bpmn:userTask id="Task_14svgcu" name="Enum Lookup Form" camunda:formKey="EnumForm">
+    <bpmn:sequenceFlow id="SequenceFlow_02vev7n" sourceRef="Task_Enum_Lookup" targetRef="EndEvent_0q4qzl9" />
+    <bpmn:userTask id="Task_Enum_Lookup" name="Enum Lookup Form" camunda:formKey="EnumForm">
       <bpmn:extensionElements>
         <camunda:formData>
           <camunda:formField id="sponsor" label="Select a value" type="autocomplete">
@@ -41,7 +41,7 @@
       <bpmndi:BPMNShape id="EndEvent_0q4qzl9_di" bpmnElement="EndEvent_0q4qzl9">
         <dc:Bounds x="432" y="99" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="UserTask_18ly1yq_di" bpmnElement="Task_14svgcu">
+      <bpmndi:BPMNShape id="UserTask_18ly1yq_di" bpmnElement="Task_Enum_Lookup">
         <dc:Bounds x="270" y="77" width="100" height="80" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
diff --git a/tests/test_lookup_service.py b/tests/test_lookup_service.py
index 1781e2ae..3f3d340a 100644
--- a/tests/test_lookup_service.py
+++ b/tests/test_lookup_service.py
@@ -18,14 +18,14 @@ class TestLookupService(BaseTest):
         file_model = session.query(FileModel).filter(FileModel.name == "customer_list.xls").first()
         file_data_model = session.query(FileDataModel).filter(FileDataModel.file_model == file_model).first()
         with self.assertRaises(ApiError):
-            LookupService.lookup(workflow, "not_the_right_field", "sam", limit=10)
+            LookupService.lookup(workflow, "Task_Enum_Lookup", "not_the_right_field", "sam", limit=10)
 
     def test_lookup_table_is_not_created_more_than_once(self):
         spec = BaseTest.load_test_spec('enum_options_with_search')
         workflow = self.create_workflow('enum_options_with_search')
-        LookupService.lookup(workflow, "sponsor", "sam", limit=10)
-        LookupService.lookup(workflow, "sponsor", "something", limit=10)
-        LookupService.lookup(workflow, "sponsor", "blah", limit=10)
+        LookupService.lookup(workflow, "Task_Enum_Lookup", "sponsor", "sam", limit=10)
+        LookupService.lookup(workflow, "Task_Enum_Lookup", "sponsor", "something", limit=10)
+        LookupService.lookup(workflow, "Task_Enum_Lookup", "sponsor", "blah", limit=10)
         lookup_records = session.query(LookupFileModel).all()
         self.assertIsNotNone(lookup_records)
         self.assertEqual(1, len(lookup_records))
@@ -37,7 +37,7 @@ class TestLookupService(BaseTest):
         spec = BaseTest.load_test_spec('enum_options_with_search')
         workflow = self.create_workflow('enum_options_with_search')
         file_model = session.query(FileModel).filter(FileModel.name == "sponsors.xls").first()
-        LookupService.lookup(workflow, "sponsor", "sam", limit=10)
+        LookupService.lookup(workflow, "Task_Enum_Lookup", "sponsor", "sam", limit=10)
         lookup_records = session.query(LookupFileModel).all()
         self.assertIsNotNone(lookup_records)
         self.assertEqual(1, len(lookup_records))
@@ -58,7 +58,7 @@ class TestLookupService(BaseTest):
         processor.reset(workflow)
         workflow = processor.workflow_model
 
-        LookupService.lookup(workflow, "sponsor", "sam", limit=10)
+        LookupService.lookup(workflow, "Task_Enum_Lookup", "sponsor", "sam", limit=10)
         lookup_records = session.query(LookupFileModel).all()
         lookup_record = lookup_records[0]
         lookup_data = session.query(LookupDataModel).filter(LookupDataModel.lookup_file_model == lookup_record).all()
@@ -69,71 +69,98 @@ class TestLookupService(BaseTest):
         workflow = self.create_workflow('enum_options_from_file')
         processor = WorkflowProcessor(workflow)
         processor.do_engine_steps()
-        results = LookupService.lookup(workflow, "AllTheNames", "", value="1000", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "", value="1000", limit=10)
         self.assertEqual(1, len(results), "It is possible to find an item based on the id, rather than as a search")
         self.assertIsNotNone(results[0].data)
         self.assertIsInstance(results[0].data, dict)
 
 
+    def test_lookup_with_two_spreadsheets_with_the_same_field_name_in_different_forms(self):
+        spec = BaseTest.load_test_spec('enum_options_competing_files')
+        workflow = self.create_workflow('enum_options_competing_files')
+        processor = WorkflowProcessor(workflow)
+
+        processor.do_engine_steps()
+        task = processor.get_ready_user_tasks()[0]
+        task.data = {"type": "animal"}
+        processor.complete_task(task)
+        processor.do_engine_steps()
+        task = processor.get_ready_user_tasks()[0]
+        results = LookupService.lookup(workflow, task.task_spec.name, "selectedItem", "", value="pigs", limit=10)
+        self.assertEqual(1, len(results), "It is possible to find an item based on the id, rather than as a search")
+        self.assertIsNotNone(results[0].data)
+
+        processor.reset(workflow, clear_data=True)
+        processor.do_engine_steps()
+        task = processor.get_ready_user_tasks()[0]
+        task.data = {"type": "fruit"}
+        processor.complete_task(task)
+        processor.do_engine_steps()
+        task = processor.get_ready_user_tasks()[0]
+        results = LookupService.lookup(workflow, task.task_spec.name, "selectedItem", "", value="apples", limit=10)
+        self.assertEqual(1, len(results), "It is possible to find an item based on the id, rather than as a search")
+        self.assertIsNotNone(results[0].data)
+
+
     def test_some_full_text_queries(self):
         spec = BaseTest.load_test_spec('enum_options_from_file')
         workflow = self.create_workflow('enum_options_from_file')
         processor = WorkflowProcessor(workflow)
         processor.do_engine_steps()
 
-        results = LookupService.lookup(workflow, "AllTheNames", "", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "", limit=10)
         self.assertEqual(10, len(results), "Blank queries return everything, to the limit")
 
-        results = LookupService.lookup(workflow, "AllTheNames", "medicines", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "medicines", limit=10)
         self.assertEqual(1, len(results), "words in the middle of label are detected.")
         self.assertEqual("The Medicines Company", results[0].label)
 
-        results = LookupService.lookup(workflow, "AllTheNames", "UVA", limit=10)
+        results = LookupService.lookup(workflow,"TaskEnumLookup", "AllTheNames", "UVA", limit=10)
         self.assertEqual(1, len(results), "Beginning of label is found.")
         self.assertEqual("UVA - INTERNAL - GM USE ONLY", results[0].label)
 
-        results = LookupService.lookup(workflow, "AllTheNames", "uva", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup","AllTheNames", "uva", limit=10)
         self.assertEqual(1, len(results), "case does not matter.")
         self.assertEqual("UVA - INTERNAL - GM USE ONLY", results[0].label)
 
-        results = LookupService.lookup(workflow, "AllTheNames", "medici", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "medici", limit=10)
         self.assertEqual(1, len(results), "partial words are picked up.")
         self.assertEqual("The Medicines Company", results[0].label)
 
-        results = LookupService.lookup(workflow, "AllTheNames", "Genetics Savings", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "Genetics Savings", limit=10)
         self.assertEqual(1, len(results), "multiple terms are picked up..")
         self.assertEqual("Genetics Savings & Clone, Inc.", results[0].label)
 
-        results = LookupService.lookup(workflow, "AllTheNames", "Genetics Sav", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "Genetics Sav", limit=10)
         self.assertEqual(1, len(results), "prefix queries still work with partial terms")
         self.assertEqual("Genetics Savings & Clone, Inc.", results[0].label)
 
-        results = LookupService.lookup(workflow, "AllTheNames", "Gen Sav", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "Gen Sav", limit=10)
         self.assertEqual(1, len(results), "prefix queries still work with ALL the partial terms")
         self.assertEqual("Genetics Savings & Clone, Inc.", results[0].label)
 
-        results = LookupService.lookup(workflow, "AllTheNames", "Inc", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "Inc", limit=10)
         self.assertEqual(7, len(results), "short terms get multiple correct results.")
         self.assertEqual("Genetics Savings & Clone, Inc.", results[0].label)
 
-        results = LookupService.lookup(workflow, "AllTheNames", "reaction design", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "reaction design", limit=10)
         self.assertEqual(3, len(results), "all results come back for two terms.")
         self.assertEqual("Reaction Design", results[0].label, "Exact matches come first.")
 
-        results = LookupService.lookup(workflow, "AllTheNames", "1 Something", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "1 Something", limit=10)
         self.assertEqual("1 Something", results[0].label, "Exact matches are preferred")
 
-        results = LookupService.lookup(workflow, "AllTheNames", "1 (!-Something", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "1 (!-Something", limit=10)
         self.assertEqual("1 Something", results[0].label, "special characters don't flake out")
 
-        results = LookupService.lookup(workflow, "AllTheNames", "1  Something", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "1  Something", limit=10)
         self.assertEqual("1 Something", results[0].label, "double spaces should not be an issue.")
 
-        results = LookupService.lookup(workflow, "AllTheNames", "in", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "in", limit=10)
         self.assertEqual(10, len(results), "stop words are not removed.")
         self.assertEqual("Genetics Savings & Clone, Inc.", results[0].label)
 
-        results = LookupService.lookup(workflow, "AllTheNames", "other", limit=10)
+        results = LookupService.lookup(workflow, "TaskEnumLookup", "AllTheNames", "other", limit=10)
         self.assertEqual("Other", results[0].label, "Can't find the word 'other', which is an english stop word")
 
 
diff --git a/tests/test_tasks_api.py b/tests/test_tasks_api.py
index d8d64c4d..8a2b2b68 100644
--- a/tests/test_tasks_api.py
+++ b/tests/test_tasks_api.py
@@ -266,8 +266,8 @@ class TestTasksApi(BaseTest):
         workflow = self.get_workflow_api(workflow)
         task = workflow.next_task
         field_id = task.form['fields'][0]['id']
-        rv = self.app.get('/v1.0/workflow/%i/lookup/%s?query=%s&limit=5' %
-                          (workflow.id, field_id, 'c'), # All records with a word that starts with 'c'
+        rv = self.app.get('/v1.0/workflow/%i/lookup/%s/%s?query=%s&limit=5' %
+                          (workflow.id, task.name, field_id, 'c'), # All records with a word that starts with 'c'
                           headers=self.logged_in_headers(),
                           content_type="application/json")
         self.assert_success(rv)
@@ -281,8 +281,8 @@ class TestTasksApi(BaseTest):
         workflow = self.get_workflow_api(workflow)
         task = workflow.next_task
         field_id = task.form['fields'][0]['id']
-        rv = self.app.get('/v1.0/workflow/%i/lookup/%s?query=%s&limit=5' %
-                          (workflow.id, field_id, 'c'), # All records with a word that starts with 'c'
+        rv = self.app.get('/v1.0/workflow/%i/lookup/%s/%s?query=%s&limit=5' %
+                          (workflow.id, task.name, field_id, 'c'), # All records with a word that starts with 'c'
                           headers=self.logged_in_headers(),
                           content_type="application/json")
         self.assert_success(rv)
@@ -290,8 +290,8 @@ class TestTasksApi(BaseTest):
         self.assertEqual(5, len(results))
         self.assert_options_populated(results, ['CUSTOMER_NUMBER', 'CUSTOMER_NAME', 'CUSTOMER_CLASS_MEANING'])
 
-        rv = self.app.get('/v1.0/workflow/%i/lookup/%s?value=%s' %
-                          (workflow.id, field_id, results[0]['value']), # All records with a word that starts with 'c'
+        rv = self.app.get('/v1.0/workflow/%i/lookup/%s/%s?value=%s' %
+                          (workflow.id, task.name, field_id, results[0]['value']), # All records with a word that starts with 'c'
                           headers=self.logged_in_headers(),
                           content_type="application/json")
         results = json.loads(rv.get_data(as_text=True))
@@ -311,8 +311,8 @@ class TestTasksApi(BaseTest):
         task = workflow.next_task
         field_id = task.form['fields'][0]['id']
         option_id = task.form['fields'][0]['options'][0]['id']
-        rv = self.app.get('/v1.0/workflow/%i/lookup/%s?value=%s' %
-                          (workflow.id, field_id, option_id), # All records with a word that starts with 'c'
+        rv = self.app.get('/v1.0/workflow/%i/lookup/%s/%s?value=%s' %
+                          (workflow.id, task.name, field_id, option_id), # All records with a word that starts with 'c'
                           headers=self.logged_in_headers(),
                           content_type="application/json")
         self.assert_success(rv)
@@ -352,8 +352,8 @@ class TestTasksApi(BaseTest):
         task = workflow.next_task
         field_id = task.form['fields'][0]['id']
         # lb3dp is a user record in the mock ldap responses for tests.
-        rv = self.app.get('/v1.0/workflow/%s/lookup/%s?query=%s&limit=5' %
-                          (workflow.id, field_id, 'lb3dp'),
+        rv = self.app.get('/v1.0/workflow/%s/lookup/%s/%s?query=%s&limit=5' %
+                          (workflow.id, task.name, field_id, 'lb3dp'),
                           headers=self.logged_in_headers(),
                           content_type="application/json")
         self.assert_success(rv)

From c8f5a440507d062752747878cac38fcc8e9eb2a8 Mon Sep 17 00:00:00 2001
From: Dan <daniel.h.funk@gmail.com>
Date: Tue, 2 Mar 2021 12:21:51 -0500
Subject: [PATCH 2/4] adding a warning in the logger so we can see when
 expensive calls are made to rebuild searches for enumerations.  But all looks
 good.

---
 crc/services/lookup_service.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crc/services/lookup_service.py b/crc/services/lookup_service.py
index c1960354..291ff4e8 100644
--- a/crc/services/lookup_service.py
+++ b/crc/services/lookup_service.py
@@ -60,6 +60,7 @@ class LookupService(object):
 
         if not is_current:
             # Very very very expensive, but we don't know need this till we do.
+            logging.warning("!!!! Making a very expensive call to update the lookup models.")
             lookup_model = LookupService.create_lookup_model(workflow, task_spec_id, field_id)
 
         return lookup_model

From ecfc2ee761deba42bdd42bc4ff445b9853cfd4e6 Mon Sep 17 00:00:00 2001
From: Dan <daniel.h.funk@gmail.com>
Date: Tue, 2 Mar 2021 14:15:29 -0500
Subject: [PATCH 3/4] a slightly better test.

---
 tests/test_lookup_service.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/test_lookup_service.py b/tests/test_lookup_service.py
index 3f3d340a..0f7d1c13 100644
--- a/tests/test_lookup_service.py
+++ b/tests/test_lookup_service.py
@@ -89,6 +89,9 @@ class TestLookupService(BaseTest):
         results = LookupService.lookup(workflow, task.task_spec.name, "selectedItem", "", value="pigs", limit=10)
         self.assertEqual(1, len(results), "It is possible to find an item based on the id, rather than as a search")
         self.assertIsNotNone(results[0].data)
+        results = LookupService.lookup(workflow, task.task_spec.name, "selectedItem", "", value="apples", limit=10)
+        self.assertEqual(0, len(results), "We shouldn't find our fruits mixed in with our animals.")
+
 
         processor.reset(workflow, clear_data=True)
         processor.do_engine_steps()
@@ -100,6 +103,8 @@ class TestLookupService(BaseTest):
         results = LookupService.lookup(workflow, task.task_spec.name, "selectedItem", "", value="apples", limit=10)
         self.assertEqual(1, len(results), "It is possible to find an item based on the id, rather than as a search")
         self.assertIsNotNone(results[0].data)
+        results = LookupService.lookup(workflow, task.task_spec.name, "selectedItem", "", value="pigs", limit=10)
+        self.assertEqual(0, len(results), "We shouldn't find our animals mixed in with our fruits.")
 
 
     def test_some_full_text_queries(self):

From bf8c0ba86fb3661c677c229cd3b81779733d35ae Mon Sep 17 00:00:00 2001
From: Dan <daniel.h.funk@gmail.com>
Date: Tue, 2 Mar 2021 14:36:20 -0500
Subject: [PATCH 4/4] fixing migration paths (I hope) and fixing a down
 migration that wasn't working as I attempted to debug.

---
 .../{7ec759f994c8_.py => c872232ebdcb_.py}         | 14 ++++++--------
 migrations/versions/ff29528a9909_.py               | 12 ++++++------
 2 files changed, 12 insertions(+), 14 deletions(-)
 rename migrations/versions/{7ec759f994c8_.py => c872232ebdcb_.py} (72%)

diff --git a/migrations/versions/7ec759f994c8_.py b/migrations/versions/c872232ebdcb_.py
similarity index 72%
rename from migrations/versions/7ec759f994c8_.py
rename to migrations/versions/c872232ebdcb_.py
index 3478d384..201e014e 100644
--- a/migrations/versions/7ec759f994c8_.py
+++ b/migrations/versions/c872232ebdcb_.py
@@ -1,8 +1,8 @@
 """empty message
 
-Revision ID: 7ec759f994c8
-Revises: cb892916166a
-Create Date: 2021-03-01 12:51:53.681624
+Revision ID: c872232ebdcb
+Revises: f28ee3722c49
+Create Date: 2021-03-02 14:35:13.911050
 
 """
 from alembic import op
@@ -10,10 +10,8 @@ import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-from sqlalchemy.dialects import postgresql
-
-revision = '7ec759f994c8'
-down_revision = 'cb892916166a'
+revision = 'c872232ebdcb'
+down_revision = 'f28ee3722c49'
 branch_labels = None
 depends_on = None
 
@@ -30,4 +28,4 @@ def upgrade():
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_column('lookup_file', 'task_spec_id')
-    # ### end Alembic commands ###
+    # ### end Alembic commands ###
\ No newline at end of file
diff --git a/migrations/versions/ff29528a9909_.py b/migrations/versions/ff29528a9909_.py
index 1a5802b2..a26328dd 100644
--- a/migrations/versions/ff29528a9909_.py
+++ b/migrations/versions/ff29528a9909_.py
@@ -25,12 +25,6 @@ def upgrade():
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('approval_file',
-    sa.Column('approval_id', sa.INTEGER(), autoincrement=False, nullable=False),
-    sa.Column('file_data_id', sa.INTEGER(), autoincrement=False, nullable=False),
-    sa.ForeignKeyConstraint(['approval_id'], ['approval.id'], name='approval_file_approval_id_fkey'),
-    sa.ForeignKeyConstraint(['file_data_id'], ['file_data.id'], name='approval_file_file_data_id_fkey')
-    )
     op.create_table('approval',
     sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
     sa.Column('study_id', sa.INTEGER(), autoincrement=False, nullable=False),
@@ -45,4 +39,10 @@ def downgrade():
     sa.ForeignKeyConstraint(['workflow_id'], ['workflow.id'], name='approval_workflow_id_fkey'),
     sa.PrimaryKeyConstraint('id', name='approval_pkey')
     )
+    op.create_table('approval_file',
+    sa.Column('approval_id', sa.INTEGER(), autoincrement=False, nullable=False),
+    sa.Column('file_data_id', sa.INTEGER(), autoincrement=False, nullable=False),
+    sa.ForeignKeyConstraint(['approval_id'], ['approval.id'], name='approval_file_approval_id_fkey'),
+    sa.ForeignKeyConstraint(['file_data_id'], ['file_data.id'], name='approval_file_file_data_id_fkey')
+    )
     # ### end Alembic commands ###