Revert "feat: add username query"

This reverts commit 276379e.
openedx · Sep 24, 2024 · 6ba4733 · 6ba4733
1 parent 3697e0e
commit 6ba4733
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/enterprise/api/v1/views/enterprise_customer_support.py b/enterprise/api/v1/views/enterprise_customer_support.py
@@ -73,10 +73,8 @@ def filter_queryset_by_user_query(self, queryset, is_pending_user=False):
 
         if user_query:
             if not is_pending_user:
-                queryset = models.EnterpriseCustomerUser.objects.filter(
-                    user_id__in=User.objects.filter(
-                        Q(email__icontains=user_query) | Q(username__icontains=user_query)
-                    )
+                queryset = queryset.filter(
+                    user_id__in=User.objects.filter(Q(email__icontains=user_query))
                 )
             else:
                 queryset = queryset.filter(user_email=user_query)

diff --git a/tests/test_enterprise/api/test_views.py b/tests/test_enterprise/api/test_views.py
@@ -9737,17 +9737,8 @@ def test_list_users_filtered(self):
             'role_assignments': [ENTERPRISE_LEARNER_ROLE],
             'is_admin': False
         }]
-        # 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
+        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
         response = self.client.get(settings.TEST_SERVER + url)
 
         assert expected_json == response.json().get('results')