diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py index 0d46b2e13..48443cf24 100644 --- a/src/registrar/tests/common.py +++ b/src/registrar/tests/common.py @@ -673,7 +673,7 @@ class MockDb(TestCase): username="meoward_username", first_name="first_meoward", last_name="last_meoward", email="meoward@rocks.com" ) - lebowski_user = get_user_model().objects.create( + cls.lebowski_user = get_user_model().objects.create( username="big_lebowski", first_name="big", last_name="lebowski", email="big_lebowski@dude.co" ) @@ -686,7 +686,7 @@ class MockDb(TestCase): ) _, created = UserDomainRole.objects.get_or_create( - user=lebowski_user, domain=cls.domain_1, role=UserDomainRole.Roles.MANAGER + user=cls.lebowski_user, domain=cls.domain_1, role=UserDomainRole.Roles.MANAGER ) _, created = UserDomainRole.objects.get_or_create( diff --git a/src/registrar/tests/test_reports.py b/src/registrar/tests/test_reports.py index cc066785d..3510de00a 100644 --- a/src/registrar/tests/test_reports.py +++ b/src/registrar/tests/test_reports.py @@ -233,7 +233,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib): "cdomain11.gov,Ready,2024-04-02,(blank),Federal - Executive,World War I Centennial Commission,,,,(blank),,," "meoward@rocks.com,\n" "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,World War I Centennial Commission,,," - ',,,(blank),"meoward@rocks.com, info@example.com, big_lebowski@dude.co",' + ',,,(blank),"big_lebowski@dude.co, info@example.com, meoward@rocks.com",' "woofwardthethird@rocks.com\n" "adomain10.gov,Ready,2024-04-03,(blank),Federal,Armed Forces Retirement Home,,,,(blank),,,," "squeaker@rocks.com\n" @@ -429,7 +429,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib): "\n" "Domain name,Domain type,Domain managers,Invited domain managers\n" "cdomain11.gov,Federal - Executive,meoward@rocks.com,\n" - 'cdomain1.gov,Federal - Executive,"meoward@rocks.com, info@example.com, big_lebowski@dude.co",' + 'cdomain1.gov,Federal - Executive,"big_lebowski@dude.co, info@example.com, meoward@rocks.com",' "woofwardthethird@rocks.com\n" "zdomain12.gov,Interstate,meoward@rocks.com,\n" ) diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py index 56aa41569..979f64a17 100644 --- a/src/registrar/utility/csv_export.py +++ b/src/registrar/utility/csv_export.py @@ -344,7 +344,7 @@ class DomainExport(BaseExport): """ Fetch all UserDomainRole entries and return a mapping of domain to user__email. """ - user_domain_roles = UserDomainRole.objects.select_related("user").values_list("domain__name", "user__email") + user_domain_roles = UserDomainRole.objects.select_related("user").order_by("domain__name", "user__email").values_list("domain__name", "user__email") return list(user_domain_roles) @classmethod