Commit pre-refactor for code cleanup.

src/submissions/backend/db/__init__.py

@@ -329,7 +329,7 @@ def lookup_all_submissions_by_type(ctx:dict, type:str|None=None) -> list[models.
     if type == None:
         subs = ctx['database_session'].query(models.BasicSubmission).all()
     else:
-        subs = ctx['database_session'].query(models.BasicSubmission).filter(models.BasicSubmission.submission_type==type).all()
+        subs = ctx['database_session'].query(models.BasicSubmission).filter(models.BasicSubmission.submission_type==type.lower().replace(" ", "_")).all()
     return subs
 
 def lookup_all_orgs(ctx:dict) -> list[models.Organization]:

src/submissions/backend/db/functions/__init__.py

@@ -0,0 +1,21 @@
+from ..models import *
+import logging
+
+logger = logging.getLogger(f"submissions.{__name__}")
+
+def check_kit_integrity(sub:BasicSubmission):
+    ext_kit_rtypes = [reagenttype.name for reagenttype in sub.extraction_kit.reagent_types]
+    logger.debug(f"Kit reagents: {ext_kit_rtypes}")
+    reagenttypes = [reagent.type.name for reagent in sub.reagents]
+    logger.debug(f"Submission reagents: {reagenttypes}")
+    check = set(ext_kit_rtypes) == set(reagenttypes)
+    logger.debug(f"Checking if reagents match kit contents: {check}")
+    common = list(set(ext_kit_rtypes).intersection(reagenttypes))
+    logger.debug(f"common reagents types: {common}")
+    if check:
+        result = None
+    else:
+        result = {'message' : f"Couldn't verify reagents match listed kit components.\n\nIt looks like you are missing: {[x.upper for x in ext_kit_rtypes if x not in common]}\n\nAlternatively, you may have set the wrong extraction kit."}
+    return result
+    
+    

src/submissions/backend/db/models/kits.py

@@ -78,7 +78,7 @@ class Reagent(Base):
         Returns:
             str: string representing this object's lot number
         """        
-        return self.lot
+        return str(self.lot)
 
     def to_sub_dict(self) -> dict:
         """