Attempt at spinning off clientsubmission.

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

@@ -94,6 +94,14 @@ equipment_tips = Table(
     extend_existing=True
 )
 
+kittypes_submissions = Table(
+    "_kittypes_submissions",
+    Base.metadata,
+    Column("_basicsubmission_id", INTEGER, ForeignKey("_basicsubmission.id")),
+    Column("kittype_id", INTEGER, ForeignKey("_kittype.id")),
+    extend_existing=True
+)
+
 
 class KitType(BaseClass):
     """
@@ -104,7 +112,8 @@ class KitType(BaseClass):
 
     id = Column(INTEGER, primary_key=True)  #: primary key
     name = Column(String(64), unique=True)  #: name of kit
-    submissions = relationship("BasicSubmission", back_populates="extraction_kit")  #: submissions this kit was used for
+    submissions = relationship("BasicSubmission", back_populates="kittypes",
+                               secondary=kittypes_submissions)  #: submissions this kit was used for
     processes = relationship("Process", back_populates="kit_types",
                              secondary=kittypes_processes)  #: equipment processes used by this kit
 
@@ -1039,9 +1048,9 @@ class SubmissionType(BaseClass):
     }
     """
 
-    submissiontype_kit_associations = relationship(
-        "SubmissionTypeKitTypeAssociation",
-        back_populates="submission_type",
+    runtype_kit_associations = relationship(
+        "RunTypeKitTypeAssociation",
+        back_populates="runtype",
         cascade="all, delete-orphan",
     )  #: Association of kittypes
 

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

@@ -31,7 +31,7 @@ class Organization(BaseClass):
 
     id = Column(INTEGER, primary_key=True)  #: primary key
     name = Column(String(64))  #: organization name
-    submissions = relationship("BasicSubmission",
+    submissions = relationship("ClientSubmission",
                                back_populates="submitting_lab")  #: submissions this organization has submitted
     cost_centre = Column(String())  #: cost centre used by org for payment
     contacts = relationship("Contact", back_populates="organization",
@@ -103,7 +103,7 @@ class Contact(BaseClass):
     phone = Column(String(32))  #: contact phone number
     organization = relationship("Organization", back_populates="contacts", uselist=True,
                                 secondary=orgs_contacts)  #: relationship to joined organization
-    submissions = relationship("BasicSubmission", back_populates="contact")  #: submissions this contact has submitted
+    submissions = relationship("ClientSubmission", back_populates="contact")  #: submissions this contact has submitted
 
     @classproperty
     def searchables(cls):