move default analysis pull to user object

qiita_db/analysis.py

@@ -78,26 +78,6 @@ def _status_setter_checks(self, conn_handler):
         if self.check_status({"public"}):
             raise QiitaDBStatusError("Can't set status away from public!")
 
-    @classmethod
-    def get_user_default(cls, user):
-        """Returns the analysis object being used as default sample holder
-
-        Parameters
-        ----------
-        user : User object
-            The user to get the default for
-
-        Returns
-        -------
-        Analysis object
-            The analysis used as default
-        """
-        conn_handler = SQLConnectionHandler()
-        aid = conn_handler.execute_fetchone(
-            "SELECT analysis_id FROM qiita.analysis WHERE "
-            "email = %s AND dflt = true", [user.id])[0]
-        return cls(aid)
-
     @classmethod
     def get_by_status(cls, status):
         """Returns analysis ids for all Analyses with given status

qiita_db/test/test_analysis.py

@@ -72,11 +72,6 @@ def test_get_by_status(self):
         self.analysis.status = "public"
         self.assertEqual(Analysis.get_by_status('public'), {1})
 
-    def test_get_user_default(self):
-        obs = Analysis.get_user_default(User('admin@foo.bar'))
-        exp = Analysis(4)
-        self.assertEqual(obs.id, exp.id)
-
     def test_has_access_public(self):
         self.conn_handler.execute("UPDATE qiita.analysis SET "
                                   "analysis_status_id = 6")

qiita_db/test/test_user.py

@@ -219,6 +219,10 @@ def test_set_info_bad_info(self):
         with self.assertRaises(QiitaDBColumnError):
             self.user.info = self.userinfo
 
+    def test_default_analysis(self):
+        obs = self.user.default_analysis
+        self.assertEqual(obs, 4)
+
     def test_get_user_studies(self):
         user = User('test@foo.bar')
         self.assertEqual(user.user_studies, {1})

qiita_db/user.py

@@ -340,6 +340,13 @@ def info(self, info):
                "email = %s".format(self._table, ','.join(sql_insert)))
         conn_handler.execute(sql, data)
 
+    @property
+    def default_analysis(self):
+        sql = ("SELECT analysis_id FROM qiita.analysis WHERE email = %s AND "
+               "dflt = true")
+        conn_handler = SQLConnectionHandler()
+        return conn_handler.execute_fetchone(sql, [self._id])[0]
+
     @property
     def sandbox_studies(self):
         """Returns a list of sandboxed study ids owned by the user"""