diff --git a/zds/member/models.py b/zds/member/models.py index 2c8b50a049..5c0ff057d0 100644 --- a/zds/member/models.py +++ b/zds/member/models.py @@ -185,15 +185,6 @@ def get_user_beta_contents_queryset(self, _type=None): """ return self.get_user_contents_queryset(_type).filter(sha_beta__isnull=False) - def get_content_count(self, _type=None): - """ - :param _type: if provided, request a specific type of content - :return: the count of contents with this user as author. Count all contents no only published one. - """ - if self.is_private(): - return 0 - return self.get_user_contents_queryset(_type).count() - def get_contents(self, _type=None): """ :param _type: if provided, request a specific type of content @@ -231,12 +222,6 @@ def get_beta_contents(self, _type=None): """ return self.get_user_beta_contents_queryset(_type).all() - def get_tuto_count(self): - """ - :return: the count of tutorials with this user as author. Count all tutorials, no only published one. - """ - return self.get_content_count(_type="TUTORIAL") - def get_tutos(self): """ :return: All tutorials with this user as author. @@ -269,12 +254,6 @@ def get_beta_tutos(self): """ return self.get_beta_contents(_type="TUTORIAL") - def get_article_count(self): - """ - :return: the count of articles with this user as author. Count all articles, no only published one. - """ - return self.get_content_count(_type="ARTICLE") - def get_articles(self): """ :return: All articles with this user as author. @@ -307,12 +286,6 @@ def get_beta_articles(self): """ return self.get_beta_contents(_type="ARTICLE") - def get_opinion_count(self): - """ - :return: the count of opinions with this user as author. Count all opinions, no only published one. - """ - return self.get_content_count(_type="OPINION") - def get_opinions(self): """ :return: All opinions with this user as author. diff --git a/zds/member/tests/tests_models.py b/zds/member/tests/tests_models.py index 8f5d0c1532..c21c30b114 100644 --- a/zds/member/tests/tests_models.py +++ b/zds/member/tests/tests_models.py @@ -62,17 +62,6 @@ def test_get_topic_count(self): # Should be 1 self.assertEqual(self.user1.get_topic_count(), 1) - def test_get_tuto_count(self): - # Start with 0 - self.assertEqual(self.user1.get_tuto_count(), 0) - # Create Tuto ! - minituto = PublishableContentFactory(type="TUTORIAL") - minituto.authors.add(self.user1.user) - minituto.gallery = GalleryFactory() - minituto.save() - # Should be 1 - self.assertEqual(self.user1.get_tuto_count(), 1) - def test_get_tutos(self): # Start with 0 self.assertEqual(len(self.user1.get_tutos()), 0) @@ -140,17 +129,6 @@ def test_get_beta_tutos(self): self.assertEqual(len(betatetutos), 1) self.assertEqual(betatetuto, betatetutos[0]) - def test_get_article_count(self): - # Start with 0 - self.assertEqual(self.user1.get_tuto_count(), 0) - # Create article ! - minituto = PublishableContentFactory(type="ARTICLE") - minituto.authors.add(self.user1.user) - minituto.gallery = GalleryFactory() - minituto.save() - # Should be 1 - self.assertEqual(self.user1.get_article_count(), 1) - def test_get_articles(self): # Start with 0 self.assertEqual(len(self.user1.get_articles()), 0)