Moments before disaster.

src/submissions/backend/validators/__init__.py

@@ -2,6 +2,7 @@ import logging, re
 from pathlib import Path
 from openpyxl import load_workbook
 from backend.db.models import BasicSubmission, SubmissionType
+from datetime import date
 
 logger = logging.getLogger(f"submissions.{__name__}")
 
@@ -17,6 +18,10 @@ class RSLNamer(object):
         if self.submission_type != None:
             enforcer = BasicSubmission.find_polymorphic_subclass(polymorphic_identity=self.submission_type)
             self.parsed_name = self.retrieve_rsl_number(instr=instr, regex=enforcer.get_regex())
+            if data == None:
+                data = dict(submission_type=self.submission_type)
+            if "submission_type" not in data.keys():
+                data['submission_type'] = self.submission_type
             self.parsed_name = enforcer.enforce_name(instr=self.parsed_name, data=data)
 
     @classmethod
@@ -104,5 +109,23 @@ class RSLNamer(object):
             parsed_name = None
         logger.debug(f"Got parsed submission name: {parsed_name}")
         return parsed_name
+    
+    @classmethod
+    def construct_new_plate_name(cls, data:dict) -> str:
+        if "submitted_date" in data.keys():
+            if data['submitted_date']['value'] != None:
+                today = data['submitted_date']['value']
+            else:
+                today = datetime.now()
+        else:
+            today = re.search(r"\d{4}(_|-)?\d{2}(_|-)?\d{2}", instr)
+            try:
+                today = parse(today.group())
+            except AttributeError:
+                today = datetime.now()
+        previous = BasicSubmission.query(start_date=today, end_date=today, submission_type=data['submission_type'])
+        plate_number = len(previous) + 1
+        return f"RSL-{data['abbreviation']}-{today.year}{str(today.month).zfill(2)}{str(today.day).zfill(2)}-{plate_number}"
+
         
 from .pydant import *

src/submissions/backend/validators/pydant.py

@@ -355,8 +355,9 @@ class PydSubmission(BaseModel, extra='allow'):
             value = value['value'].title()
             return dict(value=value, missing=False)
         else:
-            return dict(value=RSLNamer(instr=values.data['filepath'].__str__()).submission_type.title(), missing=True)
-        
+            # return dict(value=RSLNamer(instr=values.data['filepath'].__str__()).submission_type.title(), missing=True)
+            return dict(value=RSLNamer.retrieve_submission_type(instr=values.data['filepath']).title(), missing=True)
+      
     @field_validator("submission_category", mode="before")
     def create_category(cls, value):
         if not isinstance(value, dict):
@@ -444,6 +445,11 @@ class PydSubmission(BaseModel, extra='allow'):
                             instance.submission_sample_associations.append(assoc)
                 case "equipment":
                     logger.debug(f"Equipment: {pformat(self.equipment)}")
+                    try:
+                        if equip == None:
+                            continue
+                    except UnboundLocalError:
+                        continue
                     for equip in self.equipment:
                         equip, association = equip.toSQL(submission=instance)
                         if association != None:
@@ -773,20 +779,20 @@ class PydEquipment(BaseModel, extra='ignore'):
     asset_number: str
     name: str
     nickname: str|None
-    process: List[str]|None
+    process: str|None
     role: str|None
 
-    @field_validator('process')
-    @classmethod
-    def remove_dupes(cls, value):
-        if isinstance(value, list):
-            return list(set(value))
-        else:
-            return value
+    # @field_validator('process')
+    # @classmethod
+    # def remove_dupes(cls, value):
+    #     if isinstance(value, list):
+    #         return list(set(value))
+    #     else:
+    #         return value
 
-    def toForm(self, parent):
-        from frontend.widgets.equipment_usage import EquipmentCheckBox
-        return EquipmentCheckBox(parent=parent, equipment=self)
+    # def toForm(self, parent):
+    #     from frontend.widgets.equipment_usage import EquipmentCheckBox
+    #     return EquipmentCheckBox(parent=parent, equipment=self)
     
     def toSQL(self, submission:BasicSubmission|str=None):
         if isinstance(submission, str):
@@ -796,7 +802,7 @@ class PydEquipment(BaseModel, extra='ignore'):
             return
         if submission != None:
             assoc = SubmissionEquipmentAssociation(submission=submission, equipment=equipment)
-            assoc.process = self.process[0]
+            assoc.process = self.process
             assoc.role = self.role
             # equipment.equipment_submission_associations.append(assoc)
             equipment.equipment_submission_associations.append(assoc)
@@ -808,6 +814,7 @@ class PydEquipmentRole(BaseModel):
 
     name: str
     equipment: List[PydEquipment]
+    processes: List[str]|None
     
     def toForm(self, parent, submission_type, used):
         from frontend.widgets.equipment_usage import RoleComboBox