Task status check (#136)

* checks task status * finished only * caps * test fix
AllenNeuralDynamics · Sep 13, 2023 · 518616c · 518616c
1 parent 6dd5300
commit 518616c
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/src/aind_metadata_service/labtracks/client.py b/src/aind_metadata_service/labtracks/client.py
@@ -211,6 +211,17 @@ class LabTracksProcedures(Enum):
     RO_INJECTION = "RO Injection"
 
 
+class LabTracksTaskStatuses(Enum):
+    """LabTracks Task Status Options"""
+
+    FINISHED = "F"
+    SCHEDULED = "S"
+    CANCELLED = "C"
+    DELETED = "D"
+    ACCEPTED = "A"
+    DECLINED = "L"
+
+
 class LabTracksResponseHandler:
     """This class will contain methods to handle the response from LabTracks"""
 
@@ -409,7 +420,11 @@ def map_response_to_procedures(
                 TaskSetQueryColumns.PROTOCOL_NUMBER.value
             )
             type_name = result.get(TaskSetQueryColumns.TYPE_NAME.value)
-            if type_name:
+            task_status = result.get(TaskSetQueryColumns.TASK_STATUS.value)
+            if (
+                type_name
+                and task_status == LabTracksTaskStatuses.FINISHED.value
+            ):
                 if LabTracksProcedures.PERFUSION.value in type_name:
                     output_specimen_ids = [
                         result.get(TaskSetQueryColumns.TASK_OBJECT.value)

diff --git a/src/aind_metadata_service/labtracks/query_builder.py b/src/aind_metadata_service/labtracks/query_builder.py
@@ -29,6 +29,7 @@ class TaskSetQueryColumns(Enum):
     TASK_OBJECT = "task_object"
     TYPE_NAME = "type_name"
     PROTOCOL_NUMBER = "protocol_number"
+    TASK_STATUS = "task_status"
 
 
 class LabTracksQueries:
@@ -62,7 +63,8 @@ def procedures_from_subject_id(subject_id: str) -> str:
             f"    {TaskSetQueryColumns.INVESTIGATOR_ID.value},"
             f"    TSO.TASK_OBJECT AS {TaskSetQueryColumns.TASK_OBJECT.value},"
             f"    AP.PROTOCOL_NUMBER AS "
-            f"    {TaskSetQueryColumns.PROTOCOL_NUMBER.value}"
+            f"    {TaskSetQueryColumns.PROTOCOL_NUMBER.value},"
+            f"    TS.TASK_STATUS AS {TaskSetQueryColumns.TASK_STATUS.value}"
             "  FROM TASK_SET TS"
             "    INNER JOIN TASK_SET_OBJECT TSO "
             "    ON TS.ID = TSO.TASK_ID"

diff --git a/tests/labtracks/test_client.py b/tests/labtracks/test_client.py
@@ -393,6 +393,7 @@ class MockCursor:
                 ["task_object"],
                 ["type_name"],
                 ["protocol_number"],
+                ["task_status"],
             ]
 
             @staticmethod
@@ -413,6 +414,7 @@ def fetchall():
                         decimal.Decimal("115977"),
                         "Perfusion",
                         decimal.Decimal("2002"),
+                        "F",
                     ],
                     [
                         decimal.Decimal("10000"),
@@ -423,6 +425,7 @@ def fetchall():
                         decimal.Decimal("115977"),
                         "RO Injection",
                         decimal.Decimal("2002"),
+                        "F",
                     ],
                 ]
 

diff --git a/tests/labtracks/test_query_builder.py b/tests/labtracks/test_query_builder.py
@@ -62,7 +62,8 @@ def test_procedures_from_id(self):
             f"    {TaskSetQueryColumns.INVESTIGATOR_ID.value},"
             f"    TSO.TASK_OBJECT AS {TaskSetQueryColumns.TASK_OBJECT.value},"
             f"    AP.PROTOCOL_NUMBER AS "
-            f"    {TaskSetQueryColumns.PROTOCOL_NUMBER.value}"
+            f"    {TaskSetQueryColumns.PROTOCOL_NUMBER.value},"
+            f"    TS.TASK_STATUS AS {TaskSetQueryColumns.TASK_STATUS.value}"
             "  FROM TASK_SET TS"
             "    INNER JOIN TASK_SET_OBJECT TSO "
             "    ON TS.ID = TSO.TASK_ID"

diff --git a/tests/labtracks/test_response_handler.py b/tests/labtracks/test_response_handler.py
@@ -89,6 +89,18 @@ class TestResponseExamples:
             "investigator_id": Decimal(28803),
             "task_object": Decimal(115977),
             "protocol_number": Decimal(2002),
+            "task_status": "F",
+        },
+        {
+            "id": Decimal(00000),
+            "task_type_id": Decimal(12345),
+            "type_name": "Perfusion Gel",
+            "date_start": datetime.datetime(2022, 10, 11, 0, 0),
+            "date_end": datetime.datetime(2022, 10, 11, 4, 30),
+            "investigator_id": Decimal(28803),
+            "task_object": Decimal(115977),
+            "protocol_number": Decimal(2002),
+            "task_status": "C",
         },
         {
             "id": Decimal(10000),
@@ -99,6 +111,7 @@ class TestResponseExamples:
             "investigator_id": Decimal(28803),
             "task_object": Decimal(115977),
             "protocol_number": Decimal(2002),
+            "task_status": "F",
         },
     ]