Skip to content

Hide Banned Projects from the Site #6231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Hide Banned Projects from the Site #6231

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5060dab
Hide Banned Projects from the Site
saadmk11 Oct 1, 2019
600527b
lint fix
saadmk11 Oct 1, 2019
b51135d
Tests Added
saadmk11 Oct 2, 2019
4c26279
Show projects with no users or no user profiles
saadmk11 Oct 9, 2019
8d69863
move user not banned filter to instance variable
saadmk11 Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions readthedocs/projects/querysets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,32 @@ def for_admin_user(self, user):

def public(self, user=None):
queryset = self.filter(
privacy_level=constants.PUBLIC,
users__profile__banned=False
Q(users__profile__banned=False) |
Q(users__profile__isnull=True) |
Q(users__isnull=True),
privacy_level=constants.PUBLIC
)
if user:
queryset = self._add_user_repos(queryset, user)
return queryset.distinct()

def protected(self, user=None):
queryset = self.filter(
privacy_level__in=[constants.PUBLIC, constants.PROTECTED],
users__profile__banned=False
Q(users__profile__banned=False) |
Q(users__profile__isnull=True) |
Q(users__isnull=True),
privacy_level__in=[constants.PUBLIC, constants.PROTECTED]
)
if user:
queryset = self._add_user_repos(queryset, user)
return queryset.distinct()

def private(self, user=None):
queryset = self.filter(
privacy_level=constants.PRIVATE,
users__profile__banned=False
Q(users__profile__banned=False) |
Q(users__profile__isnull=True) |
Q(users__isnull=True),
privacy_level=constants.PRIVATE
)
if user:
queryset = self._add_user_repos(queryset, user)
Expand Down
35 changes: 27 additions & 8 deletions readthedocs/rtd_tests/tests/test_project_querysets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ def setUp(self):
users=[self.user],
main_language_project=None,
)
self.project_no_user = get(
Project,
privacy_level=PUBLIC,
main_language_project=None,
)
self.project_private = get(
Project,
privacy_level=PRIVATE,
Expand Down Expand Up @@ -203,6 +208,7 @@ def test_public(self):
query = Project.objects.public()
projects = {
self.project,
self.project_no_user,
self.another_project,
self.shared_project,
}
Expand All @@ -215,6 +221,7 @@ def test_public_excludes_banned_projects(self):

query = Project.objects.public()
projects = {
self.project_no_user,
self.another_project,
self.shared_project,
}
Expand All @@ -225,15 +232,15 @@ def test_public_user(self):
query = Project.objects.public(user=self.user)
projects = (
self.user_projects |
{self.another_project}
{self.project_no_user, self.another_project}
)
self.assertEqual(query.count(), len(projects))
self.assertEqual(set(query), projects)

query = Project.objects.public(user=self.another_user)
projects = (
self.another_user_projects |
{self.project}
{self.project, self.project_no_user}
)
self.assertEqual(query.count(), len(projects))
self.assertEqual(set(query), projects)
Expand All @@ -245,14 +252,15 @@ def test_public_with_banned_user(self):
query = Project.objects.public(user=self.user)
projects = (
self.user_projects |
{self.another_project}
{self.project_no_user, self.another_project}
)
self.assertEqual(query.count(), len(projects))
self.assertEqual(set(query), projects)

query = Project.objects.public(user=self.another_user)
projects = (
self.another_user_projects
self.another_user_projects |
{self.project_no_user}
)
self.assertEqual(query.count(), len(projects))
self.assertEqual(set(query), projects)
Expand All @@ -262,6 +270,7 @@ def test_protected(self):
query = Project.objects.protected()
projects = {
self.project,
self.project_no_user,
self.project_protected,
self.another_project,
self.another_project_protected,
Expand All @@ -277,6 +286,7 @@ def test_protected_excludes_banned_projects(self):

query = Project.objects.protected()
projects = {
self.project_no_user,
self.another_project,
self.another_project_protected,
self.shared_project,
Expand All @@ -289,15 +299,19 @@ def test_protected_user(self):
query = Project.objects.protected(user=self.user)
projects = (
self.user_projects |
{self.another_project, self.another_project_protected}
{
self.project_no_user,
self.another_project,
self.another_project_protected
}
)
self.assertEqual(query.count(), len(projects))
self.assertEqual(set(query), projects)

query = Project.objects.protected(user=self.another_user)
projects = (
self.another_user_projects |
{self.project, self.project_protected}
{self.project, self.project_protected, self.project_no_user}
)
self.assertEqual(query.count(), len(projects))
self.assertEqual(set(query), projects)
Expand All @@ -309,14 +323,19 @@ def test_protected_with_banned_user(self):
query = Project.objects.protected(user=self.user)
projects = (
self.user_projects |
{self.another_project, self.another_project_protected}
{
self.project_no_user,
self.another_project,
self.another_project_protected
}
)
self.assertEqual(query.count(), len(projects))
self.assertEqual(set(query), projects)

query = Project.objects.protected(user=self.another_user)
projects = (
self.another_user_projects
self.another_user_projects |
{self.project_no_user}
)
self.assertEqual(query.count(), len(projects))
self.assertEqual(set(query), projects)
Expand Down