changed INVITED & ACTIVE filter; remove prefetch and annotate user qs with has_active_realm

Author: emaciupe

src/etools/applications/users/filters.py

@@ -13,17 +13,16 @@ def filter_queryset(self, request, queryset, view):
 class UserStatusFilter(BaseFilterBackend):
     def filter_queryset(self, request, queryset, view):
         if 'status' in request.query_params and request.query_params['status']:
-            queryset = queryset.prefetch_related('realms')
             status_list = [status.strip().upper() for status in request.query_params['status'].split(',')]
             filters = models.Q()
             for status in status_list:
                 if status == 'INACTIVE':
                     filters |= models.Q(is_active=False)
                 if status == 'ACTIVE':
-                    filters |= models.Q(is_active=True, last_login__isnull=False)
+                    filters |= models.Q(is_active=True, last_login__isnull=False, has_active_realm=True)
                 if status == 'INVITED':
-                    filters |= models.Q(is_active=True, last_login__isnull=True)
+                    filters |= models.Q(is_active=True, last_login__isnull=True, has_active_realm=True)
                 if status == 'INOPERATIVE':
-                    filters |= models.Q(is_active=True, realms__is_active=False)
+                    filters |= models.Q(is_active=True, has_active_realm=False)
             return queryset.filter(filters)
         return queryset

src/etools/applications/users/views_v3.py

@@ -5,7 +5,7 @@
 from django.contrib.auth.models import Group
 from django.core.exceptions import ValidationError as DjangoValidationError
 from django.db import connection, transaction
-from django.db.models import OuterRef, Prefetch, Q, Subquery
+from django.db.models import OuterRef, Prefetch, Q, Subquery, Case, When, BooleanField
 from django.http import HttpResponseForbidden, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 
@@ -337,7 +337,10 @@ def get_queryset(self):
 
         return self.model.objects \
             .filter(realms__in=context_realms_qs) \
-            .prefetch_related(Prefetch('realms', queryset=context_realms_qs))\
+            .prefetch_related(Prefetch('realms', queryset=context_realms_qs)) \
+            .annotate(has_active_realm=Case(
+                When(realms__is_active=True, then=True),
+                default=False, output_field=BooleanField())) \
             .distinct()
 
     @transaction.atomic