feat: add username query to filter

CHANGELOG.rst

@@ -17,6 +17,10 @@ Unreleased
 ----------
 * nothing unreleased
 
+[4.25.10]
+----------
+* feat: add username query to enterprise customer user query
+
 [4.25.9]
 ----------
 * fix: send LEARNER_CREDIT_COURSE_ENROLLMENT_REVOKED from the correct place.

enterprise/__init__.py

@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.25.9"
+__version__ = "4.25.10"

enterprise/api/v1/views/enterprise_customer_support.py

@@ -73,8 +73,10 @@ def filter_queryset_by_user_query(self, queryset, is_pending_user=False):
 
         if user_query:
             if not is_pending_user:
-                queryset = queryset.filter(
-                    user_id__in=User.objects.filter(Q(email__icontains=user_query))
+                queryset = models.EnterpriseCustomerUser.objects.filter(
+                    user_id__in=User.objects.filter(
+                        Q(email__icontains=user_query) | Q(username__icontains=user_query)
+                    )
                 )
             else:
                 queryset = queryset.filter(user_email=user_query)

tests/test_enterprise/api/test_views.py

@@ -9725,8 +9725,17 @@ def test_list_users_filtered(self):
             'role_assignments': [ENTERPRISE_LEARNER_ROLE],
             'is_admin': False
         }]
-        user_query_string = f'?user_query={enterprise_customer_user.user_email}'
-        url = reverse(self.ECS_ENDPOINT, kwargs={self.ECS_KWARG: enterprise_customer.uuid}) + user_query_string
+        # search by email
+        user_query_email = f'?user_query={enterprise_customer_user.user_email}'
+        url = reverse(self.ECS_ENDPOINT, kwargs={self.ECS_KWARG: enterprise_customer.uuid}) + user_query_email
+        response = self.client.get(settings.TEST_SERVER + url)
+
+        assert expected_json == response.json().get('results')
+        assert response.json().get('count') == 1
+
+        # search by username
+        user_query_username = f'?user_query={enterprise_customer_user.username}'
+        url = reverse(self.ECS_ENDPOINT, kwargs={self.ECS_KWARG: enterprise_customer.uuid}) + user_query_username
         response = self.client.get(settings.TEST_SERVER + url)
 
         assert expected_json == response.json().get('results')