Upgrades to cost calculation methods

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

@@ -7,7 +7,7 @@ Base = declarative_base()
 metadata = Base.metadata
 
 from .controls import Control, ControlType
-from .kits import KitType, ReagentType, Reagent
+from .kits import KitType, ReagentType, Reagent, Discount
 from .organizations import Organization, Contact
 from .samples import WWSample, BCSample
 from .submissions import BasicSubmission, BacterialCulture, Wastewater

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

@@ -25,7 +25,9 @@ class KitType(Base):
     submissions = relationship("BasicSubmission", back_populates="extraction_kit") #: submissions this kit was used for
     used_for = Column(JSON) #: list of names of sample types this kit can process
     cost_per_run = Column(FLOAT(2)) #: dollar amount for each full run of this kit NOTE: depreciated, use the constant and mutable costs instead
-    mutable_cost = Column(FLOAT(2)) #: dollar amount per plate that can change with number of columns (reagents, tips, etc)
+    # TODO: Change below to 'mutable_cost_column' and 'mutable_cost_sample' before moving to production.
+    mutable_cost_column = Column(FLOAT(2)) #: dollar amount per 96 well plate that can change with number of columns (reagents, tips, etc)
+    mutable_cost_sample = Column(FLOAT(2)) #: dollar amount that can change with number of samples (reagents, tips, etc)
     constant_cost = Column(FLOAT(2)) #: dollar amount per plate that will remain constant (plates, man hours, etc)
     reagent_types = relationship("ReagentType", back_populates="kits", uselist=True, secondary=reagenttypes_kittypes) #: reagent types this kit contains
     reagent_types_id = Column(INTEGER, ForeignKey("_reagent_types.id", ondelete='SET NULL', use_alter=True, name="fk_KT_reagentstype_id")) #: joined reagent type id
@@ -113,13 +115,16 @@ class Reagent(Base):
         }
     
 
-# class Discounts(Base):
-#     """
-#     Relationship table for client labs for certain kits.
-#     """
-#     __tablename__ = "_discounts"
+class Discount(Base):
+    """
+    Relationship table for client labs for certain kits.
+    """
+    __tablename__ = "_discounts"
 
-#     id = Column(INTEGER, primary_key=True) #: primary key
-#     kit = relationship("KitType") #: joined parent reagent type
-#     kit_id = Column(INTEGER, ForeignKey("_kits.id", ondelete='SET NULL', name="fk_kit_type_id"))
-#     client = relationship("Organization")
+    id = Column(INTEGER, primary_key=True) #: primary key
+    kit = relationship("KitType") #: joined parent reagent type
+    kit_id = Column(INTEGER, ForeignKey("_kits.id", ondelete='SET NULL', name="fk_kit_type_id"))
+    client = relationship("Organization") #: joined client lab
+    client_id = Column(INTEGER, ForeignKey("_organizations.id", ondelete='SET NULL', name="fk_org_id"))
+    name = Column(String(128))
+    amount = Column(FLOAT(2))

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

@@ -8,6 +8,7 @@ from datetime import datetime as dt
 import logging
 import json
 from json.decoder import JSONDecodeError
+from math import ceil
 
 logger = logging.getLogger(f"submissions.{__name__}")
 
@@ -151,6 +152,8 @@ class BasicSubmission(Base):
             "Cost": self.run_cost
         }
         return output
+    
+    
 
 # Below are the custom submission types
 
@@ -174,6 +177,18 @@ class  BacterialCulture(BasicSubmission):
         return output
     
 
+    def calculate_base_cost(self):
+        try:
+            cols_count_96 = ceil(int(self.sample_count) / 8)
+        except Exception as e:
+            logger.error(f"Column count error: {e}")
+        # cols_count_24 = ceil(int(self.sample_count) / 3)
+        try:
+            self.run_cost = self.extraction_kit.constant_cost + (self.extraction_kit.mutable_cost_column * cols_count_96) + (self.extraction_kit.mutable_cost_sample * int(self.sample_count))
+        except Exception as e:
+            logger.error(f"Calculation error: {e}")
+    
+
 class Wastewater(BasicSubmission):
     """
     derivative submission type from BasicSubmission
@@ -195,4 +210,16 @@ class Wastewater(BasicSubmission):
             output['pcr_info'] = json.loads(self.pcr_info)
         except TypeError as e:
             pass
-        return output
+        return output
+    
+    def calculate_base_cost(self):
+        try:
+            cols_count_96 = ceil(int(self.sample_count) / 8) + 1 #: Adding in one column to account for 24 samples + ext negatives
+        except Exception as e:
+            logger.error(f"Column count error: {e}")
+        # cols_count_24 = ceil(int(self.sample_count) / 3)
+        try:
+            self.run_cost = self.extraction_kit.constant_cost + (self.extraction_kit.mutable_cost_column * cols_count_96) + (self.extraction_kit.mutable_cost_sample * int(self.sample_count))
+        except Exception as e:
+            logger.error(f"Calculation error: {e}")
+