Filter out soft deleted users from lessons, quizzes and groups assignments

Author: AlexVelezLl

kolibri/core/auth/api.py

@@ -14,6 +14,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.exceptions import PermissionDenied
 from django.core.exceptions import ValidationError
+from django.db.models import Exists
 from django.db.models import Func
 from django.db.models import OuterRef
 from django.db.models import Q
@@ -1052,7 +1053,14 @@ class LearnerGroupViewSet(ValuesViewset):
     values = ("id", "name", "parent", "user_ids")
 
     def annotate_queryset(self, queryset):
-        return annotate_array_aggregate(queryset, user_ids="membership__user__id")
+        non_deleted_users_subquery = Exists(
+            FacilityUser.objects.filter(id=OuterRef("membership__user__id"))
+        )
+        return annotate_array_aggregate(
+            queryset,
+            filter=Q(non_deleted_users_subquery),
+            user_ids="membership__user__id",
+        )
 
 
 class BaseSignUpViewSet(viewsets.GenericViewSet, CreateModelMixin):

kolibri/core/exams/api.py

@@ -1,5 +1,8 @@
 import datetime
 
+from django.db.models import Exists
+from django.db.models import OuterRef
+from django.db.models import Q
 from django.http import Http404
 from django.utils.timezone import now
 from django_filters.rest_framework import DjangoFilterBackend
@@ -11,6 +14,7 @@
 from kolibri.core.auth.api import KolibriAuthPermissions
 from kolibri.core.auth.api import KolibriAuthPermissionsFilter
 from kolibri.core.auth.constants.collection_kinds import ADHOCLEARNERSGROUP
+from kolibri.core.auth.models import FacilityUser
 from kolibri.core.content.models import ContentNode
 from kolibri.core.content.utils.annotation import total_file_size
 from kolibri.core.exams import models
@@ -103,6 +107,14 @@ def annotate_queryset(self, queryset):
 
     def serialize_draft(self, queryset):
         objects = queryset.values(*self.draft_values)
+
+        all_exam_learners_set = {
+            learner_id for obj in objects for learner_id in obj.get("learner_ids", [])
+        }
+        non_deleted_learners = FacilityUser.objects.filter(
+            id__in=all_exam_learners_set
+        ).values_list("id", flat=True)
+
         for item in objects:
             # Set the draft flag to True
             item["draft"] = True
@@ -111,6 +123,12 @@ def serialize_draft(self, queryset):
             item["archive"] = False
             item["date_archived"] = None
             item["date_activated"] = None
+            # Filter out any deleted learners
+            item["learner_ids"] = [
+                learner_id
+                for learner_id in item.get("learner_ids", [])
+                if learner_id in non_deleted_learners
+            ]
         return objects
 
     def filter_querysets(self, exam_queryset, draft_queryset):
@@ -230,8 +248,15 @@ def consolidate(self, items, queryset):
             adhoc_assignments = models.ExamAssignment.objects.filter(
                 exam_id__in=exam_ids, collection__kind=ADHOCLEARNERSGROUP
             )
+            non_deleted_users_subquery = Exists(
+                FacilityUser.objects.filter(
+                    id=OuterRef("collection__membership__user_id")
+                )
+            )
             adhoc_assignments = annotate_array_aggregate(
-                adhoc_assignments, learner_ids="collection__membership__user_id"
+                adhoc_assignments,
+                filter=Q(non_deleted_users_subquery),
+                learner_ids="collection__membership__user_id",
             )
             adhoc_assignments = {
                 a["exam"]: a

kolibri/core/lessons/viewsets.py

@@ -1,3 +1,6 @@
+from django.db.models import Exists
+from django.db.models import OuterRef
+from django.db.models import Q
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.decorators import action
 from rest_framework.response import Response
@@ -7,6 +10,7 @@
 from kolibri.core.auth.api import KolibriAuthPermissions
 from kolibri.core.auth.api import KolibriAuthPermissionsFilter
 from kolibri.core.auth.constants.collection_kinds import ADHOCLEARNERSGROUP
+from kolibri.core.auth.models import FacilityUser
 from kolibri.core.content.models import ContentNode
 from kolibri.core.content.utils.annotation import total_file_size
 from kolibri.core.lessons.models import Lesson
@@ -77,8 +81,15 @@ def consolidate(self, items, queryset):
             adhoc_assignments = LessonAssignment.objects.filter(
                 lesson_id__in=lesson_ids, collection__kind=ADHOCLEARNERSGROUP
             )
+            non_deleted_users_subquery = Exists(
+                FacilityUser.objects.filter(
+                    id=OuterRef("collection__membership__user_id")
+                )
+            )
             adhoc_assignments = annotate_array_aggregate(
-                adhoc_assignments, learner_ids="collection__membership__user_id"
+                adhoc_assignments,
+                filter=Q(non_deleted_users_subquery),
+                learner_ids="collection__membership__user_id",
             )
             adhoc_assignments = {
                 a["lesson"]: a

kolibri/core/query.py

@@ -79,11 +79,14 @@ def get_source_field(model, field_path):
 
 def annotate_array_aggregate(queryset, **kwargs):
     model = queryset.model
+    query_filter = kwargs.pop("filter", None)
     if connection.vendor == "postgresql" and NotNullArrayAgg is not None:
         return queryset.annotate(
             **{
                 target: NotNullArrayAgg(
-                    source, result_field=get_source_field(model, source)
+                    source,
+                    result_field=get_source_field(model, source),
+                    filter=query_filter,
                 )
                 for target, source in kwargs.items()
             }
@@ -92,7 +95,11 @@ def annotate_array_aggregate(queryset, **kwargs):
     # is called by row and not across the entire queryset.
     return queryset.values("pk").annotate(
         **{
-            target: GroupConcat(source, result_field=get_source_field(model, source))
+            target: GroupConcat(
+                source,
+                result_field=get_source_field(model, source),
+                filter=query_filter,
+            )
             for target, source in kwargs.items()
         }
     )

kolibri/plugins/coach/class_summary_api.py

@@ -242,7 +242,14 @@ def serialize_coach_assigned_quiz_status(exam_data):
 
 
 def serialize_groups(queryset):
-    queryset = annotate_array_aggregate(queryset, member_ids="membership__user__id")
+    non_deleted_users_subquery = Exists(
+        FacilityUser.objects.filter(id=OuterRef("membership__user__id"))
+    )
+    queryset = annotate_array_aggregate(
+        queryset,
+        filter=Q(non_deleted_users_subquery),
+        member_ids="membership__user__id",
+    )
     return list(queryset.values("id", "name", "member_ids"))