diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 80ad71a72..a5296117b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,6 +17,10 @@ Unreleased ---------- * nothing unreleased +[4.25.12] +---------- +* feat: add username query to enterprise customer user query + [4.25.11] ---------- * feat: add username query to enterprise customer user query diff --git a/enterprise/__init__.py b/enterprise/__init__.py index a5d812bd1..d3dc97873 100644 --- a/enterprise/__init__.py +++ b/enterprise/__init__.py @@ -2,4 +2,4 @@ Your project description goes here. """ -__version__ = "4.25.11" +__version__ = "4.25.12" diff --git a/enterprise/api/v1/serializers.py b/enterprise/api/v1/serializers.py index 98466be51..36ffed664 100644 --- a/enterprise/api/v1/serializers.py +++ b/enterprise/api/v1/serializers.py @@ -1671,7 +1671,7 @@ class PendingEnterpriseCustomerAdminUserSerializer(serializers.ModelSerializer): class Meta: model = PendingEnterpriseCustomerAdminUser fields = ( - 'enterprise_customer', 'user_email' + 'id', 'enterprise_customer', 'user_email' ) def validate(self, attrs): diff --git a/tests/test_enterprise/api/test_views.py b/tests/test_enterprise/api/test_views.py index ea31413fd..aa45b85f7 100644 --- a/tests/test_enterprise/api/test_views.py +++ b/tests/test_enterprise/api/test_views.py @@ -891,6 +891,7 @@ def test_post_pending_enterprise_customer_admin_user_creation(self): data = { 'enterprise_customer': self.enterprise_customer.uuid, 'user_email': self.user.email, + 'id': 2 } response = self.client.post(settings.TEST_SERVER + PENDING_ENTERPRISE_CUSTOMER_ADMIN_LIST_ENDPOINT, data=data) @@ -949,11 +950,9 @@ def test_get_pending_enterprise_customer_admin_user(self): self.assertEqual(response.status_code, status.HTTP_200_OK) - expected_data = { - 'enterprise_customer': self.enterprise_customer.uuid, - 'user_email': 'test@example.com' - } - self.assertEqual(response.data, expected_data) + expected_keys = ['enterprise_customer', 'user_email', 'id'] + for key in expected_keys: + self.assertIn(key, response.data) def test_patch_pending_enterprise_customer_admin_user(self): """