add the blacklist changeset filter field

Author: willemarcel

osmchadjango/changeset/filters.py

@@ -81,6 +81,13 @@ class ChangesetFilter(GeoFilterSet):
         help_text="""If True, it will exclude the changesets created by the
             users that you whitelisted."""
         )
+    blacklist = filters.BooleanFilter(
+        name=None,
+        method='filter_blacklist',
+        widget=BooleanWidget(),
+        help_text="""If True, it will get only the changesets created by the
+            users that you blacklisted."""
+        )
     area_lt = filters.CharFilter(
         name=None,
         method='filter_area_lt',
@@ -216,6 +223,16 @@ def filter_whitelist(self, queryset, name, value):
         else:
             return queryset
 
+    def filter_blacklist(self, queryset, name, value):
+        if (self.request is None or self.request.user.is_authenticated) and value:
+            blacklist = self.request.user.blacklisteduser_set.values_list(
+                'uid',
+                flat=True
+                )
+            return queryset.filter(uid__in=blacklist)
+        else:
+            return queryset
+
     def filter_checked_by(self, queryset, name, value):
         if (self.request is None or self.request.user.is_authenticated) and value:
             lookup = '__'.join([name, 'name__in'])

osmchadjango/changeset/tests/test_changeset_views.py

@@ -8,6 +8,7 @@
 from rest_framework.test import APITestCase
 
 from ...users.models import User
+from ...supervise.models import BlacklistedUser
 from ..models import SuspicionReasons, Tag, Changeset
 from ..views import ChangesetListAPIView, PaginatedCSVRenderer
 from .modelfactories import (
@@ -117,6 +118,36 @@ def test_hide_whitelist_filter(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.data['count'], 0)
 
+    def test_blacklisted_filter(self):
+        """Test getting changesets filtered by blacklisted users"""
+        ChangesetFactory(uid=444, user='the_user')
+        BlacklistedUser.objects.create(
+            uid='123123',
+            username='test',
+            added_by=self.user
+            )
+        self.client.login(username=self.user.username, password='password')
+        response = self.client.get(self.url, {'blacklist': 'false'})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 53)
+
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 53)
+
+        response = self.client.get(self.url, {'blacklist': 'true'})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 52)
+
+        BlacklistedUser.objects.create(
+            uid='444',
+            username='the_user',
+            added_by=self.user
+            )
+        response = self.client.get(self.url, {'blacklist': 'true'})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 53)
+
     def test_csv_renderer(self):
         self.assertIn(
             PaginatedCSVRenderer,