sample summary report expansion

microsetta_private_api/admin/admin_impl.py

@@ -29,7 +29,11 @@
     post_daklapack_orders
 from microsetta_private_api import localization
 from microsetta_private_api.admin.sample_summary import per_sample
-from microsetta_private_api.admin.sample_summary import get_barcodes_for
+from microsetta_private_api.admin.sample_summary import \
+    get_barcodes_by_project_id,\
+    get_barcodes_by_kit_ids, get_barcodes_by_emails,\
+    get_barcodes_by_outbound_tracking_numbers,\
+    get_barcodes_by_inbound_tracking_numbers
 from microsetta_private_api.util.melissa import verify_address
 from microsetta_private_api.util.query_builder_to_sql import build_condition
 from werkzeug.exceptions import Unauthorized
@@ -500,12 +504,28 @@ def query_project_barcode_stats(body, token_info, strip_sampleid):
 
 def query_barcode_stats(body, token_info, strip_sampleid):
     validate_admin_access(token_info)
+    print("body", body)
     if 'sample_barcodes' in body:
         project_id = None
         barcodes = body["sample_barcodes"]
+    elif 'kit_ids' in body:
+        project_id = None
+        barcodes = get_barcodes_by_kit_ids(body["kit_ids"])
+        print("kit id barcodes", barcodes)
+    elif 'emails' in body:
+        project_id = None
+        barcodes = get_barcodes_by_emails(body["emails"])
+    elif 'outbound_tracking_numbers' in body:
+        project_id = None
+        barcodes = get_barcodes_by_outbound_tracking_numbers
+        (body["outbound_tracking_numbers"])
+    elif 'inbound_tracking_numbers' in body:
+        project_id = None
+        barcodes = get_barcodes_by_inbound_tracking_numbers
+        (body["inbound_tracking_numbers"])
     elif 'project_id' in body:
         project_id = body["project_id"]
-        barcodes = get_barcodes_for(project_id)
+        barcodes = get_barcodes_by_project_id(project_id)
 
     unprocessed_barcodes = None
 

microsetta_private_api/admin/sample_summary.py

@@ -1,4 +1,5 @@
 from microsetta_private_api.model.source import Source
+from microsetta_private_api.repo.kit_repo import KitRepo
 from microsetta_private_api.repo.sample_repo import SampleRepo
 from microsetta_private_api.repo.transaction import Transaction
 from microsetta_private_api.repo.admin_repo import AdminRepo
@@ -7,20 +8,55 @@
 from werkzeug.exceptions import NotFound
 
 
-def get_barcodes_for(project_id):
+def get_barcodes_by_project_id(project_id):
     if project_id is None:
         raise ValueError("project_id must be defined.")
 
     with Transaction() as t:
         return AdminRepo(t).get_project_barcodes(project_id)
 
 
+def get_barcodes_by_kit_ids(kit_ids):
+    if kit_ids is None:
+        raise ValueError("kit_id must be defined.")
+
+    with Transaction() as t:
+        return AdminRepo(t).get_kit_barcodes(kit_ids)
+
+
+def get_barcodes_by_emails(emails):
+    if emails is None:
+        raise ValueError("email must be defined.")
+
+    with Transaction() as t:
+        return AdminRepo(t).get_email_barcodes(emails)
+
+
+def get_barcodes_by_outbound_tracking_numbers(outbound_tracking_numbers):
+    if outbound_tracking_numbers is None:
+        raise ValueError("outbound_tracking_numbers must be defined.")
+
+    with Transaction() as t:
+        return AdminRepo(t).get_outbound_tracking_barcodes
+    (outbound_tracking_numbers)
+
+
+def get_barcodes_by_inbound_tracking_numbers(inbound_tracking_numbers):
+    if inbound_tracking_numbers is None:
+        raise ValueError("inbound_tracking_numbers must be defined.")
+
+    with Transaction() as t:
+        return AdminRepo(t).get_inbound_tracking_barcodes
+    (inbound_tracking_numbers)
+
+
 def per_sample(project, barcodes, strip_sampleid):
     summaries = []
     with Transaction() as t:
         admin_repo = AdminRepo(t)
         sample_repo = SampleRepo(t)
         template_repo = SurveyTemplateRepo(t)
+        kit_repo = KitRepo(t)
         vs_repo = VioscreenSessionRepo(t)
 
         # all associated projects returned for each barcode,
@@ -84,6 +120,16 @@ def per_sample(project, barcodes, strip_sampleid):
                     sample.id
                 )
 
+            kit_id_name = kit_repo.get_kit_id_name_by_barcode(barcode)
+            outbound_fedex_tracking = \
+                admin_repo.get_outbound_tracking_by_barcodes(barcode)
+            inbound_fedex_tracking = \
+                admin_repo.get_inbound_tracking_by_barcodes(barcode)
+            first_scan_timestamp_status = \
+                admin_repo.get_first_scan_timestamp_by_barcodes(barcode)
+            last_scan_timestamp_status = \
+                admin_repo.get_last_scan_timestamp_by_barcodes(barcode)
+
             summary = {
                 "sampleid": None if strip_sampleid else barcode,
                 "project": barcode_project,
@@ -96,7 +142,12 @@ def per_sample(project, barcodes, strip_sampleid):
                 "ffq-taken": ffq_taken,
                 "ffq-complete": ffq_complete,
                 "sample-status": sample_status,
-                "sample-received": sample_status is not None
+                "sample-received": sample_status is not None,
+                "kit-id": kit_id_name,
+                "outbound-tracking": outbound_fedex_tracking,
+                "inbound-tracking": inbound_fedex_tracking,
+                "first-scan-timestamp-status": first_scan_timestamp_status,
+                "last-scan-timestamp-status": last_scan_timestamp_status
             }
 
             for status in ["sample-is-valid",

microsetta_private_api/api/microsetta_private_api.yaml

@@ -2998,6 +2998,22 @@ paths:
                     # not using the defined schema for sample_barcode as it is
                     # readOnly
                     type: string
+                'kit_ids':
+                  type: array
+                  items:
+                    type: string
+                'emails':
+                  type: array
+                  items:
+                    type: string
+                'outbound_tracking_numbers':
+                  type: array
+                  items:
+                    type: string
+                'inbound_tracking_numbers':
+                  type: array
+                  items:
+                    type: string
       responses:
         '200':
           description: Return an object containing a list of dictionaries of sample status for requested accounts