fix: ensure correct admin_users in EnterpriseCustomerUserViewSet re…

…sponse (#2287)

CHANGELOG.rst

@@ -17,6 +17,10 @@ Unreleased
 ----------
 * nothing unreleased
 
+[4.32.2]
+--------
+* fix: ensure admin_users in EnterpriseCustomerUserViewSet is correct.
+
 [4.32.1]
 --------
 * feat: enable search filter on learner data transmission audit admin views for all integrated channels.

enterprise/__init__.py

@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.32.1"
+__version__ = "4.32.2"

enterprise/api/v1/serializers.py

@@ -721,7 +721,7 @@ class Meta:
         )
 
     user = UserSerializer()
-    enterprise_customer = EnterpriseCustomerSerializer()
+    enterprise_customer = serializers.SerializerMethodField()
     data_sharing_consent_records = serializers.SerializerMethodField()
     groups = serializers.SerializerMethodField()
     role_assignments = serializers.SerializerMethodField()
@@ -756,6 +756,15 @@ def __init__(self, instance=None, data=empty, **kwargs):
             )
             self.role_assignments_by_ecu_id = role_assignments_by_ecu_id
 
+    def get_enterprise_customer(self, obj):
+        """
+        Return serialization of EnterpriseCustomer associated with the EnterpriseCustomerUser.
+        """
+        return EnterpriseCustomerSerializer(
+            instance=obj.enterprise_customer,
+            context=self.context
+        ).data
+
     def get_data_sharing_consent_records(self, obj):
         """
         Return serialization of EnterpriseCustomerUser.data_sharing_consent_records property.

tests/test_enterprise/api/test_views.py

@@ -555,6 +555,37 @@ def test_get_enterprise_customer_user_contains_features(self):
         response = self.load_json(response.content)
         assert response['enterprise_features'] is not None
 
+    def test_get_enterprise_customer_user_contains_admin_users(self):
+        """
+        Assert whether the paginated response contains `enterprise_customer.admin_users`.
+        """
+        user = factories.UserFactory()
+        enterprise_customer = factories.EnterpriseCustomerFactory(uuid=FAKE_UUIDS[0])
+        factories.EnterpriseCustomerUserFactory(
+            user_id=user.id,
+            enterprise_customer=enterprise_customer
+        )
+        admin_user = factories.UserFactory()
+        SystemWideEnterpriseUserRoleAssignment.objects.create(
+            role=admin_role(),
+            user=admin_user,
+            enterprise_customer=enterprise_customer
+        )
+        response = self.client.get(
+            '{host}{path}?username={username}'.format(
+                host=settings.TEST_SERVER,
+                path=ENTERPRISE_LEARNER_LIST_ENDPOINT,
+                username=user.username
+            )
+        )
+        response = self.load_json(response.content)
+        assert response['results'][0]['enterprise_customer']['admin_users'] == [
+            {
+                'email': admin_user.email,
+                'lms_user_id': admin_user.id,
+            }
+        ]
+
     def test_get_enterprise_customer_user_contains_consent_records(self):
         user = factories.UserFactory()
         enterprise_customer = factories.EnterpriseCustomerFactory(uuid=FAKE_UUIDS[0])