Merge pull request #695 from rgopalrao-sonata-png/rgopalrao/ENT-10867

fix: Fix is added to remove the unlinked users from LPR

Author: marlonkeating

CHANGELOG.rst

@@ -13,6 +13,10 @@ Change Log
 
 Unreleased
 ----------
+[10.22.10] - 2026-07-16
+-----------------------
+  * fix: Remove unlinked users from Learner Progress Report
+
 [10.22.9] - 2026-06-17
 -----------------------
   * feat: Remove deprecated analytics filter

enterprise_data/__init__.py

@@ -2,4 +2,4 @@
 Enterprise data api application. This Django app exposes API endpoints used by enterprises.
 """
 
-__version__ = "10.22.9"
+__version__ = "10.22.10"

enterprise_data/api/v1/views/enterprise_learner.py

@@ -101,7 +101,8 @@ def get_queryset(self):
         # always includes `course_progress` and `course_passing_grade`; real
         # values are merged in later from Snowflake during enrichment.
         enrollments = EnterpriseLearnerEnrollment.objects.filter(
-            enterprise_customer_uuid=enterprise_customer_uuid
+            enterprise_customer_uuid=enterprise_customer_uuid,
+            enterprise_user__is_linked=True,
         ).extra(select={
             'course_progress': 'NULL',
             'course_passing_grade': 'NULL',
@@ -396,7 +397,10 @@ def filter_number_of_users(self):
         """
         Returns number of enterprise users (enrolled AND not enrolled learners)
         """
-        return EnterpriseLearner.objects.filter(enterprise_customer_uuid=self.kwargs['enterprise_id'])
+        return EnterpriseLearner.objects.filter(
+            enterprise_customer_uuid=self.kwargs['enterprise_id'],
+            is_linked=True,
+        )
 
     def get_max_created_date(self, queryset):
         """

enterprise_data/tests/api/v1/test_views.py

@@ -237,6 +237,60 @@ def test_list_enriches_course_progress_from_snowflake(self, mock_source_cls):
         self.assertEqual(response.data['results'][0]['enrollment_id'], enrollment.enrollment_id)
         self.assertEqual(response.data['results'][0]['course_progress'], 0.87)
 
+    def test_list_excludes_enrollments_of_unlinked_learners(self):
+        """
+        Test that the enrollment list endpoint excludes enrollments belonging to unlinked learners.
+        """
+        linked_learner = EnterpriseLearnerFactory(
+            enterprise_customer_uuid=self.enterprise_id,
+            is_linked=True,
+        )
+        unlinked_learner = EnterpriseLearnerFactory(
+            enterprise_customer_uuid=self.enterprise_id,
+            is_linked=False,
+        )
+        linked_enrollment = EnterpriseLearnerEnrollmentFactory(
+            enterprise_customer_uuid=self.enterprise_id,
+            is_consent_granted=True,
+            enterprise_user_id=linked_learner.enterprise_user_id,
+        )
+        EnterpriseLearnerEnrollmentFactory(
+            enterprise_customer_uuid=self.enterprise_id,
+            is_consent_granted=True,
+            enterprise_user_id=unlinked_learner.enterprise_user_id,
+        )
+
+        url = reverse('v1:enterprise-learner-enrollment-list', kwargs={'enterprise_id': self.enterprise_id})
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        results = response.json()['results']
+        self.assertEqual(len(results), 1)
+        self.assertEqual(results[0]['enrollment_id'], linked_enrollment.enrollment_id)
+
+    def test_overview_number_of_users_excludes_unlinked_learners(self):
+        """
+        Test that `number_of_users` in the overview response only counts learners with `is_linked=True`.
+        """
+        EnterpriseLearnerFactory(
+            enterprise_customer_uuid=self.enterprise_id,
+            is_linked=True,
+        )
+        EnterpriseLearnerFactory(
+            enterprise_customer_uuid=self.enterprise_id,
+            is_linked=True,
+        )
+        EnterpriseLearnerFactory(
+            enterprise_customer_uuid=self.enterprise_id,
+            is_linked=False,
+        )
+
+        url = reverse('v1:enterprise-learner-enrollment-overview', kwargs={'enterprise_id': self.enterprise_id})
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.json()['number_of_users'], 2)
+
     @mock.patch('enterprise_data.api.v1.views.enterprise_learner.SnowflakeCourseProgressSource')
     def test_list_returns_200_when_snowflake_enrichment_fails(self, mock_source_cls):
         enterprise_learner = EnterpriseLearnerFactory(
@@ -334,7 +388,10 @@ def test_get_queryset_adds_placeholder_metadata_columns(self, mock_apply_filters
 
         result = viewset.get_queryset()
 
-        mock_filter.assert_called_once_with(enterprise_customer_uuid=self.enterprise_id)
+        mock_filter.assert_called_once_with(
+            enterprise_customer_uuid=self.enterprise_id,
+            enterprise_user__is_linked=True,
+        )
         enrollments.extra.assert_called_once_with(select={
             'course_progress': 'NULL',
             'course_passing_grade': 'NULL',

enterprise_data/tests/test_utils.py

@@ -135,7 +135,7 @@ class Meta:
     lms_user_id = factory.lazy_attribute(
         lambda x: FAKER.random_int(min=1, max=999999)  # pylint: disable=no-member
     )
-    is_linked = FAKER.pybool()
+    is_linked = True
     user_username = factory.Sequence('robot{}'.format)
     user_email = factory.lazy_attribute(lambda x: FAKER.email())  # pylint: disable=no-member
     lms_user_created = FAKER.past_datetime(start_date='-60d')