diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py index 18fa4174a..4575d8487 100644 --- a/src/registrar/tests/test_views_portfolio.py +++ b/src/registrar/tests/test_views_portfolio.py @@ -2243,7 +2243,9 @@ class TestPortfolioMemberDomainsEditView(TestPortfolioMemberDomainsView): self.assertRedirects(response, reverse("member-domains", kwargs={"pk": self.portfolio_permission.pk})) messages = list(response.wsgi_request._messages) 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 @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})) messages = list(response.wsgi_request._messages) 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 @override_flag("organization_feature", active=True) @@ -2479,7 +2483,9 @@ class TestPortfolioInvitedMemberEditDomainsView(TestPortfolioInvitedMemberDomain self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"pk": self.invitation.pk})) messages = list(response.wsgi_request._messages) 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 @override_flag("organization_feature", active=True) @@ -2500,7 +2506,9 @@ class TestPortfolioInvitedMemberEditDomainsView(TestPortfolioInvitedMemberDomain self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"pk": self.invitation.pk})) messages = list(response.wsgi_request._messages) 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 @override_flag("organization_feature", active=True) diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py index e780273ba..4d66c60c9 100644 --- a/src/registrar/views/portfolio_members_json.py +++ b/src/registrar/views/portfolio_members_json.py @@ -1,7 +1,6 @@ from django.http import JsonResponse from django.core.paginator import Paginator 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.contrib.postgres.aggregates import ArrayAgg 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', # otherwise we'll trigger a "more than one row returned by a subquery used as an expression" # 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), distinct=True, ) diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py index abc596d22..40a2ceae5 100644 --- a/src/registrar/views/portfolios.py +++ b/src/registrar/views/portfolios.py @@ -253,14 +253,16 @@ class PortfolioMemberDomainsEditView(PortfolioMemberDomainsEditPermissionView, V except IntegrityError: messages.error( 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.") return redirect(reverse("member-domains-edit", kwargs={"pk": pk})) except Exception as e: messages.error( 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)}") return redirect(reverse("member-domains-edit", kwargs={"pk": pk})) @@ -277,7 +279,8 @@ class PortfolioMemberDomainsEditView(PortfolioMemberDomainsEditPermissionView, V except json.JSONDecodeError: messages.error( 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}") return None @@ -453,14 +456,16 @@ class PortfolioInvitedMemberDomainsEditView(PortfolioMemberDomainsEditPermission except IntegrityError: messages.error( 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})) except Exception as e: messages.error( 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)}.") return redirect(reverse("invitedmember-domains-edit", kwargs={"pk": pk})) @@ -477,7 +482,8 @@ class PortfolioInvitedMemberDomainsEditView(PortfolioMemberDomainsEditPermission except json.JSONDecodeError: messages.error( 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}.") return None