merge upstream/master

qiita_db/data.py

@@ -1330,3 +1330,40 @@ def samples(self):
         # Get samples from dynamic table
         sql = "SELECT sample_id FROM qiita.prep_%d" % prep_id
         return set(s[0] for s in conn_handler.execute_fetchall(sql))
+
+    @property
+    def status(self):
+        conn_handler = SQLConnectionHandler()
+        sql = """SELECT pds.processed_data_status
+                FROM qiita.processed_data_status pds
+                  JOIN qiita.processed_data pd
+                    USING (processed_data_status_id)
+                WHERE pd.processed_data_id=%s"""
+        return conn_handler.execute_fetchone(sql, (self._id,))[0]
+
+    @status.setter
+    def status(self, status):
+        """Set the status value
+
+        Parameters
+        ----------
+        status : str
+            The new status
+
+        Raises
+        ------
+        QiitaDBStatusError
+            If the processed data status is public
+        """
+        if self.status == 'public':
+            raise QiitaDBStatusError(
+                "Illegal operation on public processed data")
+
+        conn_handler = SQLConnectionHandler()
+
+        status_id = convert_to_id(status, 'processed_data_status',
+                                  conn_handler=conn_handler)
+
+        sql = """UPDATE qiita.{0} SET processed_data_status_id = %s
+                 WHERE processed_data_id=%s""".format(self._table)
+        conn_handler.execute(sql, (status_id, self._id))

qiita_db/test/test_data.py

@@ -945,5 +945,64 @@ def test_samples(self):
             '1.SKM5.640177', '1.SKM7.640188', '1.SKD7.640191'}
         self.assertEqual(obs, exp)
 
+    def test_status(self):
+        pd = ProcessedData(1)
+        self.assertEqual(pd.status, 'private')
+
+        pd = ProcessedData.create(self.params_table, self.params_id,
+                                  self.filepaths,
+                                  preprocessed_data=self.preprocessed_data)
+        self.assertEqual(pd.status, 'sandbox')
+
+    def test_status_setter(self):
+        pd = ProcessedData(1)
+        self.assertEqual(pd.status, 'private')
+
+        pd.status = 'sandbox'
+        self.assertEqual(pd.status, 'sandbox')
+
+    def test_status_setter_error(self):
+        pd = ProcessedData(1)
+        pd.status = 'public'
+        self.assertEqual(pd.status, 'public')
+
+        with self.assertRaises(QiitaDBStatusError):
+            pd.status = 'sandbox'
+
+    def test_status_setter_error_not_existant(self):
+        pd = ProcessedData(1)
+        with self.assertRaises(IncompetentQiitaDeveloperError):
+            pd.status = 'does-not-exist'
+
+    def test_get_by_status(self):
+        pds = ProcessedData.get_by_status('sandbox')
+        self.assertEqual(pds, set())
+
+        pds = ProcessedData.get_by_status('private')
+        self.assertEqual(pds, set([1]))
+
+        ProcessedData.create(self.params_table, self.params_id,
+                             self.filepaths,
+                             preprocessed_data=self.preprocessed_data)
+        pds = ProcessedData.get_by_status('sandbox')
+        self.assertEqual(pds, set([2]))
+
+        pds = ProcessedData.get_by_status('private')
+        self.assertEqual(pds, set([1]))
+
+    def test_get_by_status_grouped_by_study(self):
+        obs = ProcessedData.get_by_status_grouped_by_study('sandbox')
+        self.assertEqual(obs, dict())
+
+        obs = ProcessedData.get_by_status_grouped_by_study('private')
+        self.assertEqual(obs, {1: [1]})
+
+        ProcessedData.create(self.params_table, self.params_id,
+                             self.filepaths,
+                             preprocessed_data=self.preprocessed_data)
+        obs = ProcessedData.get_by_status_grouped_by_study('sandbox')
+        self.assertEqual(obs, {1: [2]})
+
+
 if __name__ == '__main__':
     main()