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

lint and tests

Browse source
This commit is contained in:
Rachid Mrad 2024-12-31 12:01:35 -05:00
parent e3ff4f063d
commit e15c57f3b3
No known key found for this signature in database
3 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/registrar/tests/test_views_portfolio.py
View file

@ -2243,7 +2243,9 @@ class TestPortfolioMemberDomainsEditView(TestPortfolioMemberDomainsView):
self.assertRedirects(response, reverse("member-domains", kwargs={"pk": self.portfolio_permission.pk})) self.assertRedirects(response, reverse("member-domains", kwargs={"pk": self.portfolio_permission.pk}))
messages = list(response.wsgi_request._messages) messages = list(response.wsgi_request._messages)
self.assertEqual(len(messages), 1) self.assertEqual(len(messages), 1)
self.assertEqual(str(messages[0]), "Invalid data for added domains.") self.assertEqual(
str(messages[0]), "Invalid data for added domains. If the issue persists, please contact help@get.gov."
)
@less_console_noise_decorator @less_console_noise_decorator
@override_flag("organization_feature", active=True) @override_flag("organization_feature", active=True)
@ -2264,7 +2266,9 @@ class TestPortfolioMemberDomainsEditView(TestPortfolioMemberDomainsView):
self.assertRedirects(response, reverse("member-domains", kwargs={"pk": self.portfolio_permission.pk})) self.assertRedirects(response, reverse("member-domains", kwargs={"pk": self.portfolio_permission.pk}))
messages = list(response.wsgi_request._messages) messages = list(response.wsgi_request._messages)
self.assertEqual(len(messages), 1) self.assertEqual(len(messages), 1)
self.assertEqual(str(messages[0]), "Invalid data for removed domains.") self.assertEqual(
str(messages[0]), "Invalid data for removed domains. If the issue persists, please contact help@get.gov."
)
@less_console_noise_decorator @less_console_noise_decorator
@override_flag("organization_feature", active=True) @override_flag("organization_feature", active=True)
@ -2479,7 +2483,9 @@ class TestPortfolioInvitedMemberEditDomainsView(TestPortfolioInvitedMemberDomain
self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"pk": self.invitation.pk})) self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"pk": self.invitation.pk}))
messages = list(response.wsgi_request._messages) messages = list(response.wsgi_request._messages)
self.assertEqual(len(messages), 1) self.assertEqual(len(messages), 1)
self.assertEqual(str(messages[0]), "Invalid data for added domains.") self.assertEqual(
str(messages[0]), "Invalid data for added domains. If the issue persists, please contact help@get.gov."
)
@less_console_noise_decorator @less_console_noise_decorator
@override_flag("organization_feature", active=True) @override_flag("organization_feature", active=True)
@ -2500,7 +2506,9 @@ class TestPortfolioInvitedMemberEditDomainsView(TestPortfolioInvitedMemberDomain
self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"pk": self.invitation.pk})) self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"pk": self.invitation.pk}))
messages = list(response.wsgi_request._messages) messages = list(response.wsgi_request._messages)
self.assertEqual(len(messages), 1) self.assertEqual(len(messages), 1)
self.assertEqual(str(messages[0]), "Invalid data for removed domains.") self.assertEqual(
str(messages[0]), "Invalid data for removed domains. If the issue persists, please contact help@get.gov."
)
@less_console_noise_decorator @less_console_noise_decorator
@override_flag("organization_feature", active=True) @override_flag("organization_feature", active=True)

4
src/registrar/views/portfolio_members_json.py
View file

@ -1,7 +1,6 @@
from django.http import JsonResponse from django.http import JsonResponse
from django.core.paginator import Paginator from django.core.paginator import Paginator
from django.db.models import Value, F, CharField, TextField, Q, Case, When, OuterRef, Subquery from django.db.models import Value, F, CharField, TextField, Q, Case, When, OuterRef, Subquery
from django.contrib.postgres.fields import ArrayField
from django.db.models.functions import Cast, Coalesce, Concat from django.db.models.functions import Cast, Coalesce, Concat
from django.contrib.postgres.aggregates import ArrayAgg from django.contrib.postgres.aggregates import ArrayAgg
from django.urls import reverse from django.urls import reverse
@ -152,7 +151,8 @@ class PortfolioMembersJson(PortfolioMembersPermission, View):
# We've pre-concatenated the domain infos to limit the subquery to return a single virtual 'row', # We've pre-concatenated the domain infos to limit the subquery to return a single virtual 'row',
# otherwise we'll trigger a "more than one row returned by a subquery used as an expression" # otherwise we'll trigger a "more than one row returned by a subquery used as an expression"
# when an email matches multiple domain invitations. # when an email matches multiple domain invitations.
# We'll take care when processing the list of one single concatenated items item in serialize_members # We'll take care when processing the list of one single concatenated items item
# in serialize_members.
Subquery(concatenated_domain_info), Subquery(concatenated_domain_info),
distinct=True, distinct=True,
) )

20
src/registrar/views/portfolios.py
View file

@ -253,14 +253,16 @@ class PortfolioMemberDomainsEditView(PortfolioMemberDomainsEditPermissionView, V
except IntegrityError: except IntegrityError:
messages.error( messages.error(
request, request,
f"A database error occurred while saving changes. If the issue persists, please contact {DefaultUserValues.HELP_EMAIL}", "A database error occurred while saving changes. If the issue persists, "
f"please contact {DefaultUserValues.HELP_EMAIL}.",
) )
logger.error("A database error occurred while saving changes.") logger.error("A database error occurred while saving changes.")
return redirect(reverse("member-domains-edit", kwargs={"pk": pk})) return redirect(reverse("member-domains-edit", kwargs={"pk": pk}))
except Exception as e: except Exception as e:
messages.error( messages.error(
request, request,
f"An unexpected error occurred: {str(e)}. If the issue persists, please contact {DefaultUserValues.HELP_EMAIL}", "An unexpected error occurred: {str(e)}. If the issue persists, "
f"please contact {DefaultUserValues.HELP_EMAIL}.",
) )
logger.error(f"An unexpected error occurred: {str(e)}") logger.error(f"An unexpected error occurred: {str(e)}")
return redirect(reverse("member-domains-edit", kwargs={"pk": pk})) return redirect(reverse("member-domains-edit", kwargs={"pk": pk}))
@ -277,7 +279,8 @@ class PortfolioMemberDomainsEditView(PortfolioMemberDomainsEditPermissionView, V
except json.JSONDecodeError: except json.JSONDecodeError:
messages.error( messages.error(
self.request, self.request,
f"Invalid data for {domain_type}. If the issue persists, please contact {DefaultUserValues.HELP_EMAIL}", "Invalid data for {domain_type}. If the issue persists, "
f"please contact {DefaultUserValues.HELP_EMAIL}.",
) )
logger.error(f"Invalid data for {domain_type}") logger.error(f"Invalid data for {domain_type}")
return None return None
@ -453,14 +456,16 @@ class PortfolioInvitedMemberDomainsEditView(PortfolioMemberDomainsEditPermission
except IntegrityError: except IntegrityError:
messages.error( messages.error(
request, request,
f"A database error occurred while saving changes. If the issue persists, please contact {DefaultUserValues.HELP_EMAIL}.", "A database error occurred while saving changes. If the issue persists, "
f"please contact {DefaultUserValues.HELP_EMAIL}.",
) )
logger.error(f"A database error occurred while saving changes.") logger.error("A database error occurred while saving changes.")
return redirect(reverse("invitedmember-domains-edit", kwargs={"pk": pk})) return redirect(reverse("invitedmember-domains-edit", kwargs={"pk": pk}))
except Exception as e: except Exception as e:
messages.error( messages.error(
request, request,
f"An unexpected error occurred: {str(e)}. If the issue persists, please contact {DefaultUserValues.HELP_EMAIL}", "An unexpected error occurred: {str(e)}. If the issue persists, "
f"please contact {DefaultUserValues.HELP_EMAIL}.",
) )
logger.error(f"An unexpected error occurred: {str(e)}.") logger.error(f"An unexpected error occurred: {str(e)}.")
return redirect(reverse("invitedmember-domains-edit", kwargs={"pk": pk})) return redirect(reverse("invitedmember-domains-edit", kwargs={"pk": pk}))
@ -477,7 +482,8 @@ class PortfolioInvitedMemberDomainsEditView(PortfolioMemberDomainsEditPermission
except json.JSONDecodeError: except json.JSONDecodeError:
messages.error( messages.error(
self.request, self.request,
f"Invalid data for {domain_type}. If the issue persists, please contact {DefaultUserValues.HELP_EMAIL}.", "Invalid data for {domain_type}. If the issue persists, "
f"please contact {DefaultUserValues.HELP_EMAIL}.",
) )
logger.error(f"Invalid data for {domain_type}.") logger.error(f"Invalid data for {domain_type}.")
return None return None