Merge branch 'bump' into 'master'

Bump

See merge request edb/django-postfix-dovecot-api!2

dpdapi/filters.py

@@ -1,16 +1,16 @@
 import django_filters
+from rest_framework.filters import BaseFilterBackend
 
 from dpdapi.models import Alias
-from rest_framework.filters import BaseFilterBackend
 
 
 class AliasRegexFilter(django_filters.FilterSet):
-    # Ref: https://docs.djangoproject.com/en/1.7/ref/models/querysets/#iregex
-    source_regex = django_filters.CharFilter(name="source", lookup_type='iregex')
-    destination_regex = django_filters.CharFilter(name="destination", lookup_type='iregex')
-
     class Meta:
         model = Alias
+        fields = {
+            'source': ['iregex', 'regex'],
+            'destination': ['iregex', 'regex']
+        }
 
 
 class AliasRegexFilterBackend(BaseFilterBackend):

dpdapi/models.py

@@ -1,6 +1,4 @@
-from __future__ import unicode_literals
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 
 
 class BaseModel(models.Model):
@@ -11,7 +9,6 @@ class BaseModel(models.Model):
         abstract = True
 
 
-@python_2_unicode_compatible
 class Alias(BaseModel):
     source = models.EmailField(max_length=254)
     destination = models.EmailField(max_length=254)
@@ -32,7 +29,6 @@ class Alias(BaseModel):
         unique_together = ('source', 'destination', 'domain')
 
 
-@python_2_unicode_compatible
 class Domain(BaseModel):
     name = models.CharField(max_length=254, unique=True)
 
@@ -45,7 +41,6 @@ class Domain(BaseModel):
         super(Domain, self).save(*args, **kwargs)
 
 
-@python_2_unicode_compatible
 class User(BaseModel):
     email = models.EmailField(max_length=254, unique=True)
     password = models.CharField(max_length=109)

dpdapi/serializers.py

@@ -14,6 +14,7 @@ class AliasSerializer(serializers.ModelSerializer):
     class Meta:
         model = Alias
         validators = []  # Disable unique togheter check
+        fields = '__all__'
 
 
 class AliasDeleteSerializer(serializers.ModelSerializer):
@@ -25,11 +26,13 @@ class AliasDeleteSerializer(serializers.ModelSerializer):
 class DomainSerializer(serializers.ModelSerializer):
     class Meta:
         model = Domain
+        fields = '__all__'
 
 
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
+        fields = '__all__'
         extra_kwargs = {'password': {'write_only': True}}
 
     def _hash_password(self, raw_password):

dpdapi/tests.py

@@ -1,3 +1,36 @@
-from django.test import TestCase
+from django.contrib.auth.models import User
+from django.test import override_settings
+from django.urls import reverse
+from rest_framework.test import APITestCase
 
-# Create your tests here.
+from dpdapi.models import Domain, Alias
+
+
+class RegexTestCase(APITestCase):
+    aliases = ['ops-alert@example.com', 'yolo-announce@example.com']
+
+    def setUp(self):
+        user = User.objects.create(username='yolo')
+        d = Domain.objects.create(name='example.com')
+        for a in self.aliases:
+            Alias.objects.create(source=a, destination='ninja@example.com', domain=d)
+        self.client.force_login(user)
+
+    def test_get_all(self):
+        res = self.client.get(reverse('alias-list'))
+        self.assertEqual(len(res.data), len(self.aliases))
+
+    def test_domain_filter(self):
+        params = {'domain__name': 'example.com'}
+        res = self.client.get(reverse('alias-list'), data=params)
+        self.assertEqual(len(res.data), len(self.aliases))
+
+    def test_domain_filter_no_hits(self):
+        params = {'domain__name': 'zexample.com'}
+        res = self.client.get(reverse('alias-list'), data=params)
+        self.assertEqual(len(res.data), 0)
+
+    def test_regex_filter(self):
+        params = {'source__regex': '^ops-|^ops@'}
+        res = self.client.get(reverse('alias-list'), data=params)
+        self.assertEqual(len(res.data), 1)

dpdapi/views.py

@@ -1,29 +1,30 @@
 from __future__ import unicode_literals
 import logging
 import operator
-from django.utils import six
+
+from functools import reduce
 from django.db.models import Q
+from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.decorators import list_route
+from rest_framework.mixins import ListModelMixin
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
-from rest_framework import status, filters, viewsets
+from rest_framework import status, viewsets
+from rest_framework.viewsets import GenericViewSet
 
 from dpdapi.filters import AliasRegexFilterBackend
 from dpdapi.models import Alias, Domain, User
 from dpdapi.serializers import AliasSerializer, AliasDeleteSerializer, DomainSerializer, UserSerializer
 
-if six.PY3:
-    from functools import reduce
-
 logger = logging.getLogger(__name__)
 
 
-class AliasViewSet(viewsets.ModelViewSet):
+class AliasViewSet(ListModelMixin, GenericViewSet):
     """ Aliases """
     queryset = Alias.objects.all()
     serializer_class = AliasSerializer
     permission_classes = [IsAuthenticated]
-    filter_backends = (filters.DjangoFilterBackend, AliasRegexFilterBackend)
+    filter_backends = (DjangoFilterBackend, AliasRegexFilterBackend)
     filter_fields = ('domain', 'domain__name',)
 
     @list_route(methods=['post'])
@@ -65,7 +66,7 @@ class DomainViewSet(viewsets.ModelViewSet):
     queryset = Domain.objects.all()
     serializer_class = DomainSerializer
     permission_classes = [IsAuthenticated]
-    filter_backends = (filters.DjangoFilterBackend,)
+    filter_backends = (DjangoFilterBackend,)
     filter_fields = ('name',)
 
 

dpdapisite/settings.py

@@ -58,7 +58,9 @@ INSTALLED_APPS = (
 )
 
 INSTALLED_APPS += (
+    'django_extensions',
     'rest_framework',
+    'django_filters',
     'dpdapi',
 )
 
@@ -89,21 +91,15 @@ DATABASES = {
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.7/topics/i18n/
-
 LANGUAGE_CODE = 'en-us'
-
 TIME_ZONE = 'Europe/Oslo'
-
 USE_I18N = True
-
 USE_L10N = True
-
 USE_TZ = True
 
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
-
 STATIC_URL = '/static/'
 
 REST_FRAMEWORK = {

dpdapisite/urls.py

@@ -1,8 +1,8 @@
 from django.conf.urls import include, url
 from django.contrib import admin
 from django.views.generic import RedirectView
-from rest_framework import urls as rest_framework_urls
 
+from rest_framework import urls as rest_framework_urls
 from dpdapi import urls as dpdapi_urls
 
 

requirements.txt

@@ -1,8 +1,8 @@
-Django>=1.9,<1.10
-django-extensions==1.6.1
-django-filter==0.12.0
-djangorestframework>=3.3,<3.4
-Fabric==1.10.2
-gunicorn==19.4.5
-mysqlclient==1.3.7
-passlib==1.6.5
+Django==1.11.6
+django-extensions==1.9.6
+django-filter==1.1.0
+djangorestframework==3.7.1
+Fabric==1.14.0
+gunicorn==19.7.1
+mysqlclient==1.3.12
+passlib==1.7.1