[refactor] Inherit from FilterByParent #354

Refactored BaseEmailView to inherit from FilterByParent and for that updated get_organization_queryset to override FilterByParent's method.

Fixes #354

Author: dee077

openwisp_users/api/views.py

@@ -1,11 +1,9 @@
 from allauth.account.models import EmailAddress
 from django.contrib.auth import get_user_model
-from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import pagination
 from rest_framework.authtoken.views import ObtainAuthToken
-from rest_framework.exceptions import NotFound
 from rest_framework.generics import (
     GenericAPIView,
     ListCreateAPIView,
@@ -20,6 +18,7 @@
 
 from openwisp_users.api.permissions import DjangoModelPermissions
 
+from .mixins import FilterByParent
 from .mixins import ProtectedAPIMixin as BaseProtectedAPIMixin
 from .serializers import (
     ChangePasswordSerializer,
@@ -198,7 +197,7 @@ def update(self, request, *args, **kwargs):
         )
 
 
-class BaseEmailView(ProtectedAPIMixin, GenericAPIView):
+class BaseEmailView(ProtectedAPIMixin, FilterByParent, GenericAPIView):
     model = EmailAddress
     serializer_class = EmailAddressSerializer
 
@@ -209,28 +208,21 @@ def initial(self, *args, **kwargs):
         super().initial(*args, **kwargs)
         self.assert_parent_exists()
 
-    def assert_parent_exists(self):
-        try:
-            assert self.get_parent_queryset().exists()
-        except (AssertionError, ValidationError):
-            user_id = self.kwargs['pk']
-            raise NotFound(detail=_("User with ID '{}' not found.".format(user_id)))
-
     def get_parent_queryset(self):
-        user = self.request.user
-
-        if user.is_superuser:
+        if self.request.user.is_superuser:
             return User.objects.filter(pk=self.kwargs['pk'])
+        return self.get_organization_queryset(User.objects.all())
 
+    def get_organization_queryset(self, qs):
+        user = self.request.user
         org_users = OrganizationUser.objects.filter(user=user).select_related(
             'organization'
         )
         qs_user = User.objects.none()
         for org_user in org_users:
             if org_user.is_admin:
                 qs_user = qs_user | org_user.organization.users.all().distinct()
-        qs_user = qs_user.filter(is_superuser=False)
-        return qs_user.filter(pk=self.kwargs['pk'])
+        return qs_user.filter(is_superuser=False, pk=self.kwargs['pk'])
 
     def get_serializer_context(self):
         if getattr(self, 'swagger_fake_view', False):

openwisp_users/tests/test_api/test_api.py

@@ -458,7 +458,7 @@ def test_get_email_list_multitenancy_api(self):
         self._create_org_user(user=org2_user, organization=org2)
         self.client.force_login(org1_user)
         path = reverse('users:email_list', args=(org2_user.pk,))
-        with self.assertNumQueries(5):
+        with self.assertNumQueries(6):
             response = self.client.get(path)
         self.assertEqual(response.status_code, 404)