Merge pull request #169 from willemarcel/develop

Mapping team model & filters + delete users endpoint

Author: willemarcel

osmchadjango/changeset/filters.py

@@ -1,3 +1,5 @@
+import json
+
 from django.contrib.gis.geos import Polygon
 from django.db.models import Count
 
@@ -8,6 +10,7 @@
 from django_filters.widgets import BooleanWidget
 
 from .models import Changeset
+from ..users.models import MappingTeam
 
 
 class ChangesetFilter(GeoFilterSet):
@@ -88,6 +91,25 @@ class ChangesetFilter(GeoFilterSet):
         help_text="""If True, it will get only the changesets created by the
             users that you blacklisted."""
         )
+    mapping_teams = filters.CharFilter(
+        name='user',
+        method='filter_mapping_team',
+        help_text="""Filter changesets created by users that are on a Mapping
+            Team. It accepts a list of teams separated by commas."""
+        )
+    exclude_teams = filters.CharFilter(
+        name='user',
+        method='exclude_mapping_team',
+        help_text="""Exclude changesets created by users that are on a Mapping
+            Team. It accepts a list of teams separated by commas."""
+        )
+    exclude_trusted_teams = filters.BooleanFilter(
+        name=None,
+        method='filter_hide_trusted_teams',
+        widget=BooleanWidget(),
+        help_text="""If True, it will exclude the changesets created by the
+            users that are part of trusted teams."""
+        )
     area_lt = filters.CharFilter(
         name=None,
         method='filter_area_lt',
@@ -233,6 +255,45 @@ def filter_blacklist(self, queryset, name, value):
         else:
             return queryset
 
+    def get_username_from_teams(self, teams):
+        users = []
+        for i in teams.values_list('users', flat=True):
+            values = i
+            if type(values) in[str, bytes, bytearray]:
+                values = json.loads(values)
+            for e in values:
+                users.append(e.get('username'))
+        return users
+
+    def filter_mapping_team(self, queryset, name, value):
+        try:
+            # added `if team` to avoid empty strings
+            teams = MappingTeam.objects.filter(
+                name__in=[team.strip() for team in value.split(',') if team]
+                )
+            users = self.get_username_from_teams(teams)
+            return queryset.filter(user__in=users)
+        except MappingTeam.DoesNotExist:
+            return queryset
+
+    def exclude_mapping_team(self, queryset, name, value):
+        try:
+            teams = MappingTeam.objects.filter(
+                name__in=[team.strip() for team in value.split(',') if team]
+                )
+            users = self.get_username_from_teams(teams)
+            return queryset.exclude(user__in=users)
+        except MappingTeam.DoesNotExist:
+            return queryset
+
+    def filter_hide_trusted_teams(self, queryset, name, value):
+        teams = MappingTeam.objects.filter(trusted=True)
+        users = self.get_username_from_teams(teams)
+        if users:
+            return queryset.exclude(user__in=users)
+        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/modelfactories.py

@@ -9,6 +9,7 @@
 
 from ..models import Changeset, SuspicionReasons, UserWhitelist, Tag
 from ...feature.models import Feature
+from ...users.models import MappingTeam
 
 
 class UserFactory(factory.django.DjangoModelFactory):
@@ -93,3 +94,13 @@ class Meta:
     geojson = json.dumps(
         {'properties': {'osm:type': 'node', 'name': 'Test', 'building':'yes'}}
         )
+
+
+class MappingTeamFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = MappingTeam
+
+    name = "Map Company"
+    trusted = True
+    created_by = factory.SubFactory(UserFactory)
+    users = []

osmchadjango/changeset/tests/test_changeset_views.py

@@ -13,7 +13,8 @@
 from ..views import ChangesetListAPIView, PaginatedCSVRenderer
 from .modelfactories import (
     ChangesetFactory, SuspectChangesetFactory, GoodChangesetFactory,
-    HarmfulChangesetFactory, TagFactory, UserWhitelistFactory
+    HarmfulChangesetFactory, TagFactory, UserWhitelistFactory,
+    MappingTeamFactory
     )
 
 
@@ -148,6 +149,82 @@ def test_blacklisted_filter(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.data['count'], 53)
 
+    def test_mapping_team_filter(self):
+        ChangesetFactory(uid=444, user='the_user')
+        self.team = MappingTeamFactory(
+            name="TestCompany",
+            users=json.dumps([{
+                "username": "test",
+                "doj": "2017-02-13T00:00:00Z",
+                "uid": "123123",
+                "dol": ""
+                }])
+            )
+        self.team_2 = MappingTeamFactory(
+            name="MapCompany",
+            trusted=False,
+            users=json.dumps([{
+                "username": "the_user",
+                "doj": "2017-02-13T00:00:00Z",
+                "uid": "444",
+                "dol": ""
+                }])
+            )
+        self.client.login(username=self.user.username, password='password')
+        # mapping_teams tests
+        response = self.client.get(self.url, {'mapping_teams': self.team.name})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 52)
+
+        response = self.client.get(self.url, {'mapping_teams': self.team_2.name})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 1)
+
+        response = self.client.get(
+            self.url,
+            {'mapping_teams': 'TestCompany,MapCompany'}
+            )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 53)
+
+        response = self.client.get(
+            self.url,
+            {'mapping_teams': 'TestCompany, MapCompany'}
+            )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 53)
+
+        # exclude_teams tests
+        response = self.client.get(self.url, {'exclude_teams': self.team.name})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 1)
+
+        response = self.client.get(self.url, {'exclude_teams': self.team_2.name})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 52)
+
+        response = self.client.get(
+            self.url,
+            {'exclude_teams': 'TestCompany,MapCompany'}
+            )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 0)
+
+        response = self.client.get(
+            self.url,
+            {'exclude_teams': 'TestCompany, MapCompany'}
+            )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 0)
+
+        # exclude trusted teams
+        response = self.client.get(
+            self.url,
+            {'exclude_trusted_teams': 'true'}
+            )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 1)
+
     def test_csv_renderer(self):
         self.assertIn(
             PaginatedCSVRenderer,

osmchadjango/changeset/tests/test_filters.py

@@ -1,4 +1,5 @@
 from datetime import date, timedelta
+import json
 
 from django.contrib.gis.geos import Polygon
 from django.utils import timezone
@@ -9,7 +10,7 @@
 from .modelfactories import (
     ChangesetFactory, SuspectChangesetFactory, UserFactory,
     HarmfulChangesetFactory, GoodChangesetFactory, SuspicionReasonsFactory,
-    TagFactory
+    TagFactory, MappingTeamFactory
     )
 
 
@@ -266,6 +267,61 @@ def test_tags_filter(self):
             0
             )
 
+    def test_mapping_team_filter(self):
+        self.changeset = ChangesetFactory(
+            user='mapbox_user',
+            uid=3476,
+            id=9876,
+            editor='iD 2.0.2',
+            comment='My first edit',
+            )
+        self.mapbox_team = MappingTeamFactory(
+            name="Mapbox",
+            users=json.dumps([{
+                "username": "mapbox_user",
+                "doj": "2017-02-13T00:00:00Z",
+                "uid": "3476",
+                "dol": ""
+                },
+                ])
+            )
+        self.team = MappingTeamFactory(
+            users=json.dumps([{
+                "username": "test",
+                "doj": "2017-02-13T00:00:00Z",
+                "uid": "123123",
+                "dol": ""
+                }])
+            )
+        self.assertEqual(
+            ChangesetFilter({'mapping_teams': self.team.name}).qs.count(),
+            3
+            )
+        self.assertEqual(
+            ChangesetFilter({'mapping_teams': self.mapbox_team.name}).qs.count(),
+            1
+            )
+        self.assertEqual(
+            ChangesetFilter({
+                'mapping_teams': "{},{}".format(self.team.name, self.mapbox_team.name)
+                }).qs.count(),
+            4
+            )
+        self.assertEqual(
+            ChangesetFilter({'exclude_teams': self.team.name}).qs.count(),
+            2
+            )
+        self.assertEqual(
+            ChangesetFilter(
+                {'exclude_teams': "{},{}".format(self.team.name, self.mapbox_team.name)}
+                ).qs.count(),
+            1
+            )
+        self.assertEqual(
+            ChangesetFilter({'exclude_trusted_teams': 'true'}).qs.count(),
+            1
+            )
+
 
 class TestChangesetAreaLowerThan(TestCase):
     def setUp(self):

osmchadjango/supervise/views.py

@@ -5,19 +5,19 @@
 from django.urls import reverse
 
 from rest_framework.generics import (
-    ListCreateAPIView, ListAPIView, RetrieveUpdateDestroyAPIView, get_object_or_404
+    ListCreateAPIView, ListAPIView, RetrieveUpdateDestroyAPIView,
+    get_object_or_404
     )
 from rest_framework.response import Response
 from rest_framework.filters import OrderingFilter
 from rest_framework.permissions import (
-    IsAuthenticated, IsAdminUser, BasePermission, SAFE_METHODS
+    IsAuthenticated, BasePermission, SAFE_METHODS
     )
 
 from ..changeset.serializers import (
     ChangesetSerializer, ChangesetSerializerToStaff, ChangesetStatsSerializer
     )
 from ..changeset.views import StandardResultsSetPagination
-from ..changeset.filters import ChangesetFilter
 from .models import AreaOfInterest, BlacklistedUser
 from .serializers import (
     AreaOfInterestSerializer, BlacklistSerializer,

osmchadjango/users/migrations/0010_auto_20190123_1129.py

@@ -0,0 +1,36 @@
+# Generated by Django 2.0.9 on 2019-01-23 11:29
+
+from django.conf import settings
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0009_auto_20180307_1417'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MappingTeam',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(db_index=True, max_length=255)),
+                ('date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
+                ('trusted', models.BooleanField(default=False)),
+                ('users', django.contrib.postgres.fields.jsonb.JSONField(default=list)),
+                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Mapping Team',
+                'verbose_name_plural': 'Mapping Teams',
+                'ordering': ['date'],
+            },
+        ),
+        migrations.AlterUniqueTogether(
+            name='mappingteam',
+            unique_together={('created_by', 'name')},
+        ),
+    ]

osmchadjango/users/migrations/0011_auto_20190206_1257.py

@@ -0,0 +1,22 @@
+# Generated by Django 2.0.10 on 2019-02-06 12:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0010_auto_20190123_1129'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='mappingteam',
+            name='name',
+            field=models.CharField(db_index=True, max_length=255, unique=True),
+        ),
+        migrations.AlterUniqueTogether(
+            name='mappingteam',
+            unique_together=set(),
+        ),
+    ]

osmchadjango/users/models.py

@@ -3,11 +3,10 @@
 
 from django.contrib.auth.models import AbstractUser
 from django.db import models
-# from django.utils.translation import ugettext_lazy as _
+from django.contrib.postgres.fields import JSONField
 
 
 class User(AbstractUser):
-
     # First Name and Last Name do not cover name patterns around the globe.
     name = models.CharField(
         "Name of User", blank=True, max_length=255, db_index=True
@@ -27,3 +26,19 @@ class User(AbstractUser):
 
     def __str__(self):
         return self.username
+
+
+class MappingTeam(models.Model):
+    name = models.CharField(max_length=255, db_index=True, unique=True)
+    date = models.DateTimeField("Creation Date", auto_now_add=True)
+    trusted = models.BooleanField(default=False)
+    users = JSONField(default=list)
+    created_by = models.ForeignKey(User, on_delete=models.CASCADE)
+
+    def __str__(self):
+        return '{} by {}'.format(self.name, self.created_by.username)
+
+    class Meta:
+        ordering = ['date']
+        verbose_name = 'Mapping Team'
+        verbose_name_plural = 'Mapping Teams'