zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-06 19:23:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

predictable ordering of userdomainroles in csv_exports

Browse source
This commit is contained in:
David Kennedy 2024-07-19 17:46:09 -04:00
parent 03b33803a0
commit 4bea930f97
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/registrar/tests/common.py
View file

@ -673,7 +673,7 @@ class MockDb(TestCase):
username="meoward_username", first_name="first_meoward", last_name="last_meoward", email="meoward@rocks.com" 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" 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( _, 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( _, created = UserDomainRole.objects.get_or_create(

4
src/registrar/tests/test_reports.py
View file

@ -233,7 +233,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
"cdomain11.gov,Ready,2024-04-02,(blank),Federal - Executive,World War I Centennial Commission,,,,(blank),,," "cdomain11.gov,Ready,2024-04-02,(blank),Federal - Executive,World War I Centennial Commission,,,,(blank),,,"
"meoward@rocks.com,\n" "meoward@rocks.com,\n"
"defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,World War I Centennial Commission,,," "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" "woofwardthethird@rocks.com\n"
"adomain10.gov,Ready,2024-04-03,(blank),Federal,Armed Forces Retirement Home,,,,(blank),,,," "adomain10.gov,Ready,2024-04-03,(blank),Federal,Armed Forces Retirement Home,,,,(blank),,,,"
"squeaker@rocks.com\n" "squeaker@rocks.com\n"
@ -429,7 +429,7 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
"\n" "\n"
"Domain name,Domain type,Domain managers,Invited domain managers\n" "Domain name,Domain type,Domain managers,Invited domain managers\n"
"cdomain11.gov,Federal - Executive,meoward@rocks.com,\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" "woofwardthethird@rocks.com\n"
"zdomain12.gov,Interstate,meoward@rocks.com,\n" "zdomain12.gov,Interstate,meoward@rocks.com,\n"
) )

2
src/registrar/utility/csv_export.py
View file

@ -344,7 +344,7 @@ class DomainExport(BaseExport):
""" """
Fetch all UserDomainRole entries and return a mapping of domain to user__email. 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) return list(user_domain_roles)
@classmethod @classmethod