Fixing PrepTemplate creation, deletion and study property

Author: josenavas

qiita_db/metadata_template/prep_template.py

@@ -77,16 +77,13 @@ class PrepTemplate(MetadataTemplate):
     _filepath_table = 'prep_template_filepath'
 
     @classmethod
-    def create(cls, md_template, raw_data, study, data_type,
-               investigation_type=None):
+    def create(cls, md_template, study, data_type, investigation_type=None):
         r"""Creates the metadata template in the database
 
         Parameters
         ----------
         md_template : DataFrame
             The metadata template file contents indexed by samples Ids
-        raw_data : RawData
-            The raw_data to which the prep template belongs to.
         study : Study
             The study to which the prep template belongs to.
         data_type : str or int
@@ -111,7 +108,7 @@ def create(cls, md_template, raw_data, study, data_type,
 
         # Get a connection handler
         conn_handler = SQLConnectionHandler()
-        queue_name = "CREATE_PREP_TEMPLATE_%d" % raw_data.id
+        queue_name = "CREATE_PREP_TEMPLATE_%d" % study.id
         conn_handler.create_queue(queue_name)
 
         # Check if the data_type is the id or the string
@@ -134,14 +131,19 @@ def create(cls, md_template, raw_data, study, data_type,
         # We need the prep_id for multiple calls below, which currently is not
         # supported by the queue system. Thus, executing this outside the queue
         prep_id = conn_handler.execute_fetchone(
-            "INSERT INTO qiita.prep_template (data_type_id, raw_data_id, "
-            "investigation_type) VALUES (%s, %s, %s) RETURNING "
-            "prep_template_id", (data_type_id, raw_data.id,
-                                 investigation_type))[0]
+            "INSERT INTO qiita.prep_template "
+            "(data_type_id, investigation_type) "
+            "VALUES (%s, %s) RETURNING prep_template_id",
+            (data_type_id, investigation_type))[0]
 
         cls._add_common_creation_steps_to_queue(md_template, prep_id,
                                                 conn_handler, queue_name)
 
+        # Link the prep template with the study
+        sql = ("INSERT INTO qiita.study_prep_template "
+               "(study_id, prep_template_id) VALUES (%s, %s)")
+        conn_handler.add_to_queue(queue_name, sql, (study.id, prep_id))
+
         try:
             conn_handler.execute_queue(queue_name)
         except Exception:
@@ -244,6 +246,11 @@ def delete(cls, id_):
                                                           cls._id_column),
             (id_,))
 
+        # Remove the row from study_prep_template
+        conn_handler.execute(
+            "DELETE FROM qiita.study_prep_template "
+            "WHERE {0} = %s".format(cls._id_column), (id_,))
+
         # Remove the row from prep_template
         conn_handler.execute(
             "DELETE FROM qiita.prep_template where "
@@ -365,10 +372,9 @@ def study_id(self):
             The ID of the study with which this prep template is associated
         """
         conn = SQLConnectionHandler()
-        sql = ("SELECT srd.study_id FROM qiita.prep_template pt JOIN "
-               "qiita.study_raw_data srd ON pt.raw_data_id = srd.raw_data_id "
-               "WHERE prep_template_id = %d" % self.id)
-        study_id = conn.execute_fetchone(sql)
+        sql = ("SELECT study_id FROM qiita.study_prep_template "
+               "WHERE prep_template_id=%s")
+        study_id = conn.execute_fetchone(sql, (self.id,))
         if study_id:
             return study_id[0]
         else: