From 37f52aa9d4136cdc15be5602d65109f75a270008 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 30 Jan 2025 07:34:20 -0500
Subject: [PATCH 01/17] portfolio addition email send to admins on registrar
 invite

---
 .../portfolio_admin_addition_notification.txt | 40 +++++++++++++
 ...io_admin_addition_notification_subject.txt |  1 +
 src/registrar/utility/email_invitations.py    | 58 ++++++++++++++++++-
 src/registrar/views/portfolios.py             | 11 +++-
 4 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 src/registrar/templates/emails/portfolio_admin_addition_notification.txt
 create mode 100644 src/registrar/templates/emails/portfolio_admin_addition_notification_subject.txt

diff --git a/src/registrar/templates/emails/portfolio_admin_addition_notification.txt b/src/registrar/templates/emails/portfolio_admin_addition_notification.txt
new file mode 100644
index 000000000..b8953aa67
--- /dev/null
+++ b/src/registrar/templates/emails/portfolio_admin_addition_notification.txt
@@ -0,0 +1,40 @@
+{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
+Hi,{% if portfolio_admin and portfolio_admin.first_name %} {{ portfolio_admin.first_name }}.{% endif %}
+
+An admin was invited to your .gov organization.
+
+ORGANIZATION: {{ portfolio.organization_name }} 
+INVITED BY: {{ requestor_email }}
+INVITED ON: {{date}}
+ADMIN INVITED: {{ invited_email_address }}
+
+----------------------------------------------------------------
+
+NEXT STEPS
+The person who received the invitation will become an admin once they log in to the
+.gov registrar. They'll need to access the registrar using a Login.gov account that's
+associated with the invited email address.
+
+If you need to cancel this invitation or remove the admin, you can do that by going to 
+the Members section for your organization <https://manage.get.gov/>.
+
+
+WHY DID YOU RECEIVE THIS EMAIL? 
+You’re listed as an admin for {{ portfolio.organization_name }}. That means you'll receive a notification
+whenever a new admin is invited to that organization.
+
+If you have questions or concerns, reach out to the person who sent the invitation or reply to this email.
+
+
+THANK YOU
+.Gov helps the public identify official, trusted information. Thank you for using a .gov domain.
+
+----------------------------------------------------------------
+
+The .gov team
+Contact us: <https://get.gov/contact/>
+Learn about .gov <https://get.gov>
+
+The .gov registry is a part of the Cybersecurity and Infrastructure Security Agency
+(CISA) <https://cisa.gov/>
+{% endautoescape %}
diff --git a/src/registrar/templates/emails/portfolio_admin_addition_notification_subject.txt b/src/registrar/templates/emails/portfolio_admin_addition_notification_subject.txt
new file mode 100644
index 000000000..3d6b2a140
--- /dev/null
+++ b/src/registrar/templates/emails/portfolio_admin_addition_notification_subject.txt
@@ -0,0 +1 @@
+An admin was invited to your .gov organization
\ No newline at end of file
diff --git a/src/registrar/utility/email_invitations.py b/src/registrar/utility/email_invitations.py
index f9c3b89b2..b1377d09a 100644
--- a/src/registrar/utility/email_invitations.py
+++ b/src/registrar/utility/email_invitations.py
@@ -1,6 +1,8 @@
 from datetime import date
 from django.conf import settings
 from registrar.models import Domain, DomainInvitation, UserDomainRole
+from registrar.models.user_portfolio_permission import UserPortfolioPermission
+from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
 from registrar.utility.errors import (
     AlreadyDomainInvitedError,
     AlreadyDomainManagerError,
@@ -169,7 +171,7 @@ def send_invitation_email(email, requestor_email, domains, requested_user):
         raise EmailSendingError(f"Could not send email invitation to {email} for domains: {domain_names}") from err
 
 
-def send_portfolio_invitation_email(email: str, requestor, portfolio):
+def send_portfolio_invitation_email(email: str, requestor, portfolio, is_admin_invitation):
     """
     Sends a portfolio member invitation email to the specified address.
 
@@ -179,6 +181,10 @@ def send_portfolio_invitation_email(email: str, requestor, portfolio):
         email (str): Email address of the recipient
         requestor (User): The user initiating the invitation.
         portfolio (Portfolio): The portfolio object for which the invitation is being sent.
+        is_admin_invitation (boolean): boolean indicating if the invitation is an admin invitation
+
+    Returns:
+        Boolean indicating if all messages were sent successfully.
 
     Raises:
         MissingEmailError: If the requestor has no email associated with their account.
@@ -210,3 +216,53 @@ def send_portfolio_invitation_email(email: str, requestor, portfolio):
         raise EmailSendingError(
             f"Could not sent email invitation to {email} for portfolio {portfolio}. Portfolio invitation not saved."
         ) from err
+
+    all_admin_emails_sent = True
+    # send emails to portfolio admins
+    if is_admin_invitation:
+        all_admin_emails_sent = send_portfolio_admin_addition_emails_to_portfolio_admins(
+            email=email,
+            requestor_email=requestor_email,
+            portfolio=portfolio,
+            requested_user=None,
+        )
+    return all_admin_emails_sent
+
+
+def send_portfolio_admin_addition_emails_to_portfolio_admins(
+    email: str, requestor_email, portfolio: Domain, requested_user=None
+):
+    """
+    Notifies all portfolio admins of the provided portfolio of a newly invited portfolio admin
+
+    Returns:
+        Boolean indicating if all messages were sent successfully.
+    """
+    all_emails_sent = True
+    # Get each portfolio admin from list
+    user_portfolio_permissions = UserPortfolioPermission.objects.filter(
+        portfolio=portfolio, roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+    ).exclude(user__email=email)
+    for user_portfolio_permission in user_portfolio_permissions:
+        # Send email to each portfolio_admin
+        user = user_portfolio_permission.user
+        try:
+            send_templated_email(
+                "emails/portfolio_admin_addition_notification.txt",
+                "emails/portfolio_admin_addition_notification_subject.txt",
+                to_address=user.email,
+                context={
+                    "portfolio": portfolio,
+                    "requestor_email": requestor_email,
+                    "invited_email_address": email,
+                    "portfolio_admin": user,
+                    "date": date.today(),
+                },
+            )
+        except EmailSendingError:
+            logger.warning(
+                f"Could not send email organization admin notification to {user.email} for portfolio: {portfolio.name}",
+                exc_info=True,
+            )
+        all_emails_sent = False
+    return all_emails_sent
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 8ea135cfd..e2743b864 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -773,12 +773,19 @@ def submit_new_member(self, form):
         requested_email = form.cleaned_data["email"]
         requestor = self.request.user
         portfolio = form.cleaned_data["portfolio"]
+        is_admin_invitation = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in form.cleaned_data["roles"]
 
         requested_user = User.objects.filter(email=requested_email).first()
         permission_exists = UserPortfolioPermission.objects.filter(user=requested_user, portfolio=portfolio).exists()
         try:
             if not requested_user or not permission_exists:
-                send_portfolio_invitation_email(email=requested_email, requestor=requestor, portfolio=portfolio)
+                if not send_portfolio_invitation_email(
+                    email=requested_email,
+                    requestor=requestor,
+                    portfolio=portfolio,
+                    is_admin_invitation=is_admin_invitation,
+                ):
+                    messages.warning(self.request, "Could not send email notification to existing organization admins.")
                 portfolio_invitation = form.save()
                 # if user exists for email, immediately retrieve portfolio invitation upon creation
                 if requested_user is not None:
@@ -801,7 +808,7 @@ def _handle_exceptions(self, exception, portfolio, email):
                 portfolio,
                 exc_info=True,
             )
-            messages.warning(self.request, "Could not send portfolio email invitation.")
+            messages.error(self.request, "Could not send organization invitation email.")
         elif isinstance(exception, MissingEmailError):
             messages.error(self.request, str(exception))
             logger.error(

From 1bd73b6794a97ab538a1f8389e1b026d17a3ace7 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 30 Jan 2025 08:35:22 -0500
Subject: [PATCH 02/17] added support in forms and views for sending email on
 change from member to admin

---
 src/registrar/forms/portfolio.py           | 26 +++++++++++++++++++++
 src/registrar/utility/email_invitations.py | 23 ++++++++----------
 src/registrar/views/portfolios.py          | 27 +++++++++++++++++++++-
 3 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index e57b56c4f..b1e6bad8e 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -293,6 +293,32 @@ def map_instance_to_initial(self):
             selected_domain_permission = next((perm for perm in domain_perms if perm in perms), "no_access")
             self.initial["domain_request_permission_member"] = selected_domain_permission
 
+    def is_change_from_member_to_admin(self) -> bool:
+        """
+        Checks if the roles have changed from not containing ORGANIZATION_ADMIN
+        to containing ORGANIZATION_ADMIN.
+        """
+        previous_roles = set(self.initial.get("roles", []))  # Initial roles before change
+        new_roles = set(self.cleaned_data.get("roles", []))  # New roles after change
+
+        return (
+            UserPortfolioRoleChoices.ORGANIZATION_ADMIN not in previous_roles
+            and UserPortfolioRoleChoices.ORGANIZATION_ADMIN in new_roles
+        )
+
+    def is_change_from_admin_to_member(self) -> bool:
+        """
+        Checks if the roles have changed from containing ORGANIZATION_ADMIN
+        to not containing ORGANIZATION_ADMIN.
+        """
+        previous_roles = set(self.initial.get("roles", []))  # Initial roles before change
+        new_roles = set(self.cleaned_data.get("roles", []))  # New roles after change
+
+        return (
+            UserPortfolioRoleChoices.ORGANIZATION_ADMIN in previous_roles
+            and UserPortfolioRoleChoices.ORGANIZATION_ADMIN not in new_roles
+        )
+
 
 class PortfolioMemberForm(BasePortfolioMemberForm):
     """
diff --git a/src/registrar/utility/email_invitations.py b/src/registrar/utility/email_invitations.py
index b1377d09a..4e315cdda 100644
--- a/src/registrar/utility/email_invitations.py
+++ b/src/registrar/utility/email_invitations.py
@@ -40,7 +40,7 @@ def send_domain_invitation_email(
         EmailSendingError: If there is an error while sending the email.
     """
     domains = normalize_domains(domains)
-    requestor_email = get_requestor_email(requestor, domains)
+    requestor_email = get_requestor_email(requestor, domains=domains)
 
     _validate_invitation(email, requested_user, domains, requestor, is_member_of_different_org)
 
@@ -99,17 +99,22 @@ def normalize_domains(domains: Domain | list[Domain]) -> list[Domain]:
     return [domains] if isinstance(domains, Domain) else domains
 
 
-def get_requestor_email(requestor, domains):
+def get_requestor_email(requestor, domains=None, portfolio=None):
     """Get the requestor's email or raise an error if it's missing.
 
     If the requestor is staff, default email is returned.
+
+    Raises:
+        MissingEmailError
     """
     if requestor.is_staff:
         return settings.DEFAULT_FROM_EMAIL
 
     if not requestor.email or requestor.email.strip() == "":
-        domain_names = ", ".join([domain.name for domain in domains])
-        raise MissingEmailError(email=requestor.email, domain=domain_names)
+        domain_names = None
+        if domains:
+            domain_names = ", ".join([domain.name for domain in domains])
+        raise MissingEmailError(email=requestor.email, domain=domain_names, portfolio=portfolio)
 
     return requestor.email
 
@@ -191,15 +196,7 @@ def send_portfolio_invitation_email(email: str, requestor, portfolio, is_admin_i
         EmailSendingError: If there is an error while sending the email.
     """
 
-    # Default email address for staff
-    requestor_email = settings.DEFAULT_FROM_EMAIL
-
-    # Check if the requestor is staff and has an email
-    if not requestor.is_staff:
-        if not requestor.email or requestor.email.strip() == "":
-            raise MissingEmailError(email=email, portfolio=portfolio)
-        else:
-            requestor_email = requestor.email
+    requestor_email = get_requestor_email(requestor, portfolio=portfolio)
 
     try:
         send_templated_email(
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index e2743b864..a629309cc 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -15,7 +15,7 @@
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
 from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
 from registrar.utility.email import EmailSendingError
-from registrar.utility.email_invitations import send_domain_invitation_email, send_portfolio_invitation_email
+from registrar.utility.email_invitations import send_domain_invitation_email, send_portfolio_admin_addition_emails, send_portfolio_invitation_email
 from registrar.utility.errors import MissingEmailError
 from registrar.utility.enums import DefaultUserValues
 from registrar.views.utility.mixins import PortfolioMemberPermission
@@ -405,6 +405,19 @@ def post(self, request, pk):
         portfolio_invitation = get_object_or_404(PortfolioInvitation, pk=pk)
         form = self.form_class(request.POST, instance=portfolio_invitation)
         if form.is_valid():
+            try:
+                if form.is_change_from_member_to_admin():
+                    if not send_portfolio_admin_addition_emails(
+                        email=portfolio_invitation.email,
+                        requestor=request.user,
+                        portfolio=portfolio_invitation.portfolio
+                    ):
+                        messages.warning(self.request, "Could not send email notification to existing organization admins.")
+                elif form.is_change_from_admin_to_member():
+                    # NOTE: need to add portfolio_admin_removal_emails when ready
+                    pass
+            except Exception as e:
+                self._handle_exceptions(e)
             form.save()
             messages.success(self.request, "The member access and permission changes have been saved.")
             return redirect("invitedmember", pk=pk)
@@ -418,6 +431,18 @@ def post(self, request, pk):
             },
         )
 
+    def _handle_exceptions(self, exception):
+        """Handle exceptions raised during the process."""
+        if isinstance(exception, MissingEmailError):
+            messages.warning(self.request, "Could not send email notification to existing organization admins.")
+            logger.warning(
+                f"Could not send email notification to existing organization admins.",
+                exc_info=True,
+            )
+        else:
+            logger.warning("Could not send email notification to existing organization admins.", exc_info=True)
+            messages.warning(self.request, "Could not send email notification to existing organization admins.")
+
 
 class PortfolioInvitedMemberDomainsView(PortfolioMemberDomainsPermissionView, View):
 

From 04b375fae1e790e1704606e25d82d89bca9bb488 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 30 Jan 2025 11:01:57 -0500
Subject: [PATCH 03/17] removal email template

---
 .../portfolio_admin_removal_notification.txt  | 33 +++++++++++++++++++
 ...lio_admin_removal_notification_subject.txt |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 src/registrar/templates/emails/portfolio_admin_removal_notification.txt
 create mode 100644 src/registrar/templates/emails/portfolio_admin_removal_notification_subject.txt

diff --git a/src/registrar/templates/emails/portfolio_admin_removal_notification.txt b/src/registrar/templates/emails/portfolio_admin_removal_notification.txt
new file mode 100644
index 000000000..6a536aa49
--- /dev/null
+++ b/src/registrar/templates/emails/portfolio_admin_removal_notification.txt
@@ -0,0 +1,33 @@
+{% autoescape off %}{# In a text file, we don't want to have HTML entities escaped #}
+Hi,{% if portfolio_admin and portfolio_admin.first_name %} {{ portfolio_admin.first_name }}.{% endif %}
+
+An admin was removed from your .gov organization.
+
+ORGANIZATION: {{ portfolio.organization_name }} 
+REMOVED BY: {{ requestor_email }}
+REMOVED ON: {{date}}
+ADMIN REMOVED: {{ removed_email_address }}
+
+You can view this update by going to the Members section for your .gov organization <https://manage.get.gov/>.
+
+----------------------------------------------------------------
+
+WHY DID YOU RECEIVE THIS EMAIL? 
+You’re listed as an admin for {{ portfolio.organization_name }}. That means you'll receive a notification
+whenever an admin is removed from that organization.
+
+If you have questions or concerns, reach out to the person who removed the admin or reply to this email.
+
+
+THANK YOU
+.Gov helps the public identify official, trusted information. Thank you for using a .gov domain.
+
+----------------------------------------------------------------
+
+The .gov team
+Contact us: <https://get.gov/contact/>
+Learn about .gov <https://get.gov>
+
+The .gov registry is a part of the Cybersecurity and Infrastructure Security Agency
+(CISA) <https://cisa.gov/>
+{% endautoescape %}
diff --git a/src/registrar/templates/emails/portfolio_admin_removal_notification_subject.txt b/src/registrar/templates/emails/portfolio_admin_removal_notification_subject.txt
new file mode 100644
index 000000000..e250b17f8
--- /dev/null
+++ b/src/registrar/templates/emails/portfolio_admin_removal_notification_subject.txt
@@ -0,0 +1 @@
+An admin was removed from your .gov organization
\ No newline at end of file

From 4ce9efffcdfc1783bab23f90a16ef39248d10f45 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 30 Jan 2025 15:06:00 -0500
Subject: [PATCH 04/17] updates to complete initial implementation of
 invitation emails to admins

---
 src/registrar/admin.py                        | 15 ++++++++--
 src/registrar/tests/test_email_invitations.py | 10 +++----
 src/registrar/utility/email_invitations.py    | 28 +++++++++++++------
 src/registrar/views/domain.py                 |  4 ++-
 src/registrar/views/portfolios.py             | 12 ++++++--
 5 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 7dbe7abb0..a9944c4c0 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1543,7 +1543,9 @@ def save_model(self, request, obj, form, change):
                     and not member_of_this_org
                     and not member_of_a_different_org
                 ):
-                    send_portfolio_invitation_email(email=requested_email, requestor=requestor, portfolio=domain_org)
+                    send_portfolio_invitation_email(
+                        email=requested_email, requestor=requestor, portfolio=domain_org, is_admin_invitation=False
+                    )
                     portfolio_invitation, _ = PortfolioInvitation.objects.get_or_create(
                         email=requested_email,
                         portfolio=domain_org,
@@ -1638,6 +1640,7 @@ def save_model(self, request, obj, form, change):
             portfolio = obj.portfolio
             requested_email = obj.email
             requestor = request.user
+            is_admin_invitation = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in obj.roles
             # Look up a user with that email
             requested_user = get_requested_user(requested_email)
 
@@ -1647,7 +1650,15 @@ def save_model(self, request, obj, form, change):
             try:
                 if not permission_exists:
                     # if permission does not exist for a user with requested_email, send email
-                    send_portfolio_invitation_email(email=requested_email, requestor=requestor, portfolio=portfolio)
+                    if not send_portfolio_invitation_email(
+                        email=requested_email,
+                        requestor=requestor,
+                        portfolio=portfolio,
+                        is_admin_invitation=is_admin_invitation,
+                    ):
+                        messages.warning(
+                            self.request, "Could not send email notification to existing organization admins."
+                        )
                     # if user exists for email, immediately retrieve portfolio invitation upon creation
                     if requested_user is not None:
                         obj.retrieve()
diff --git a/src/registrar/tests/test_email_invitations.py b/src/registrar/tests/test_email_invitations.py
index 1377dec42..1914e73bd 100644
--- a/src/registrar/tests/test_email_invitations.py
+++ b/src/registrar/tests/test_email_invitations.py
@@ -16,7 +16,7 @@ class DomainInvitationEmail(unittest.TestCase):
     @patch("registrar.utility.email_invitations.send_templated_email")
     @patch("registrar.utility.email_invitations.UserDomainRole.objects.filter")
     @patch("registrar.utility.email_invitations._validate_invitation")
-    @patch("registrar.utility.email_invitations.get_requestor_email")
+    @patch("registrar.utility.email_invitations._get_requestor_email")
     @patch("registrar.utility.email_invitations.send_invitation_email")
     @patch("registrar.utility.email_invitations.normalize_domains")
     def test_send_domain_invitation_email(
@@ -81,7 +81,7 @@ def test_send_domain_invitation_email(
     @patch("registrar.utility.email_invitations.send_templated_email")
     @patch("registrar.utility.email_invitations.UserDomainRole.objects.filter")
     @patch("registrar.utility.email_invitations._validate_invitation")
-    @patch("registrar.utility.email_invitations.get_requestor_email")
+    @patch("registrar.utility.email_invitations._get_requestor_email")
     @patch("registrar.utility.email_invitations.send_invitation_email")
     @patch("registrar.utility.email_invitations.normalize_domains")
     def test_send_domain_invitation_email_multiple_domains(
@@ -197,7 +197,7 @@ def test_send_domain_invitation_email_raises_invite_validation_exception(self, m
         mock_validate_invitation.assert_called_once()
 
     @less_console_noise_decorator
-    @patch("registrar.utility.email_invitations.get_requestor_email")
+    @patch("registrar.utility.email_invitations._get_requestor_email")
     def test_send_domain_invitation_email_raises_get_requestor_email_exception(self, mock_get_requestor_email):
         """Test sending domain invitation email for one domain and assert exception
         when get_requestor_email fails.
@@ -217,7 +217,7 @@ def test_send_domain_invitation_email_raises_get_requestor_email_exception(self,
 
     @less_console_noise_decorator
     @patch("registrar.utility.email_invitations._validate_invitation")
-    @patch("registrar.utility.email_invitations.get_requestor_email")
+    @patch("registrar.utility.email_invitations._get_requestor_email")
     @patch("registrar.utility.email_invitations.send_invitation_email")
     @patch("registrar.utility.email_invitations.normalize_domains")
     def test_send_domain_invitation_email_raises_sending_email_exception(
@@ -267,7 +267,7 @@ def test_send_domain_invitation_email_raises_sending_email_exception(
     @less_console_noise_decorator
     @patch("registrar.utility.email_invitations.send_emails_to_domain_managers")
     @patch("registrar.utility.email_invitations._validate_invitation")
-    @patch("registrar.utility.email_invitations.get_requestor_email")
+    @patch("registrar.utility.email_invitations._get_requestor_email")
     @patch("registrar.utility.email_invitations.send_invitation_email")
     @patch("registrar.utility.email_invitations.normalize_domains")
     def test_send_domain_invitation_email_manager_emails_send_mail_exception(
diff --git a/src/registrar/utility/email_invitations.py b/src/registrar/utility/email_invitations.py
index 4e315cdda..209c8b392 100644
--- a/src/registrar/utility/email_invitations.py
+++ b/src/registrar/utility/email_invitations.py
@@ -1,6 +1,7 @@
 from datetime import date
 from django.conf import settings
 from registrar.models import Domain, DomainInvitation, UserDomainRole
+from registrar.models.portfolio import Portfolio
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
 from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
 from registrar.utility.errors import (
@@ -40,7 +41,7 @@ def send_domain_invitation_email(
         EmailSendingError: If there is an error while sending the email.
     """
     domains = normalize_domains(domains)
-    requestor_email = get_requestor_email(requestor, domains=domains)
+    requestor_email = _get_requestor_email(requestor, domains=domains)
 
     _validate_invitation(email, requested_user, domains, requestor, is_member_of_different_org)
 
@@ -99,7 +100,7 @@ def normalize_domains(domains: Domain | list[Domain]) -> list[Domain]:
     return [domains] if isinstance(domains, Domain) else domains
 
 
-def get_requestor_email(requestor, domains=None, portfolio=None):
+def _get_requestor_email(requestor, domains=None, portfolio=None):
     """Get the requestor's email or raise an error if it's missing.
 
     If the requestor is staff, default email is returned.
@@ -196,7 +197,7 @@ def send_portfolio_invitation_email(email: str, requestor, portfolio, is_admin_i
         EmailSendingError: If there is an error while sending the email.
     """
 
-    requestor_email = get_requestor_email(requestor, portfolio=portfolio)
+    requestor_email = _get_requestor_email(requestor, portfolio=portfolio)
 
     try:
         send_templated_email(
@@ -217,18 +218,29 @@ def send_portfolio_invitation_email(email: str, requestor, portfolio, is_admin_i
     all_admin_emails_sent = True
     # send emails to portfolio admins
     if is_admin_invitation:
-        all_admin_emails_sent = send_portfolio_admin_addition_emails_to_portfolio_admins(
+        all_admin_emails_sent = _send_portfolio_admin_addition_emails_to_portfolio_admins(
             email=email,
             requestor_email=requestor_email,
             portfolio=portfolio,
-            requested_user=None,
         )
     return all_admin_emails_sent
 
 
-def send_portfolio_admin_addition_emails_to_portfolio_admins(
-    email: str, requestor_email, portfolio: Domain, requested_user=None
-):
+def send_portfolio_admin_addition_emails(email: str, requestor, portfolio: Portfolio):
+    """
+    Notifies all portfolio admins of the provided portfolio of a newly invited portfolio admin
+
+    Returns:
+        Boolean indicating if all messages were sent successfully.
+
+    Raises:
+        MissingEmailError
+    """
+    requestor_email = _get_requestor_email(requestor, portfolio=portfolio)
+    return _send_portfolio_admin_addition_emails_to_portfolio_admins(email, requestor_email, portfolio)
+
+
+def _send_portfolio_admin_addition_emails_to_portfolio_admins(email: str, requestor_email, portfolio: Portfolio):
     """
     Notifies all portfolio admins of the provided portfolio of a newly invited portfolio admin
 
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index a1d2b8081..464e0d2a1 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -1206,7 +1206,9 @@ def form_valid(self, form):
                 and requestor_can_update_portfolio
                 and not member_of_this_org
             ):
-                send_portfolio_invitation_email(email=requested_email, requestor=requestor, portfolio=domain_org)
+                send_portfolio_invitation_email(
+                    email=requested_email, requestor=requestor, portfolio=domain_org, is_admin_invitation=False
+                )
                 portfolio_invitation, _ = PortfolioInvitation.objects.get_or_create(
                     email=requested_email, portfolio=domain_org, roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER]
                 )
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 28933ec65..b8003b622 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -15,7 +15,11 @@
 from registrar.models.user_portfolio_permission import UserPortfolioPermission
 from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
 from registrar.utility.email import EmailSendingError
-from registrar.utility.email_invitations import send_domain_invitation_email, send_portfolio_admin_addition_emails, send_portfolio_invitation_email
+from registrar.utility.email_invitations import (
+    send_domain_invitation_email,
+    send_portfolio_admin_addition_emails,
+    send_portfolio_invitation_email,
+)
 from registrar.utility.errors import MissingEmailError
 from registrar.utility.enums import DefaultUserValues
 from registrar.views.utility.mixins import PortfolioMemberPermission
@@ -418,9 +422,11 @@ def post(self, request, pk):
                     if not send_portfolio_admin_addition_emails(
                         email=portfolio_invitation.email,
                         requestor=request.user,
-                        portfolio=portfolio_invitation.portfolio
+                        portfolio=portfolio_invitation.portfolio,
                     ):
-                        messages.warning(self.request, "Could not send email notification to existing organization admins.")
+                        messages.warning(
+                            self.request, "Could not send email notification to existing organization admins."
+                        )
                 elif form.is_change_from_admin_to_member():
                     # NOTE: need to add portfolio_admin_removal_emails when ready
                     pass

From f786d13cdf70e1a03ab9ef97d022e5047e101471 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 30 Jan 2025 15:45:30 -0500
Subject: [PATCH 05/17] handle demoted member

---
 src/registrar/views/portfolios.py | 53 ++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index b8003b622..74e53d8c1 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -18,6 +18,7 @@
 from registrar.utility.email_invitations import (
     send_domain_invitation_email,
     send_portfolio_admin_addition_emails,
+    send_portfolio_admin_removal_emails,
     send_portfolio_invitation_email,
 )
 from registrar.utility.errors import MissingEmailError
@@ -185,12 +186,29 @@ def post(self, request, pk):
         user = portfolio_permission.user
         form = self.form_class(request.POST, instance=portfolio_permission)
         if form.is_valid():
-            # Check if user is removing their own admin or edit role
-            removing_admin_role_on_self = (
-                request.user == user
-                and user_initially_is_admin
-                and UserPortfolioRoleChoices.ORGANIZATION_ADMIN not in form.cleaned_data.get("role", [])
-            )
+            try:
+                if form.is_change_from_member_to_admin():
+                    if not send_portfolio_admin_addition_emails(
+                        email=portfolio_permission.user.email,
+                        requestor=request.user,
+                        portfolio=portfolio_permission.portfolio
+                    ):
+                        messages.warning(
+                            self.request, "Could not send email notification to existing organization admins."
+                        )
+                elif form.is_change_from_admin_to_member():
+                    if not send_portfolio_admin_removal_emails(
+                        email=portfolio_permission.user.email,
+                        requestor=request.user,
+                        portfolio=portfolio_permission.portfolio
+                    ):
+                        messages.warning(
+                            self.request, "Could not send email notification to existing organization admins."
+                        )
+                    # Check if user is removing their own admin or edit role
+                    removing_admin_role_on_self = (request.user == user)
+            except Exception as e:
+                self._handle_exceptions(e)        
             form.save()
             messages.success(self.request, "The member access and permission changes have been saved.")
             return redirect("member", pk=pk) if not removing_admin_role_on_self else redirect("home")
@@ -203,6 +221,19 @@ def post(self, request, pk):
                 "member": user,  # Pass the user object again to the template
             },
         )
+    
+    def _handle_exceptions(self, exception):
+        """Handle exceptions raised during the process."""
+        if isinstance(exception, MissingEmailError):
+            messages.warning(self.request, "Could not send email notification to existing organization admins.")
+            logger.warning(
+                f"Could not send email notification to existing organization admins.",
+                exc_info=True,
+            )
+        else:
+            logger.warning("Could not send email notification to existing organization admins.", exc_info=True)
+            messages.warning(self.request, "Could not send email notification to existing organization admins.")
+
 
 
 class PortfolioMemberDomainsView(PortfolioMemberDomainsPermissionView, View):
@@ -428,8 +459,14 @@ def post(self, request, pk):
                             self.request, "Could not send email notification to existing organization admins."
                         )
                 elif form.is_change_from_admin_to_member():
-                    # NOTE: need to add portfolio_admin_removal_emails when ready
-                    pass
+                    if not send_portfolio_admin_removal_emails(
+                        email=portfolio_invitation.email,
+                        requestor=request.user,
+                        portfolio=portfolio_invitation.portfolio
+                    ):
+                        messages.warning(
+                            self.request, "Could not send email notification to existing organization admins."
+                        )
             except Exception as e:
                 self._handle_exceptions(e)
             form.save()

From b1f528b9a25671cde2dd7832bc147f700b80bb0a Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 30 Jan 2025 16:30:18 -0500
Subject: [PATCH 06/17] handle removals

---
 src/registrar/utility/email_invitations.py | 51 ++++++++++++++++++++
 src/registrar/views/portfolios.py          | 55 +++++++++++++++++++++-
 2 files changed, 105 insertions(+), 1 deletion(-)

diff --git a/src/registrar/utility/email_invitations.py b/src/registrar/utility/email_invitations.py
index 209c8b392..8f6cdd35a 100644
--- a/src/registrar/utility/email_invitations.py
+++ b/src/registrar/utility/email_invitations.py
@@ -275,3 +275,54 @@ def _send_portfolio_admin_addition_emails_to_portfolio_admins(email: str, reques
             )
         all_emails_sent = False
     return all_emails_sent
+
+
+def send_portfolio_admin_removal_emails(email: str, requestor, portfolio: Portfolio):
+    """
+    Notifies all portfolio admins of the provided portfolio of a removed portfolio admin
+
+    Returns:
+        Boolean indicating if all messages were sent successfully.
+
+    Raises:
+        MissingEmailError
+    """
+    requestor_email = _get_requestor_email(requestor, portfolio=portfolio)
+    return _send_portfolio_admin_removal_emails_to_portfolio_admins(email, requestor_email, portfolio)
+
+
+def _send_portfolio_admin_removal_emails_to_portfolio_admins(email: str, requestor_email, portfolio: Portfolio):
+    """
+    Notifies all portfolio admins of the provided portfolio of a removed portfolio admin
+
+    Returns:
+        Boolean indicating if all messages were sent successfully.
+    """
+    all_emails_sent = True
+    # Get each portfolio admin from list
+    user_portfolio_permissions = UserPortfolioPermission.objects.filter(
+        portfolio=portfolio, roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+    ).exclude(user__email=email)
+    for user_portfolio_permission in user_portfolio_permissions:
+        # Send email to each portfolio_admin
+        user = user_portfolio_permission.user
+        try:
+            send_templated_email(
+                "emails/portfolio_admin_removal_notification.txt",
+                "emails/portfolio_admin_removal_notification_subject.txt",
+                to_address=user.email,
+                context={
+                    "portfolio": portfolio,
+                    "requestor_email": requestor_email,
+                    "removed_email_address": email,
+                    "portfolio_admin": user,
+                    "date": date.today(),
+                },
+            )
+        except EmailSendingError:
+            logger.warning(
+                f"Could not send email organization admin notification to {user.email} for portfolio: {portfolio.name}",
+                exc_info=True,
+            )
+        all_emails_sent = False
+    return all_emails_sent
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 74e53d8c1..c79072537 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -148,6 +148,21 @@ def post(self, request, pk):
                 messages.error(request, error_message)
                 return redirect(reverse("member", kwargs={"pk": pk}))
 
+        # if member being removed is an admin
+        if UserPortfolioRoleChoices.ORGANIZATION_ADMIN in portfolio_member_permission.roles:
+            try:
+                # attempt to send notification emails of the removal to other portfolio admins
+                if not send_portfolio_admin_removal_emails(
+                    email=portfolio_member_permission.user.email,
+                    requestor=request.user,
+                    portfolio=portfolio_member_permission.portfolio
+                ):
+                    messages.warning(
+                        self.request, "Could not send email notification to existing organization admins."
+                    )
+            except Exception as e:
+                self._handle_exceptions(e)
+
         # passed all error conditions
         portfolio_member_permission.delete()
 
@@ -159,6 +174,18 @@ def post(self, request, pk):
             messages.success(request, success_message)
             return redirect(reverse("members"))
 
+    def _handle_exceptions(self, exception):
+        """Handle exceptions raised during the process."""
+        if isinstance(exception, MissingEmailError):
+            messages.warning(self.request, "Could not send email notification to existing organization admins.")
+            logger.warning(
+                f"Could not send email notification to existing organization admins.",
+                exc_info=True,
+            )
+        else:
+            logger.warning("Could not send email notification to existing organization admins.", exc_info=True)
+            messages.warning(self.request, "Could not send email notification to existing organization admins.")
+
 
 class PortfolioMemberEditView(PortfolioMemberEditPermissionView, View):
 
@@ -182,7 +209,6 @@ def get(self, request, pk):
 
     def post(self, request, pk):
         portfolio_permission = get_object_or_404(UserPortfolioPermission, pk=pk)
-        user_initially_is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in portfolio_permission.roles
         user = portfolio_permission.user
         form = self.form_class(request.POST, instance=portfolio_permission)
         if form.is_valid():
@@ -415,6 +441,21 @@ def post(self, request, pk):
         """
         portfolio_invitation = get_object_or_404(PortfolioInvitation, pk=pk)
 
+        # if invitation being removed is an admin
+        if UserPortfolioRoleChoices.ORGANIZATION_ADMIN in portfolio_invitation.roles:
+            try:
+                # attempt to send notification emails of the removal to portfolio admins
+                if not send_portfolio_admin_removal_emails(
+                    email=portfolio_invitation.email,
+                    requestor=request.user,
+                    portfolio=portfolio_invitation.portfolio
+                ):
+                    messages.warning(
+                        self.request, "Could not send email notification to existing organization admins."
+                    )
+            except Exception as e:
+                self._handle_exceptions(e)
+
         portfolio_invitation.delete()
 
         success_message = f"You've removed {portfolio_invitation.email} from the organization."
@@ -425,6 +466,18 @@ def post(self, request, pk):
             messages.success(request, success_message)
             return redirect(reverse("members"))
 
+    def _handle_exceptions(self, exception):
+        """Handle exceptions raised during the process."""
+        if isinstance(exception, MissingEmailError):
+            messages.warning(self.request, "Could not send email notification to existing organization admins.")
+            logger.warning(
+                f"Could not send email notification to existing organization admins.",
+                exc_info=True,
+            )
+        else:
+            logger.warning("Could not send email notification to existing organization admins.", exc_info=True)
+            messages.warning(self.request, "Could not send email notification to existing organization admins.")
+            
 
 class PortfolioInvitedMemberEditView(PortfolioMemberEditPermissionView, View):
 

From 5996c4df123f181ba5d7baa3ff8477956d20506d Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 31 Jan 2025 13:07:36 -0500
Subject: [PATCH 07/17] wip

---
 src/registrar/models/utility/portfolio_helper.py | 15 +++++++++++----
 src/registrar/utility/email_invitations.py       |  4 ++--
 src/registrar/views/portfolios.py                |  3 ++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/registrar/models/utility/portfolio_helper.py b/src/registrar/models/utility/portfolio_helper.py
index b3bb07c3d..d0a369c56 100644
--- a/src/registrar/models/utility/portfolio_helper.py
+++ b/src/registrar/models/utility/portfolio_helper.py
@@ -1,5 +1,6 @@
 from registrar.utility import StrEnum
 from django.db import models
+from django.db.models import Q
 from django.apps import apps
 from django.forms import ValidationError
 from registrar.utility.waffle import flag_is_active_for_user
@@ -136,9 +137,12 @@ def validate_user_portfolio_permission(user_portfolio_permission):
                 "Based on current waffle flag settings, users cannot be assigned to multiple portfolios."
             )
 
-        existing_invitations = PortfolioInvitation.objects.exclude(
-            portfolio=user_portfolio_permission.portfolio
-        ).filter(email=user_portfolio_permission.user.email)
+        existing_invitations = PortfolioInvitation.objects.filter(
+            email=user_portfolio_permission.user.email
+        ).exclude(
+            Q(portfolio=user_portfolio_permission.portfolio) | 
+            Q(status=PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED)
+        )
         if existing_invitations.exists():
             raise ValidationError(
                 "This user is already assigned to a portfolio invitation. "
@@ -195,8 +199,11 @@ def validate_portfolio_invitation(portfolio_invitation):
     if not flag_is_active_for_user(user, "multiple_portfolios"):
         existing_permissions = UserPortfolioPermission.objects.filter(user=user)
 
-        existing_invitations = PortfolioInvitation.objects.exclude(id=portfolio_invitation.id).filter(
+        existing_invitations = PortfolioInvitation.objects.filter(
             email=portfolio_invitation.email
+        ).exclude(
+            Q(id=portfolio_invitation.id) |
+            Q(status=PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED)
         )
 
         if existing_permissions.exists():
diff --git a/src/registrar/utility/email_invitations.py b/src/registrar/utility/email_invitations.py
index 8f6cdd35a..7d3a015c1 100644
--- a/src/registrar/utility/email_invitations.py
+++ b/src/registrar/utility/email_invitations.py
@@ -273,7 +273,7 @@ def _send_portfolio_admin_addition_emails_to_portfolio_admins(email: str, reques
                 f"Could not send email organization admin notification to {user.email} for portfolio: {portfolio.name}",
                 exc_info=True,
             )
-        all_emails_sent = False
+            all_emails_sent = False
     return all_emails_sent
 
 
@@ -324,5 +324,5 @@ def _send_portfolio_admin_removal_emails_to_portfolio_admins(email: str, request
                 f"Could not send email organization admin notification to {user.email} for portfolio: {portfolio.name}",
                 exc_info=True,
             )
-        all_emails_sent = False
+            all_emails_sent = False
     return all_emails_sent
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index c79072537..41f37baee 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -211,6 +211,7 @@ def post(self, request, pk):
         portfolio_permission = get_object_or_404(UserPortfolioPermission, pk=pk)
         user = portfolio_permission.user
         form = self.form_class(request.POST, instance=portfolio_permission)
+        removing_admin_role_on_self = False
         if form.is_valid():
             try:
                 if form.is_change_from_member_to_admin():
@@ -477,7 +478,7 @@ def _handle_exceptions(self, exception):
         else:
             logger.warning("Could not send email notification to existing organization admins.", exc_info=True)
             messages.warning(self.request, "Could not send email notification to existing organization admins.")
-            
+
 
 class PortfolioInvitedMemberEditView(PortfolioMemberEditPermissionView, View):
 

From 041df217b5a6b5073dfcc27e1795e13a75943bde Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 1 Feb 2025 07:02:22 -0500
Subject: [PATCH 08/17] handle changes to PortfolioInvitation in DJA

---
 src/registrar/admin.py | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index a9944c4c0..1e7d411a6 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -28,7 +28,7 @@
 from django_fsm import get_available_FIELD_transitions, FSMField
 from registrar.models import DomainInformation, Portfolio, UserPortfolioPermission, DomainInvitation
 from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
-from registrar.utility.email_invitations import send_domain_invitation_email, send_portfolio_invitation_email
+from registrar.utility.email_invitations import send_domain_invitation_email, send_portfolio_admin_addition_emails, send_portfolio_invitation_email
 from registrar.views.utility.invitation_helper import (
     get_org_membership,
     get_requested_user,
@@ -1636,18 +1636,18 @@ def save_model(self, request, obj, form, change):
         Emails sent to requested user / email.
         When exceptions are raised, return without saving model.
         """
-        if not change:  # Only send email if this is a new PortfolioInvitation (creation)
+        try:
             portfolio = obj.portfolio
             requested_email = obj.email
             requestor = request.user
             is_admin_invitation = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in obj.roles
-            # Look up a user with that email
-            requested_user = get_requested_user(requested_email)
+            if not change:  # Only send email if this is a new PortfolioInvitation (creation)
+                # Look up a user with that email
+                requested_user = get_requested_user(requested_email)
 
-            permission_exists = UserPortfolioPermission.objects.filter(
-                user__email=requested_email, portfolio=portfolio, user__email__isnull=False
-            ).exists()
-            try:
+                permission_exists = UserPortfolioPermission.objects.filter(
+                    user__email=requested_email, portfolio=portfolio, user__email__isnull=False
+                ).exists()
                 if not permission_exists:
                     # if permission does not exist for a user with requested_email, send email
                     if not send_portfolio_invitation_email(
@@ -1665,10 +1665,28 @@ def save_model(self, request, obj, form, change):
                     messages.success(request, f"{requested_email} has been invited.")
                 else:
                     messages.warning(request, "User is already a member of this portfolio.")
-            except Exception as e:
-                # when exception is raised, handle and do not save the model
-                handle_invitation_exceptions(request, e, requested_email)
-                return
+            else:  # Handle the case when updating an existing PortfolioInvitation
+                # Retrieve the existing object from the database
+                existing_obj = PortfolioInvitation.objects.get(pk=obj.pk)
+
+                # Check if the previous roles did NOT include ORGANIZATION_ADMIN
+                # and the new roles DO include ORGANIZATION_ADMIN
+                was_not_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN not in existing_obj.roles
+                # Check also if status is INVITED, ignore role changes for other statuses
+                is_invited = obj.status == PortfolioInvitation.PortfolioInvitationStatus.INVITED
+
+                if was_not_admin and is_admin_invitation and is_invited:
+                    # send email to existing portfolio admins if new admin
+                    if not send_portfolio_admin_addition_emails(
+                        email=requested_email,
+                        requestor=requestor,
+                        portfolio=portfolio,
+                    ):
+                        messages.warning(request, "Could not send email notification to existing organization admins.")
+        except Exception as e:
+            # when exception is raised, handle and do not save the model
+            handle_invitation_exceptions(request, e, requested_email)
+            return
         # Call the parent save method to save the object
         super().save_model(request, obj, form, change)
 

From 6671545c55690df7161d1800b7356553c9fc6e0c Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 1 Feb 2025 08:10:10 -0500
Subject: [PATCH 09/17] fixed existing tests and lint errors

---
 src/registrar/admin.py                        |  6 +++-
 .../models/utility/portfolio_helper.py        | 15 +++-----
 src/registrar/tests/test_admin.py             |  6 ++++
 src/registrar/tests/test_email_invitations.py |  8 ++---
 src/registrar/tests/test_views_domain.py      | 15 ++++++--
 src/registrar/tests/test_views_portfolio.py   |  7 ++--
 src/registrar/utility/email_invitations.py    |  8 +++--
 src/registrar/views/portfolios.py             | 35 ++++++++-----------
 8 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 1e7d411a6..e5c5cafe2 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -28,7 +28,11 @@
 from django_fsm import get_available_FIELD_transitions, FSMField
 from registrar.models import DomainInformation, Portfolio, UserPortfolioPermission, DomainInvitation
 from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
-from registrar.utility.email_invitations import send_domain_invitation_email, send_portfolio_admin_addition_emails, send_portfolio_invitation_email
+from registrar.utility.email_invitations import (
+    send_domain_invitation_email,
+    send_portfolio_admin_addition_emails,
+    send_portfolio_invitation_email,
+)
 from registrar.views.utility.invitation_helper import (
     get_org_membership,
     get_requested_user,
diff --git a/src/registrar/models/utility/portfolio_helper.py b/src/registrar/models/utility/portfolio_helper.py
index d0a369c56..49c2cc1dc 100644
--- a/src/registrar/models/utility/portfolio_helper.py
+++ b/src/registrar/models/utility/portfolio_helper.py
@@ -137,11 +137,9 @@ def validate_user_portfolio_permission(user_portfolio_permission):
                 "Based on current waffle flag settings, users cannot be assigned to multiple portfolios."
             )
 
-        existing_invitations = PortfolioInvitation.objects.filter(
-            email=user_portfolio_permission.user.email
-        ).exclude(
-            Q(portfolio=user_portfolio_permission.portfolio) | 
-            Q(status=PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED)
+        existing_invitations = PortfolioInvitation.objects.filter(email=user_portfolio_permission.user.email).exclude(
+            Q(portfolio=user_portfolio_permission.portfolio)
+            | Q(status=PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED)
         )
         if existing_invitations.exists():
             raise ValidationError(
@@ -199,11 +197,8 @@ def validate_portfolio_invitation(portfolio_invitation):
     if not flag_is_active_for_user(user, "multiple_portfolios"):
         existing_permissions = UserPortfolioPermission.objects.filter(user=user)
 
-        existing_invitations = PortfolioInvitation.objects.filter(
-            email=portfolio_invitation.email
-        ).exclude(
-            Q(id=portfolio_invitation.id) |
-            Q(status=PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED)
+        existing_invitations = PortfolioInvitation.objects.filter(email=portfolio_invitation.email).exclude(
+            Q(id=portfolio_invitation.id) | Q(status=PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED)
         )
 
         if existing_permissions.exists():
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 387319663..1025cf369 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -254,6 +254,7 @@ def test_add_domain_invitation_success_when_user_not_portfolio_member(
             email="test@example.com",
             requestor=self.superuser,
             portfolio=self.portfolio,
+            is_admin_invitation=False,
         )
 
         # Assert success message
@@ -504,6 +505,7 @@ def test_add_domain_invitation_when_user_not_portfolio_member_raises_exception_s
             email="test@example.com",
             requestor=self.superuser,
             portfolio=self.portfolio,
+            is_admin_invitation=False,
         )
 
         # Assert retrieve on domain invite only was called
@@ -567,6 +569,7 @@ def test_add_domain_invitation_when_user_not_portfolio_member_raises_exception_s
             email="test@example.com",
             requestor=self.superuser,
             portfolio=self.portfolio,
+            is_admin_invitation=False,
         )
 
         # Assert retrieve on domain invite only was called
@@ -693,6 +696,7 @@ def test_add_domain_invitation_success_when_email_not_portfolio_member(
             email="nonexistent@example.com",
             requestor=self.superuser,
             portfolio=self.portfolio,
+            is_admin_invitation=False,
         )
 
         # Assert retrieve was not called
@@ -918,6 +922,7 @@ def test_add_domain_invitation_when_user_not_portfolio_email_raises_exception_se
             email="nonexistent@example.com",
             requestor=self.superuser,
             portfolio=self.portfolio,
+            is_admin_invitation=False,
         )
 
         # Assert retrieve on domain invite only was called
@@ -979,6 +984,7 @@ def test_add_domain_invitation_when_user_not_portfolio_email_raises_exception_se
             email="nonexistent@example.com",
             requestor=self.superuser,
             portfolio=self.portfolio,
+            is_admin_invitation=False,
         )
 
         # Assert retrieve on domain invite only was called
diff --git a/src/registrar/tests/test_email_invitations.py b/src/registrar/tests/test_email_invitations.py
index 1914e73bd..f5b12ff22 100644
--- a/src/registrar/tests/test_email_invitations.py
+++ b/src/registrar/tests/test_email_invitations.py
@@ -58,7 +58,7 @@ def test_send_domain_invitation_email(
 
         # Assertions
         mock_normalize_domains.assert_called_once_with(mock_domain)
-        mock_get_requestor_email.assert_called_once_with(mock_requestor, [mock_domain])
+        mock_get_requestor_email.assert_called_once_with(mock_requestor, domains=[mock_domain])
         mock_validate_invitation.assert_called_once_with(
             email, None, [mock_domain], mock_requestor, is_member_of_different_org
         )
@@ -137,7 +137,7 @@ def filter_side_effect(domain):
 
         # Assertions
         mock_normalize_domains.assert_called_once_with([mock_domain1, mock_domain2])
-        mock_get_requestor_email.assert_called_once_with(mock_requestor, [mock_domain1, mock_domain2])
+        mock_get_requestor_email.assert_called_once_with(mock_requestor, domains=[mock_domain1, mock_domain2])
         mock_validate_invitation.assert_called_once_with(
             email, None, [mock_domain1, mock_domain2], mock_requestor, is_member_of_different_org
         )
@@ -258,7 +258,7 @@ def test_send_domain_invitation_email_raises_sending_email_exception(
 
         # Assertions
         mock_normalize_domains.assert_called_once_with(mock_domain)
-        mock_get_requestor_email.assert_called_once_with(mock_requestor, [mock_domain])
+        mock_get_requestor_email.assert_called_once_with(mock_requestor, domains=[mock_domain])
         mock_validate_invitation.assert_called_once_with(
             email, None, [mock_domain], mock_requestor, is_member_of_different_org
         )
@@ -306,7 +306,7 @@ def test_send_domain_invitation_email_manager_emails_send_mail_exception(
 
         # Assertions
         mock_normalize_domains.assert_called_once_with(mock_domain)
-        mock_get_requestor_email.assert_called_once_with(mock_requestor, [mock_domain])
+        mock_get_requestor_email.assert_called_once_with(mock_requestor, domains=[mock_domain])
         mock_validate_invitation.assert_called_once_with(
             email, None, [mock_domain], mock_requestor, is_member_of_different_org
         )
diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index 7035e0bd0..ba4d4485f 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -810,7 +810,10 @@ def test_domain_user_add_form_sends_portfolio_invitation(self, mock_send_domain_
 
         # Verify that the invitation emails were sent
         mock_send_portfolio_email.assert_called_once_with(
-            email="mayor@igorville.gov", requestor=self.user, portfolio=self.portfolio
+            email="mayor@igorville.gov",
+            requestor=self.user,
+            portfolio=self.portfolio,
+            is_admin_invitation=False,
         )
         mock_send_domain_email.assert_called_once()
         call_args = mock_send_domain_email.call_args.kwargs
@@ -864,7 +867,10 @@ def test_domain_user_add_form_sends_portfolio_invitation_to_new_email(
 
         # Verify that the invitation emails were sent
         mock_send_portfolio_email.assert_called_once_with(
-            email="notauser@igorville.gov", requestor=self.user, portfolio=self.portfolio
+            email="notauser@igorville.gov",
+            requestor=self.user,
+            portfolio=self.portfolio,
+            is_admin_invitation=False,
         )
         mock_send_domain_email.assert_called_once()
         call_args = mock_send_domain_email.call_args.kwargs
@@ -999,7 +1005,10 @@ def test_domain_user_add_form_sends_portfolio_invitation_raises_email_sending_er
 
         # Verify that the invitation emails were sent
         mock_send_portfolio_email.assert_called_once_with(
-            email="mayor@igorville.gov", requestor=self.user, portfolio=self.portfolio
+            email="mayor@igorville.gov",
+            requestor=self.user,
+            portfolio=self.portfolio,
+            is_admin_invitation=False,
         )
         mock_send_domain_email.assert_not_called()
 
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 33f334f7f..876583a39 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -3290,7 +3290,7 @@ def test_submit_new_member_raises_missing_email_error(self, mock_send_email):
             # Assert
             # assert that the send_portfolio_invitation_email called
             mock_send_email.assert_called_once_with(
-                email=self.new_member_email, requestor=self.user, portfolio=self.portfolio
+                email=self.new_member_email, requestor=self.user, portfolio=self.portfolio, is_admin_invitation=False
             )
             # assert that response is a redirect to reverse("members")
             self.assertRedirects(response, reverse("members"))
@@ -3334,7 +3334,10 @@ def test_submit_new_member_raises_exception(self, mock_send_email):
             # Assert
             # assert that the send_portfolio_invitation_email called
             mock_send_email.assert_called_once_with(
-                email=self.new_member_email, requestor=self.user, portfolio=self.portfolio
+                email=self.new_member_email,
+                requestor=self.user,
+                portfolio=self.portfolio,
+                is_admin_invitation=False,
             )
             # assert that response is a redirect to reverse("members")
             self.assertRedirects(response, reverse("members"))
diff --git a/src/registrar/utility/email_invitations.py b/src/registrar/utility/email_invitations.py
index 7d3a015c1..f1c366502 100644
--- a/src/registrar/utility/email_invitations.py
+++ b/src/registrar/utility/email_invitations.py
@@ -270,7 +270,9 @@ def _send_portfolio_admin_addition_emails_to_portfolio_admins(email: str, reques
             )
         except EmailSendingError:
             logger.warning(
-                f"Could not send email organization admin notification to {user.email} for portfolio: {portfolio.name}",
+                "Could not send email organization admin notification to %s " "for portfolio: %s",
+                user.email,
+                portfolio.organization_name,
                 exc_info=True,
             )
             all_emails_sent = False
@@ -321,7 +323,9 @@ def _send_portfolio_admin_removal_emails_to_portfolio_admins(email: str, request
             )
         except EmailSendingError:
             logger.warning(
-                f"Could not send email organization admin notification to {user.email} for portfolio: {portfolio.name}",
+                "Could not send email organization admin notification to %s " "for portfolio: %s",
+                user.email,
+                portfolio.organization_name,
                 exc_info=True,
             )
             all_emails_sent = False
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 41f37baee..c5cc72c59 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -155,11 +155,9 @@ def post(self, request, pk):
                 if not send_portfolio_admin_removal_emails(
                     email=portfolio_member_permission.user.email,
                     requestor=request.user,
-                    portfolio=portfolio_member_permission.portfolio
+                    portfolio=portfolio_member_permission.portfolio,
                 ):
-                    messages.warning(
-                        self.request, "Could not send email notification to existing organization admins."
-                    )
+                    messages.warning(self.request, "Could not send email notification to existing organization admins.")
             except Exception as e:
                 self._handle_exceptions(e)
 
@@ -179,7 +177,7 @@ def _handle_exceptions(self, exception):
         if isinstance(exception, MissingEmailError):
             messages.warning(self.request, "Could not send email notification to existing organization admins.")
             logger.warning(
-                f"Could not send email notification to existing organization admins.",
+                "Could not send email notification to existing organization admins.",
                 exc_info=True,
             )
         else:
@@ -218,7 +216,7 @@ def post(self, request, pk):
                     if not send_portfolio_admin_addition_emails(
                         email=portfolio_permission.user.email,
                         requestor=request.user,
-                        portfolio=portfolio_permission.portfolio
+                        portfolio=portfolio_permission.portfolio,
                     ):
                         messages.warning(
                             self.request, "Could not send email notification to existing organization admins."
@@ -227,15 +225,15 @@ def post(self, request, pk):
                     if not send_portfolio_admin_removal_emails(
                         email=portfolio_permission.user.email,
                         requestor=request.user,
-                        portfolio=portfolio_permission.portfolio
+                        portfolio=portfolio_permission.portfolio,
                     ):
                         messages.warning(
                             self.request, "Could not send email notification to existing organization admins."
                         )
                     # Check if user is removing their own admin or edit role
-                    removing_admin_role_on_self = (request.user == user)
+                    removing_admin_role_on_self = request.user == user
             except Exception as e:
-                self._handle_exceptions(e)        
+                self._handle_exceptions(e)
             form.save()
             messages.success(self.request, "The member access and permission changes have been saved.")
             return redirect("member", pk=pk) if not removing_admin_role_on_self else redirect("home")
@@ -248,13 +246,13 @@ def post(self, request, pk):
                 "member": user,  # Pass the user object again to the template
             },
         )
-    
+
     def _handle_exceptions(self, exception):
         """Handle exceptions raised during the process."""
         if isinstance(exception, MissingEmailError):
             messages.warning(self.request, "Could not send email notification to existing organization admins.")
             logger.warning(
-                f"Could not send email notification to existing organization admins.",
+                "Could not send email notification to existing organization admins.",
                 exc_info=True,
             )
         else:
@@ -262,7 +260,6 @@ def _handle_exceptions(self, exception):
             messages.warning(self.request, "Could not send email notification to existing organization admins.")
 
 
-
 class PortfolioMemberDomainsView(PortfolioMemberDomainsPermissionView, View):
 
     template_name = "portfolio_member_domains.html"
@@ -447,13 +444,9 @@ def post(self, request, pk):
             try:
                 # attempt to send notification emails of the removal to portfolio admins
                 if not send_portfolio_admin_removal_emails(
-                    email=portfolio_invitation.email,
-                    requestor=request.user,
-                    portfolio=portfolio_invitation.portfolio
+                    email=portfolio_invitation.email, requestor=request.user, portfolio=portfolio_invitation.portfolio
                 ):
-                    messages.warning(
-                        self.request, "Could not send email notification to existing organization admins."
-                    )
+                    messages.warning(self.request, "Could not send email notification to existing organization admins.")
             except Exception as e:
                 self._handle_exceptions(e)
 
@@ -472,7 +465,7 @@ def _handle_exceptions(self, exception):
         if isinstance(exception, MissingEmailError):
             messages.warning(self.request, "Could not send email notification to existing organization admins.")
             logger.warning(
-                f"Could not send email notification to existing organization admins.",
+                "Could not send email notification to existing organization admins.",
                 exc_info=True,
             )
         else:
@@ -516,7 +509,7 @@ def post(self, request, pk):
                     if not send_portfolio_admin_removal_emails(
                         email=portfolio_invitation.email,
                         requestor=request.user,
-                        portfolio=portfolio_invitation.portfolio
+                        portfolio=portfolio_invitation.portfolio,
                     ):
                         messages.warning(
                             self.request, "Could not send email notification to existing organization admins."
@@ -541,7 +534,7 @@ def _handle_exceptions(self, exception):
         if isinstance(exception, MissingEmailError):
             messages.warning(self.request, "Could not send email notification to existing organization admins.")
             logger.warning(
-                f"Could not send email notification to existing organization admins.",
+                "Could not send email notification to existing organization admins.",
                 exc_info=True,
             )
         else:

From 1e280ed86ea2c12883ec47a4f046391d0812e803 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 1 Feb 2025 08:35:40 -0500
Subject: [PATCH 10/17] fix remaining broken test

---
 src/registrar/tests/test_views_portfolio.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 876583a39..679de98ed 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -3243,18 +3243,21 @@ def test_submit_new_member_raises_email_sending_error(self, mock_send_email):
         }
 
         # Act
-        with patch("django.contrib.messages.warning") as mock_warning:
+        with patch("django.contrib.messages.error") as mock_error:
             response = self.client.post(reverse("new-member"), data=form_data)
 
             # Assert
             # assert that the send_portfolio_invitation_email called
             mock_send_email.assert_called_once_with(
-                email=self.new_member_email, requestor=self.user, portfolio=self.portfolio
+                email=self.new_member_email,
+                requestor=self.user,
+                portfolio=self.portfolio,
+                is_admin_invitation=False,
             )
             # assert that response is a redirect to reverse("members")
             self.assertRedirects(response, reverse("members"))
             # assert that messages contains message, "Could not send email invitation"
-            mock_warning.assert_called_once_with(response.wsgi_request, "Could not send portfolio email invitation.")
+            mock_error.assert_called_once_with(response.wsgi_request, "Could not send organization invitation email.")
             # assert that portfolio invitation is not created
             self.assertFalse(
                 PortfolioInvitation.objects.filter(email=self.new_member_email, portfolio=self.portfolio).exists(),

From be0c55db2757356d1dd83af34469ad0669c61b67 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 1 Feb 2025 11:17:21 -0500
Subject: [PATCH 11/17] added tests for test_email_invitations

---
 src/registrar/tests/test_email_invitations.py | 429 +++++++++++++++++-
 src/registrar/utility/email_invitations.py    |   4 +-
 2 files changed, 426 insertions(+), 7 deletions(-)

diff --git a/src/registrar/tests/test_email_invitations.py b/src/registrar/tests/test_email_invitations.py
index f5b12ff22..5c7f1a0c1 100644
--- a/src/registrar/tests/test_email_invitations.py
+++ b/src/registrar/tests/test_email_invitations.py
@@ -2,12 +2,24 @@
 from unittest.mock import patch, MagicMock
 from datetime import date
 from registrar.models.domain import Domain
+from registrar.models.portfolio import Portfolio
 from registrar.models.user import User
 from registrar.models.user_domain_role import UserDomainRole
+from registrar.models.user_portfolio_permission import UserPortfolioPermission
+from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
 from registrar.utility.email import EmailSendingError
-from registrar.utility.email_invitations import send_domain_invitation_email, send_emails_to_domain_managers
+from registrar.utility.email_invitations import (
+    _send_portfolio_admin_addition_emails_to_portfolio_admins,
+    _send_portfolio_admin_removal_emails_to_portfolio_admins,
+    send_domain_invitation_email,
+    send_emails_to_domain_managers,
+    send_portfolio_admin_addition_emails,
+    send_portfolio_admin_removal_emails,
+    send_portfolio_invitation_email,
+)
 
 from api.tests.common import less_console_noise_decorator
+from registrar.utility.errors import MissingEmailError
 
 
 class DomainInvitationEmail(unittest.TestCase):
@@ -18,7 +30,7 @@ class DomainInvitationEmail(unittest.TestCase):
     @patch("registrar.utility.email_invitations._validate_invitation")
     @patch("registrar.utility.email_invitations._get_requestor_email")
     @patch("registrar.utility.email_invitations.send_invitation_email")
-    @patch("registrar.utility.email_invitations.normalize_domains")
+    @patch("registrar.utility.email_invitations._normalize_domains")
     def test_send_domain_invitation_email(
         self,
         mock_normalize_domains,
@@ -83,7 +95,7 @@ def test_send_domain_invitation_email(
     @patch("registrar.utility.email_invitations._validate_invitation")
     @patch("registrar.utility.email_invitations._get_requestor_email")
     @patch("registrar.utility.email_invitations.send_invitation_email")
-    @patch("registrar.utility.email_invitations.normalize_domains")
+    @patch("registrar.utility.email_invitations._normalize_domains")
     def test_send_domain_invitation_email_multiple_domains(
         self,
         mock_normalize_domains,
@@ -219,7 +231,7 @@ def test_send_domain_invitation_email_raises_get_requestor_email_exception(self,
     @patch("registrar.utility.email_invitations._validate_invitation")
     @patch("registrar.utility.email_invitations._get_requestor_email")
     @patch("registrar.utility.email_invitations.send_invitation_email")
-    @patch("registrar.utility.email_invitations.normalize_domains")
+    @patch("registrar.utility.email_invitations._normalize_domains")
     def test_send_domain_invitation_email_raises_sending_email_exception(
         self,
         mock_normalize_domains,
@@ -269,7 +281,7 @@ def test_send_domain_invitation_email_raises_sending_email_exception(
     @patch("registrar.utility.email_invitations._validate_invitation")
     @patch("registrar.utility.email_invitations._get_requestor_email")
     @patch("registrar.utility.email_invitations.send_invitation_email")
-    @patch("registrar.utility.email_invitations.normalize_domains")
+    @patch("registrar.utility.email_invitations._normalize_domains")
     def test_send_domain_invitation_email_manager_emails_send_mail_exception(
         self,
         mock_normalize_domains,
@@ -469,3 +481,410 @@ def test_send_emails_to_domain_managers_some_emails_fail(self, mock_filter, mock
                 "date": date.today(),
             },
         )
+
+
+class PortfolioInvitationEmailTests(unittest.TestCase):
+
+    def setUp(self):
+        """Setup common test data for all test cases"""
+        self.email = "invitee@example.com"
+        self.requestor = MagicMock(name="User")
+        self.requestor.email = "requestor@example.com"
+        self.portfolio = MagicMock(name="Portfolio")
+
+    @less_console_noise_decorator
+    @patch("registrar.utility.email_invitations.send_templated_email")
+    def test_send_portfolio_invitation_email_success(self, mock_send_templated_email):
+        """Test successful email sending"""
+        is_admin_invitation = False
+
+        result = send_portfolio_invitation_email(self.email, self.requestor, self.portfolio, is_admin_invitation)
+
+        self.assertTrue(result)
+        mock_send_templated_email.assert_called_once()
+
+    @less_console_noise_decorator
+    @patch(
+        "registrar.utility.email_invitations.send_templated_email",
+        side_effect=EmailSendingError("Failed to send email"),
+    )
+    def test_send_portfolio_invitation_email_failure(self, mock_send_templated_email):
+        """Test failure when sending email"""
+        is_admin_invitation = False
+
+        with self.assertRaises(EmailSendingError) as context:
+            send_portfolio_invitation_email(self.email, self.requestor, self.portfolio, is_admin_invitation)
+
+        self.assertIn("Could not sent email invitation to", str(context.exception))
+
+    @less_console_noise_decorator
+    @patch(
+        "registrar.utility.email_invitations._get_requestor_email",
+        side_effect=MissingEmailError("Requestor has no email"),
+    )
+    @less_console_noise_decorator
+    def test_send_portfolio_invitation_email_missing_requestor_email(self, mock_get_email):
+        """Test when requestor has no email"""
+        is_admin_invitation = False
+
+        with self.assertRaises(MissingEmailError) as context:
+            send_portfolio_invitation_email(self.email, self.requestor, self.portfolio, is_admin_invitation)
+
+        self.assertIn(
+            "Can't send invitation email. No email is associated with your user account.", str(context.exception)
+        )
+
+    @less_console_noise_decorator
+    @patch(
+        "registrar.utility.email_invitations._send_portfolio_admin_addition_emails_to_portfolio_admins",
+        return_value=False,
+    )
+    @patch("registrar.utility.email_invitations.send_templated_email")
+    def test_send_portfolio_invitation_email_admin_invitation(self, mock_send_templated_email, mock_admin_email):
+        """Test admin invitation email logic"""
+        is_admin_invitation = True
+
+        result = send_portfolio_invitation_email(self.email, self.requestor, self.portfolio, is_admin_invitation)
+
+        self.assertFalse(result)  # Admin email sending failed
+        mock_send_templated_email.assert_called_once()
+        mock_admin_email.assert_called_once()
+
+    @less_console_noise_decorator
+    @patch("registrar.utility.email_invitations._get_requestor_email")
+    @patch("registrar.utility.email_invitations._send_portfolio_admin_addition_emails_to_portfolio_admins")
+    def test_send_email_success(self, mock_send_admin_emails, mock_get_requestor_email):
+        """Test successful sending of admin addition emails."""
+        mock_get_requestor_email.return_value = "requestor@example.com"
+        mock_send_admin_emails.return_value = True
+
+        result = send_portfolio_admin_addition_emails(self.email, self.requestor, self.portfolio)
+
+        mock_get_requestor_email.assert_called_once_with(self.requestor, portfolio=self.portfolio)
+        mock_send_admin_emails.assert_called_once_with(self.email, "requestor@example.com", self.portfolio)
+        self.assertTrue(result)
+
+    @less_console_noise_decorator
+    @patch(
+        "registrar.utility.email_invitations._get_requestor_email",
+        side_effect=MissingEmailError("Requestor email missing"),
+    )
+    def test_missing_requestor_email_raises_exception(self, mock_get_requestor_email):
+        """Test exception raised if requestor email is missing."""
+        with self.assertRaises(MissingEmailError):
+            send_portfolio_admin_addition_emails(self.email, self.requestor, self.portfolio)
+
+    @less_console_noise_decorator
+    @patch("registrar.utility.email_invitations._get_requestor_email")
+    @patch("registrar.utility.email_invitations._send_portfolio_admin_addition_emails_to_portfolio_admins")
+    def test_send_email_failure(self, mock_send_admin_emails, mock_get_requestor_email):
+        """Test handling of failure in sending admin addition emails."""
+        mock_get_requestor_email.return_value = "requestor@example.com"
+        mock_send_admin_emails.return_value = False  # Simulate failure
+
+        result = send_portfolio_admin_addition_emails(self.email, self.requestor, self.portfolio)
+
+        self.assertFalse(result)
+        mock_get_requestor_email.assert_called_once_with(self.requestor, portfolio=self.portfolio)
+        mock_send_admin_emails.assert_called_once_with(self.email, "requestor@example.com", self.portfolio)
+
+
+class SendPortfolioAdminAdditionEmailsTests(unittest.TestCase):
+    """Unit tests for _send_portfolio_admin_addition_emails_to_portfolio_admins function."""
+
+    def setUp(self):
+        """Set up test data."""
+        self.email = "new.admin@example.com"
+        self.requestor_email = "requestor@example.com"
+        self.portfolio = MagicMock(spec=Portfolio)
+        self.portfolio.organization_name = "Test Organization"
+
+        # Mock portfolio admin users
+        self.admin_user1 = MagicMock(spec=User)
+        self.admin_user1.email = "admin1@example.com"
+
+        self.admin_user2 = MagicMock(spec=User)
+        self.admin_user2.email = "admin2@example.com"
+
+        self.portfolio_admin1 = MagicMock(spec=UserPortfolioPermission)
+        self.portfolio_admin1.user = self.admin_user1
+        self.portfolio_admin1.roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+
+        self.portfolio_admin2 = MagicMock(spec=UserPortfolioPermission)
+        self.portfolio_admin2.user = self.admin_user2
+        self.portfolio_admin2.roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+
+    @less_console_noise_decorator
+    @patch("registrar.utility.email_invitations.send_templated_email")
+    @patch("registrar.utility.email_invitations.UserPortfolioPermission.objects.filter")
+    def test_send_email_success(self, mock_filter, mock_send_templated_email):
+        """Test successful sending of admin addition emails."""
+        mock_filter.return_value.exclude.return_value = [self.portfolio_admin1, self.portfolio_admin2]
+        mock_send_templated_email.return_value = None  # No exception means success
+
+        result = _send_portfolio_admin_addition_emails_to_portfolio_admins(
+            self.email, self.requestor_email, self.portfolio
+        )
+
+        mock_filter.assert_called_once_with(
+            portfolio=self.portfolio, roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        )
+        mock_send_templated_email.assert_any_call(
+            "emails/portfolio_admin_addition_notification.txt",
+            "emails/portfolio_admin_addition_notification_subject.txt",
+            to_address=self.admin_user1.email,
+            context={
+                "portfolio": self.portfolio,
+                "requestor_email": self.requestor_email,
+                "invited_email_address": self.email,
+                "portfolio_admin": self.admin_user1,
+                "date": date.today(),
+            },
+        )
+        mock_send_templated_email.assert_any_call(
+            "emails/portfolio_admin_addition_notification.txt",
+            "emails/portfolio_admin_addition_notification_subject.txt",
+            to_address=self.admin_user2.email,
+            context={
+                "portfolio": self.portfolio,
+                "requestor_email": self.requestor_email,
+                "invited_email_address": self.email,
+                "portfolio_admin": self.admin_user2,
+                "date": date.today(),
+            },
+        )
+        self.assertTrue(result)
+
+    @less_console_noise_decorator
+    @patch("registrar.utility.email_invitations.send_templated_email", side_effect=EmailSendingError)
+    @patch("registrar.utility.email_invitations.UserPortfolioPermission.objects.filter")
+    def test_send_email_failure(self, mock_filter, mock_send_templated_email):
+        """Test handling of failure in sending admin addition emails."""
+        mock_filter.return_value.exclude.return_value = [self.portfolio_admin1, self.portfolio_admin2]
+
+        result = _send_portfolio_admin_addition_emails_to_portfolio_admins(
+            self.email, self.requestor_email, self.portfolio
+        )
+
+        self.assertFalse(result)
+        mock_filter.assert_called_once_with(
+            portfolio=self.portfolio, roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        )
+        mock_send_templated_email.assert_any_call(
+            "emails/portfolio_admin_addition_notification.txt",
+            "emails/portfolio_admin_addition_notification_subject.txt",
+            to_address=self.admin_user1.email,
+            context={
+                "portfolio": self.portfolio,
+                "requestor_email": self.requestor_email,
+                "invited_email_address": self.email,
+                "portfolio_admin": self.admin_user1,
+                "date": date.today(),
+            },
+        )
+        mock_send_templated_email.assert_any_call(
+            "emails/portfolio_admin_addition_notification.txt",
+            "emails/portfolio_admin_addition_notification_subject.txt",
+            to_address=self.admin_user2.email,
+            context={
+                "portfolio": self.portfolio,
+                "requestor_email": self.requestor_email,
+                "invited_email_address": self.email,
+                "portfolio_admin": self.admin_user2,
+                "date": date.today(),
+            },
+        )
+
+    @less_console_noise_decorator
+    @patch("registrar.utility.email_invitations.UserPortfolioPermission.objects.filter")
+    def test_no_admins_to_notify(self, mock_filter):
+        """Test case where there are no portfolio admins to notify."""
+        mock_filter.return_value.exclude.return_value = []  # No admins
+
+        result = _send_portfolio_admin_addition_emails_to_portfolio_admins(
+            self.email, self.requestor_email, self.portfolio
+        )
+
+        self.assertTrue(result)  # No emails sent, but also no failures
+        mock_filter.assert_called_once_with(
+            portfolio=self.portfolio, roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        )
+
+
+class SendPortfolioAdminRemovalEmailsTests(unittest.TestCase):
+    """Unit tests for _send_portfolio_admin_removal_emails_to_portfolio_admins function."""
+
+    def setUp(self):
+        """Set up test data."""
+        self.email = "removed.admin@example.com"
+        self.requestor_email = "requestor@example.com"
+        self.portfolio = MagicMock(spec=Portfolio)
+        self.portfolio.organization_name = "Test Organization"
+
+        # Mock portfolio admin users
+        self.admin_user1 = MagicMock(spec=User)
+        self.admin_user1.email = "admin1@example.com"
+
+        self.admin_user2 = MagicMock(spec=User)
+        self.admin_user2.email = "admin2@example.com"
+
+        self.portfolio_admin1 = MagicMock(spec=UserPortfolioPermission)
+        self.portfolio_admin1.user = self.admin_user1
+        self.portfolio_admin1.roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+
+        self.portfolio_admin2 = MagicMock(spec=UserPortfolioPermission)
+        self.portfolio_admin2.user = self.admin_user2
+        self.portfolio_admin2.roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+
+    @less_console_noise_decorator
+    @patch("registrar.utility.email_invitations.send_templated_email")
+    @patch("registrar.utility.email_invitations.UserPortfolioPermission.objects.filter")
+    def test_send_email_success(self, mock_filter, mock_send_templated_email):
+        """Test successful sending of admin removal emails."""
+        mock_filter.return_value.exclude.return_value = [self.portfolio_admin1, self.portfolio_admin2]
+        mock_send_templated_email.return_value = None  # No exception means success
+
+        result = _send_portfolio_admin_removal_emails_to_portfolio_admins(
+            self.email, self.requestor_email, self.portfolio
+        )
+
+        mock_filter.assert_called_once_with(
+            portfolio=self.portfolio, roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        )
+        mock_send_templated_email.assert_any_call(
+            "emails/portfolio_admin_removal_notification.txt",
+            "emails/portfolio_admin_removal_notification_subject.txt",
+            to_address=self.admin_user1.email,
+            context={
+                "portfolio": self.portfolio,
+                "requestor_email": self.requestor_email,
+                "removed_email_address": self.email,
+                "portfolio_admin": self.admin_user1,
+                "date": date.today(),
+            },
+        )
+        mock_send_templated_email.assert_any_call(
+            "emails/portfolio_admin_removal_notification.txt",
+            "emails/portfolio_admin_removal_notification_subject.txt",
+            to_address=self.admin_user2.email,
+            context={
+                "portfolio": self.portfolio,
+                "requestor_email": self.requestor_email,
+                "removed_email_address": self.email,
+                "portfolio_admin": self.admin_user2,
+                "date": date.today(),
+            },
+        )
+        self.assertTrue(result)
+
+    @less_console_noise_decorator
+    @patch("registrar.utility.email_invitations.send_templated_email", side_effect=EmailSendingError)
+    @patch("registrar.utility.email_invitations.UserPortfolioPermission.objects.filter")
+    def test_send_email_failure(self, mock_filter, mock_send_templated_email):
+        """Test handling of failure in sending admin removal emails."""
+        mock_filter.return_value.exclude.return_value = [self.portfolio_admin1, self.portfolio_admin2]
+
+        result = _send_portfolio_admin_removal_emails_to_portfolio_admins(
+            self.email, self.requestor_email, self.portfolio
+        )
+
+        self.assertFalse(result)
+        mock_filter.assert_called_once_with(
+            portfolio=self.portfolio, roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        )
+        mock_send_templated_email.assert_any_call(
+            "emails/portfolio_admin_removal_notification.txt",
+            "emails/portfolio_admin_removal_notification_subject.txt",
+            to_address=self.admin_user1.email,
+            context={
+                "portfolio": self.portfolio,
+                "requestor_email": self.requestor_email,
+                "removed_email_address": self.email,
+                "portfolio_admin": self.admin_user1,
+                "date": date.today(),
+            },
+        )
+        mock_send_templated_email.assert_any_call(
+            "emails/portfolio_admin_removal_notification.txt",
+            "emails/portfolio_admin_removal_notification_subject.txt",
+            to_address=self.admin_user2.email,
+            context={
+                "portfolio": self.portfolio,
+                "requestor_email": self.requestor_email,
+                "removed_email_address": self.email,
+                "portfolio_admin": self.admin_user2,
+                "date": date.today(),
+            },
+        )
+
+    @less_console_noise_decorator
+    @patch("registrar.utility.email_invitations.UserPortfolioPermission.objects.filter")
+    def test_no_admins_to_notify(self, mock_filter):
+        """Test case where there are no portfolio admins to notify."""
+        mock_filter.return_value.exclude.return_value = []  # No admins
+
+        result = _send_portfolio_admin_removal_emails_to_portfolio_admins(
+            self.email, self.requestor_email, self.portfolio
+        )
+
+        self.assertTrue(result)  # No emails sent, but also no failures
+        mock_filter.assert_called_once_with(
+            portfolio=self.portfolio, roles__contains=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+        )
+
+
+class SendPortfolioAdminRemovalEmailsTests(unittest.TestCase):
+    """Unit tests for send_portfolio_admin_removal_emails function."""
+
+    def setUp(self):
+        """Set up test data."""
+        self.email = "removed.admin@example.com"
+        self.requestor = MagicMock(spec=User)
+        self.requestor.email = "requestor@example.com"
+        self.portfolio = MagicMock(spec=Portfolio)
+        self.portfolio.organization_name = "Test Organization"
+
+    @less_console_noise_decorator
+    @patch("registrar.utility.email_invitations._get_requestor_email")
+    @patch("registrar.utility.email_invitations._send_portfolio_admin_removal_emails_to_portfolio_admins")
+    def test_send_email_success(self, mock_send_removal_emails, mock_get_requestor_email):
+        """Test successful execution of send_portfolio_admin_removal_emails."""
+        mock_get_requestor_email.return_value = self.requestor.email
+        mock_send_removal_emails.return_value = True  # Simulating success
+
+        result = send_portfolio_admin_removal_emails(self.email, self.requestor, self.portfolio)
+
+        mock_get_requestor_email.assert_called_once_with(self.requestor, portfolio=self.portfolio)
+        mock_send_removal_emails.assert_called_once_with(self.email, self.requestor.email, self.portfolio)
+        self.assertTrue(result)
+
+    @less_console_noise_decorator
+    @patch("registrar.utility.email_invitations._get_requestor_email", side_effect=MissingEmailError("No email found"))
+    @patch("registrar.utility.email_invitations._send_portfolio_admin_removal_emails_to_portfolio_admins")
+    def test_missing_email_error(self, mock_send_removal_emails, mock_get_requestor_email):
+        """Test handling of MissingEmailError when requestor has no email."""
+        with self.assertRaises(MissingEmailError) as context:
+            send_portfolio_admin_removal_emails(self.email, self.requestor, self.portfolio)
+
+        mock_get_requestor_email.assert_called_once_with(self.requestor, portfolio=self.portfolio)
+        mock_send_removal_emails.assert_not_called()  # Should not proceed if email retrieval fails
+        self.assertEqual(
+            str(context.exception), "Can't send invitation email. No email is associated with your user account."
+        )
+
+    @less_console_noise_decorator
+    @patch("registrar.utility.email_invitations._get_requestor_email")
+    @patch(
+        "registrar.utility.email_invitations._send_portfolio_admin_removal_emails_to_portfolio_admins",
+        return_value=False,
+    )
+    def test_send_email_failure(self, mock_send_removal_emails, mock_get_requestor_email):
+        """Test handling of failure when admin removal emails fail to send."""
+        mock_get_requestor_email.return_value = self.requestor.email
+        mock_send_removal_emails.return_value = False  # Simulating failure
+
+        result = send_portfolio_admin_removal_emails(self.email, self.requestor, self.portfolio)
+
+        mock_get_requestor_email.assert_called_once_with(self.requestor, portfolio=self.portfolio)
+        mock_send_removal_emails.assert_called_once_with(self.email, self.requestor.email, self.portfolio)
+        self.assertFalse(result)
diff --git a/src/registrar/utility/email_invitations.py b/src/registrar/utility/email_invitations.py
index f1c366502..de21b2a61 100644
--- a/src/registrar/utility/email_invitations.py
+++ b/src/registrar/utility/email_invitations.py
@@ -40,7 +40,7 @@ def send_domain_invitation_email(
         OutsideOrgMemberError: If the requested_user is part of a different organization.
         EmailSendingError: If there is an error while sending the email.
     """
-    domains = normalize_domains(domains)
+    domains = _normalize_domains(domains)
     requestor_email = _get_requestor_email(requestor, domains=domains)
 
     _validate_invitation(email, requested_user, domains, requestor, is_member_of_different_org)
@@ -95,7 +95,7 @@ def send_emails_to_domain_managers(email: str, requestor_email, domain: Domain,
     return all_emails_sent
 
 
-def normalize_domains(domains: Domain | list[Domain]) -> list[Domain]:
+def _normalize_domains(domains: Domain | list[Domain]) -> list[Domain]:
     """Ensures domains is always a list."""
     return [domains] if isinstance(domains, Domain) else domains
 

From c47122ac190e1e0a7e71301e38f6773e12026f74 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 1 Feb 2025 12:38:05 -0500
Subject: [PATCH 12/17] testing PortfolioInvitationAdmin

---
 src/registrar/tests/test_admin.py | 90 ++++++++++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 1025cf369..28a407036 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -1210,7 +1210,7 @@ def test_get_filters(self):
 
     @less_console_noise_decorator
     @patch("registrar.admin.send_portfolio_invitation_email")
-    @patch("django.contrib.messages.success")  # Mock the `messages.warning` call
+    @patch("django.contrib.messages.success")  # Mock the `messages.success` call
     def test_save_sends_email(self, mock_messages_success, mock_send_email):
         """On save_model, an email is sent if an invitation already exists."""
 
@@ -1461,6 +1461,94 @@ def test_save_exception_generic_error(self, mock_messages_error, mock_send_email
         # Assert that messages.error was called with the correct message
         mock_messages_error.assert_called_once_with(request, "Could not send email invitation.")
 
+    @less_console_noise_decorator
+    @patch("registrar.admin.send_portfolio_admin_addition_emails")
+    def test_save_existing_sends_email_notification(self, mock_send_email):
+        """On save_model to an existing invitation, an email is set to notify existing
+        admins, if the invitation changes from member to admin."""
+
+        # Create an instance of the admin class
+        admin_instance = PortfolioInvitationAdmin(PortfolioInvitation, admin_site=None)
+
+        # Mock the response value of the email send
+        mock_send_email.return_value = True
+
+        # Create and save a PortfolioInvitation instance
+        portfolio_invitation = PortfolioInvitation.objects.create(
+            email="james.gordon@gotham.gov",
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],  # Initially NOT an admin
+            status=PortfolioInvitation.PortfolioInvitationStatus.INVITED,  # Must be "INVITED"
+        )
+
+        # Create a request object
+        request = self.factory.post(f"/admin/registrar/PortfolioInvitation/{portfolio_invitation.pk}/change/")
+        request.user = self.superuser
+
+        # Change roles from MEMBER to ADMIN
+        portfolio_invitation.roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+
+        # Call the save_model method
+        admin_instance.save_model(request, portfolio_invitation, None, True)
+
+        # Assert that send_portfolio_admin_addition_emails is called
+        mock_send_email.assert_called_once()
+
+        # Get the arguments passed to send_portfolio_admin_addition_emails
+        _, called_kwargs = mock_send_email.call_args
+
+        # Assert the email content
+        self.assertEqual(called_kwargs["email"], "james.gordon@gotham.gov")
+        self.assertEqual(called_kwargs["requestor"], self.superuser)
+        self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
+    @less_console_noise_decorator
+    @patch("registrar.admin.send_portfolio_admin_addition_emails")
+    @patch("django.contrib.messages.warning")  # Mock the `messages.warning` call
+    def test_save_existing_email_notification_warning(self, mock_messages_warning, mock_send_email):
+        """On save_model for an existing invitation, a warning is displayed if method to
+        send email to notify admins returns False."""
+
+        # Create an instance of the admin class
+        admin_instance = PortfolioInvitationAdmin(PortfolioInvitation, admin_site=None)
+
+        # Mock the response value of the email send
+        mock_send_email.return_value = False
+
+        # Create and save a PortfolioInvitation instance
+        portfolio_invitation = PortfolioInvitation.objects.create(
+            email="james.gordon@gotham.gov",
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],  # Initially NOT an admin
+            status=PortfolioInvitation.PortfolioInvitationStatus.INVITED,  # Must be "INVITED"
+        )
+
+        # Create a request object
+        request = self.factory.post(f"/admin/registrar/PortfolioInvitation/{portfolio_invitation.pk}/change/")
+        request.user = self.superuser
+
+        # Change roles from MEMBER to ADMIN
+        portfolio_invitation.roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
+
+        # Call the save_model method
+        admin_instance.save_model(request, portfolio_invitation, None, True)
+
+        # Assert that send_portfolio_admin_addition_emails is called
+        mock_send_email.assert_called_once()
+
+        # Get the arguments passed to send_portfolio_admin_addition_emails
+        _, called_kwargs = mock_send_email.call_args
+
+        # Assert the email content
+        self.assertEqual(called_kwargs["email"], "james.gordon@gotham.gov")
+        self.assertEqual(called_kwargs["requestor"], self.superuser)
+        self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
+        # Assert that messages.error was called with the correct message
+        mock_messages_warning.assert_called_once_with(
+            request, "Could not send email notification to existing organization admins."
+        )
+
 
 class TestHostAdmin(TestCase):
     """Tests for the HostAdmin class as super user

From ff9c402c408292b59daea0c0ea31ca8fd93d2d7c Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 1 Feb 2025 13:28:17 -0500
Subject: [PATCH 13/17] additional portfolio member tests

---
 src/registrar/tests/test_views_portfolio.py | 49 +++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 679de98ed..c0f81363c 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -3484,6 +3484,55 @@ def test_member_invite_for_existing_user_who_is_not_a_member(self, mock_send_ema
         self.assertEqual(call_args["requestor"], self.user)
         self.assertIsNone(call_args.get("is_member_of_different_org"))
 
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("registrar.views.portfolios.send_portfolio_invitation_email")
+    def test_admin_invite_for_new_users(self, mock_send_email):
+        """Tests the member invitation flow for new admin."""
+        self.client.force_login(self.user)
+
+        # Simulate a session to ensure continuity
+        session_id = self.client.session.session_key
+        self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
+
+        mock_send_email.return_value = True
+
+        # Simulate submission of member invite for new admin
+        final_response = self.client.post(
+            reverse("new-member"),
+            {
+                "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN.value,
+                "domain_request_permissions": UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS.value,
+                "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS.value,
+                "member_permissions": "no_access",
+                "email": self.new_member_email,
+            },
+        )
+
+        # Ensure the final submission is successful
+        self.assertEqual(final_response.status_code, 302)  # Redirects
+
+        # Validate Database Changes
+        # Validate that portfolio invitation was created but not retrieved
+        portfolio_invite = PortfolioInvitation.objects.filter(
+            email=self.new_member_email, portfolio=self.portfolio
+        ).first()
+        self.assertIsNotNone(portfolio_invite)
+        self.assertEqual(portfolio_invite.email, self.new_member_email)
+        self.assertEqual(portfolio_invite.status, PortfolioInvitation.PortfolioInvitationStatus.INVITED)
+
+        # Check that an email was sent
+        mock_send_email.assert_called()
+
+        # Get the arguments passed to send_portfolio_invitation_email
+        _, called_kwargs = mock_send_email.call_args
+
+        # Assert the email content
+        self.assertEqual(called_kwargs["email"], self.new_member_email)
+        self.assertEqual(called_kwargs["requestor"], self.user)
+        self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
 
 class TestEditPortfolioMemberView(WebTest):
     """Tests for the edit member page on portfolios"""

From d29205f75e15289ddb2cd3c59b4acd86a2782532 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 1 Feb 2025 16:02:49 -0500
Subject: [PATCH 14/17] tests for PortfolioMemberDeleteView
 PortfolioInvitedMemberDeleteView

---
 src/registrar/tests/test_email_invitations.py |   2 +-
 src/registrar/tests/test_views_portfolio.py   | 312 +++++++++++++++++-
 2 files changed, 309 insertions(+), 5 deletions(-)

diff --git a/src/registrar/tests/test_email_invitations.py b/src/registrar/tests/test_email_invitations.py
index 5c7f1a0c1..77a8c402f 100644
--- a/src/registrar/tests/test_email_invitations.py
+++ b/src/registrar/tests/test_email_invitations.py
@@ -711,7 +711,7 @@ def test_no_admins_to_notify(self, mock_filter):
         )
 
 
-class SendPortfolioAdminRemovalEmailsTests(unittest.TestCase):
+class SendPortfolioAdminRemovalEmailsToAdminsTests(unittest.TestCase):
     """Unit tests for _send_portfolio_admin_removal_emails_to_portfolio_admins function."""
 
     def setUp(self):
diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index c0f81363c..cafcd127b 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -1631,10 +1631,33 @@ def test_toggleable_alert_wrapper_exists_on_members_page(self):
         # Assert that the toggleable alert ID exists
         self.assertContains(response, '<div id="toggleable-alert"')
 
+
+class TestPortfolioMemberDeleteView(WebTest):
+    def setUp(self):
+        super().setUp()
+        self.client = Client()
+        self.user = create_test_user()
+        self.domain, _ = Domain.objects.get_or_create(name="igorville.gov")
+        self.portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="Hotel California")
+        self.role, _ = UserDomainRole.objects.get_or_create(
+            user=self.user, domain=self.domain, role=UserDomainRole.Roles.MANAGER
+        )
+
+    def tearDown(self):
+        UserPortfolioPermission.objects.all().delete()
+        Portfolio.objects.all().delete()
+        UserDomainRole.objects.all().delete()
+        DomainRequest.objects.all().delete()
+        DomainInformation.objects.all().delete()
+        Domain.objects.all().delete()
+        User.objects.all().delete()
+        super().tearDown()
+
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)
-    def test_portfolio_member_delete_view_members_table_active_requests(self):
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_portfolio_member_delete_view_members_table_active_requests(self, send_removal_emails):
         """Error state w/ deleting a member with active request on Members Table"""
         # I'm a user
         UserPortfolioPermission.objects.get_or_create(
@@ -1672,10 +1695,14 @@ def test_portfolio_member_delete_view_members_table_active_requests(self):
 
             self.assertContains(response, expected_error_message, status_code=400)
 
+            # assert that send_portfolio_admin_removal_emails is not called
+            send_removal_emails.assert_not_called()
+
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)
-    def test_portfolio_member_delete_view_members_table_only_admin(self):
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_portfolio_member_delete_view_members_table_only_admin(self, send_removal_emails):
         """Error state w/ deleting a member that's the only admin on Members Table"""
 
         # I'm a user with admin permission
@@ -1703,10 +1730,14 @@ def test_portfolio_member_delete_view_members_table_only_admin(self):
             )
             self.assertContains(response, expected_error_message, status_code=400)
 
+            # assert that send_portfolio_admin_removal_emails is not called
+            send_removal_emails.assert_not_called()
+
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)
-    def test_portfolio_member_table_delete_view_success(self):
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_portfolio_member_table_delete_member_success(self, mock_send_removal_emails):
         """Success state with deleting on Members Table page bc no active request AND not only admin"""
 
         # I'm a user
@@ -1750,6 +1781,134 @@ def test_portfolio_member_table_delete_view_success(self):
             expected_success_message = f"You've removed {member.email} from the organization."
             self.assertContains(response, expected_success_message, status_code=200)
 
+            # assert that send_portfolio_admin_removal_emails is not called
+            # because member being removed is not an admin
+            mock_send_removal_emails.assert_not_called()
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_portfolio_member_table_delete_admin_success(self, mock_send_removal_emails):
+        """Success state with deleting on Members Table page bc no active request AND
+        not only admin. Because admin, removal emails are sent."""
+
+        # I'm a user
+        UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            additional_permissions=[
+                UserPortfolioPermissionChoices.VIEW_MEMBERS,
+                UserPortfolioPermissionChoices.EDIT_MEMBERS,
+            ],
+        )
+
+        # Creating an admin that can be deleted (see patch)
+        member_email = "deleteable_admin@example.com"
+        member, _ = User.objects.get_or_create(email=member_email)
+
+        # Set up the member in the portfolio
+        upp, _ = UserPortfolioPermission.objects.get_or_create(
+            user=member,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+        )
+
+        mock_send_removal_emails.return_value = True
+
+        # And set that the member has no active requests AND it's not the only admin
+        with patch.object(User, "get_active_requests_count_in_portfolio", return_value=0), patch.object(
+            User, "is_only_admin_of_portfolio", return_value=False
+        ):
+
+            # Attempt to delete
+            self.client.force_login(self.user)
+            response = self.client.post(
+                # We check X_REQUESTED_WITH bc those return JSON responses
+                reverse("member-delete", kwargs={"pk": upp.pk}),
+                HTTP_X_REQUESTED_WITH="XMLHttpRequest",
+            )
+
+            # Check for a successful deletion
+            self.assertEqual(response.status_code, 200)
+
+            expected_success_message = f"You've removed {member.email} from the organization."
+            self.assertContains(response, expected_success_message, status_code=200)
+
+            # assert that send_portfolio_admin_removal_emails is called
+            mock_send_removal_emails.assert_called_once()
+
+            # Get the arguments passed to send_portfolio_admin_addition_emails
+            _, called_kwargs = mock_send_removal_emails.call_args
+
+            # Assert the email content
+            self.assertEqual(called_kwargs["email"], member_email)
+            self.assertEqual(called_kwargs["requestor"], self.user)
+            self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_portfolio_member_table_delete_admin_success_removal_email_fail(self, mock_send_removal_emails):
+        """Success state with deleting on Members Table page bc no active request AND
+        not only admin. Because admin, removal emails are sent, but fail to send."""
+
+        # I'm a user
+        UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            additional_permissions=[
+                UserPortfolioPermissionChoices.VIEW_MEMBERS,
+                UserPortfolioPermissionChoices.EDIT_MEMBERS,
+            ],
+        )
+
+        # Creating an admin that can be deleted (see patch)
+        member_email = "deleteable_admin@example.com"
+        member, _ = User.objects.get_or_create(email=member_email)
+
+        # Set up the member in the portfolio
+        upp, _ = UserPortfolioPermission.objects.get_or_create(
+            user=member,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+        )
+
+        mock_send_removal_emails.return_value = False
+
+        # And set that the member has no active requests AND it's not the only admin
+        with patch.object(User, "get_active_requests_count_in_portfolio", return_value=0), patch.object(
+            User, "is_only_admin_of_portfolio", return_value=False
+        ):
+
+            # Attempt to delete
+            self.client.force_login(self.user)
+            response = self.client.post(
+                # We check X_REQUESTED_WITH bc those return JSON responses
+                reverse("member-delete", kwargs={"pk": upp.pk}),
+                HTTP_X_REQUESTED_WITH="XMLHttpRequest",
+            )
+
+            # Check for a successful deletion
+            self.assertEqual(response.status_code, 200)
+
+            expected_success_message = f"You've removed {member.email} from the organization."
+            self.assertContains(response, expected_success_message, status_code=200)
+
+            # assert that send_portfolio_admin_removal_emails is called
+            mock_send_removal_emails.assert_called_once()
+
+            # Get the arguments passed to send_portfolio_admin_addition_emails
+            _, called_kwargs = mock_send_removal_emails.call_args
+
+            # Assert the email content
+            self.assertEqual(called_kwargs["email"], member_email)
+            self.assertEqual(called_kwargs["requestor"], self.user)
+            self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)
@@ -1848,10 +2007,33 @@ def test_portfolio_member_delete_view_manage_members_page_only_admin(self):
                 # and then confirm that we're still on the Manage Members page
                 self.assertEqual(response.headers["Location"], reverse("member", kwargs={"pk": admin_perm_user.pk}))
 
+
+class TestPortfolioInvitedMemberDeleteView(WebTest):
+    def setUp(self):
+        super().setUp()
+        self.client = Client()
+        self.user = create_test_user()
+        self.domain, _ = Domain.objects.get_or_create(name="igorville.gov")
+        self.portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="Hotel California")
+        self.role, _ = UserDomainRole.objects.get_or_create(
+            user=self.user, domain=self.domain, role=UserDomainRole.Roles.MANAGER
+        )
+
+    def tearDown(self):
+        UserPortfolioPermission.objects.all().delete()
+        Portfolio.objects.all().delete()
+        UserDomainRole.objects.all().delete()
+        DomainRequest.objects.all().delete()
+        DomainInformation.objects.all().delete()
+        Domain.objects.all().delete()
+        User.objects.all().delete()
+        super().tearDown()
+
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)
-    def test_portfolio_member_delete_view_manage_members_page_invitedmember(self):
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_portfolio_member_delete_view_manage_members_page_invitedmember(self, mock_send_removal_emails):
         """Success state w/ deleting invited member on Manage Members page should redirect back to Members Table"""
 
         # I'm a user
@@ -1892,6 +2074,128 @@ def test_portfolio_member_delete_view_manage_members_page_invitedmember(self):
             # and then confirm that we're now on Members Table page
             self.assertEqual(response.headers["Location"], reverse("members"))
 
+            # assert send_portfolio_admin_removal_emails not called since invitation
+            # is for a basic member
+            mock_send_removal_emails.assert_not_called()
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_portfolio_member_delete_view_manage_members_page_invitedadmin(self, mock_send_removal_emails):
+        """Success state w/ deleting invited admin on Manage Members page should redirect back to Members Table"""
+
+        # I'm a user
+        UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            additional_permissions=[
+                UserPortfolioPermissionChoices.VIEW_MEMBERS,
+                UserPortfolioPermissionChoices.EDIT_MEMBERS,
+            ],
+        )
+
+        mock_send_removal_emails.return_value = True
+
+        # Invite an admin under same portfolio
+        invited_member_email = "invited_member@example.com"
+        invitation = PortfolioInvitation.objects.create(
+            email=invited_member_email,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+        )
+        with patch("django.contrib.messages.success") as mock_success:
+            self.client.force_login(self.user)
+            response = self.client.post(
+                reverse("invitedmember-delete", kwargs={"pk": invitation.pk}),
+            )
+
+            self.assertEqual(response.status_code, 302)
+
+            expected_success_message = f"You've removed {invitation.email} from the organization."
+            args, kwargs = mock_success.call_args
+            # Check if first arg is a WSGIRequest, confirms request object passed correctly
+            # WSGIRequest protocol is basically the HTTPRequest but in Django form (ie POST '/member/1/delete')
+            self.assertIsInstance(args[0], WSGIRequest)
+            # Check that the error message matches the expected error message
+            self.assertEqual(args[1], expected_success_message)
+
+            # Location is used for a 3xx HTTP status code to indicate that the URL was redirected
+            # and then confirm that we're now on Members Table page
+            self.assertEqual(response.headers["Location"], reverse("members"))
+
+            # assert send_portfolio_admin_removal_emails is called since invitation
+            # is for an admin
+            mock_send_removal_emails.assert_called_once()
+
+            # Get the arguments passed to send_portfolio_admin_addition_emails
+            _, called_kwargs = mock_send_removal_emails.call_args
+
+            # Assert the email content
+            self.assertEqual(called_kwargs["email"], invited_member_email)
+            self.assertEqual(called_kwargs["requestor"], self.user)
+            self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_portfolio_member_delete_view_manage_members_page_invitedadmin_email_fails(self, mock_send_removal_emails):
+        """Success state w/ deleting invited admin on Manage Members page should redirect back to Members Table"""
+
+        # I'm a user
+        UserPortfolioPermission.objects.get_or_create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            additional_permissions=[
+                UserPortfolioPermissionChoices.VIEW_MEMBERS,
+                UserPortfolioPermissionChoices.EDIT_MEMBERS,
+            ],
+        )
+
+        mock_send_removal_emails.return_value = False
+
+        # Invite an admin under same portfolio
+        invited_member_email = "invited_member@example.com"
+        invitation = PortfolioInvitation.objects.create(
+            email=invited_member_email,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+        )
+        with patch("django.contrib.messages.success") as mock_success:
+            self.client.force_login(self.user)
+            response = self.client.post(
+                reverse("invitedmember-delete", kwargs={"pk": invitation.pk}),
+            )
+
+            self.assertEqual(response.status_code, 302)
+
+            expected_success_message = f"You've removed {invitation.email} from the organization."
+            args, kwargs = mock_success.call_args
+            # Check if first arg is a WSGIRequest, confirms request object passed correctly
+            # WSGIRequest protocol is basically the HTTPRequest but in Django form (ie POST '/member/1/delete')
+            self.assertIsInstance(args[0], WSGIRequest)
+            # Check that the error message matches the expected error message
+            self.assertEqual(args[1], expected_success_message)
+
+            # Location is used for a 3xx HTTP status code to indicate that the URL was redirected
+            # and then confirm that we're now on Members Table page
+            self.assertEqual(response.headers["Location"], reverse("members"))
+
+            # assert send_portfolio_admin_removal_emails is called since invitation
+            # is for an admin
+            mock_send_removal_emails.assert_called_once()
+
+            # Get the arguments passed to send_portfolio_admin_addition_emails
+            _, called_kwargs = mock_send_removal_emails.call_args
+
+            # Assert the email content
+            self.assertEqual(called_kwargs["email"], invited_member_email)
+            self.assertEqual(called_kwargs["requestor"], self.user)
+            self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
 
 class TestPortfolioMemberDomainsView(TestWithUser, WebTest):
     @classmethod

From a089dbc54fe0ba018f5e053a97e486d3b2335f32 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 1 Feb 2025 16:59:17 -0500
Subject: [PATCH 15/17] updated tests for PortfolioMemberEditView

---
 src/registrar/tests/test_views_portfolio.py | 243 +++++++++++++++++++-
 1 file changed, 241 insertions(+), 2 deletions(-)

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index cafcd127b..02d5a828d 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -3838,7 +3838,7 @@ def test_admin_invite_for_new_users(self, mock_send_email):
         self.assertEqual(called_kwargs["portfolio"], self.portfolio)
 
 
-class TestEditPortfolioMemberView(WebTest):
+class TestPortfolioMemberEditView(WebTest):
     """Tests for the edit member page on portfolios"""
 
     def setUp(self):
@@ -3877,7 +3877,9 @@ def tearDown(self):
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)
-    def test_edit_member_permissions_basic_to_admin(self):
+    @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_edit_member_permissions_basic_to_admin(self, mock_send_removal_emails, mock_send_addition_emails):
         """Tests converting a basic member to admin with full permissions."""
         self.client.force_login(self.user)
 
@@ -3890,6 +3892,57 @@ def test_edit_member_permissions_basic_to_admin(self):
             additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS],
         )
 
+        mock_send_addition_emails.return_value = True
+
+        response = self.client.post(
+            reverse("member-permissions", kwargs={"pk": basic_permission.id}),
+            {
+                "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN,
+            },
+        )
+
+        # Verify redirect and success message
+        self.assertEqual(response.status_code, 302)
+
+        # Verify database changes
+        basic_permission.refresh_from_db()
+        self.assertEqual(basic_permission.roles, [UserPortfolioRoleChoices.ORGANIZATION_ADMIN])
+
+        # assert addition emails are sent to portfolio admins
+        mock_send_addition_emails.assert_called_once()
+        mock_send_removal_emails.assert_not_called()
+
+        # Get the arguments passed to send_portfolio_admin_addition_emails
+        _, called_kwargs = mock_send_addition_emails.call_args
+
+        # Assert the email content
+        self.assertEqual(called_kwargs["email"], basic_member.email)
+        self.assertEqual(called_kwargs["requestor"], self.user)
+        self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("django.contrib.messages.warning")
+    @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_edit_member_permissions_basic_to_admin_notification_fails(
+        self, mock_send_removal_emails, mock_send_addition_emails, mock_messages_warning
+    ):
+        """Tests converting a basic member to admin with full permissions."""
+        self.client.force_login(self.user)
+
+        # Create a basic member to edit
+        basic_member = create_test_user()
+        basic_permission = UserPortfolioPermission.objects.create(
+            user=basic_member,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
+            additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS],
+        )
+
+        mock_send_addition_emails.return_value = False
+
         response = self.client.post(
             reverse("member-permissions", kwargs={"pk": basic_permission.id}),
             {
@@ -3904,6 +3957,192 @@ def test_edit_member_permissions_basic_to_admin(self):
         basic_permission.refresh_from_db()
         self.assertEqual(basic_permission.roles, [UserPortfolioRoleChoices.ORGANIZATION_ADMIN])
 
+        # assert addition emails are sent to portfolio admins
+        mock_send_addition_emails.assert_called_once()
+        mock_send_removal_emails.assert_not_called()
+
+        # Get the arguments passed to send_portfolio_admin_addition_emails
+        _, called_kwargs = mock_send_addition_emails.call_args
+
+        # Assert the email content
+        self.assertEqual(called_kwargs["email"], basic_member.email)
+        self.assertEqual(called_kwargs["requestor"], self.user)
+        self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
+        # Assert warning message is called correctly
+        mock_messages_warning.assert_called_once()
+        warning_args, _ = mock_messages_warning.call_args
+        self.assertIsInstance(warning_args[0], WSGIRequest)
+        self.assertEqual(warning_args[1], "Could not send email notification to existing organization admins.")
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_edit_member_permissions_admin_to_admin(self, mock_send_removal_emails, mock_send_addition_emails):
+        """Tests updating an admin without changing permissions."""
+        self.client.force_login(self.user)
+
+        # Create an admin member to edit
+        admin_member = create_test_user()
+        admin_permission = UserPortfolioPermission.objects.create(
+            user=admin_member,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+        )
+
+        response = self.client.post(
+            reverse("member-permissions", kwargs={"pk": admin_permission.id}),
+            {
+                "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN,
+            },
+        )
+
+        # Verify redirect and success message
+        self.assertEqual(response.status_code, 302)
+
+        # assert addition emails are not sent to portfolio admins
+        mock_send_addition_emails.assert_not_called()
+        mock_send_removal_emails.assert_not_called()
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
+    def test_edit_member_permissions_basic_to_basic(self, mock_send_addition_emails):
+        """Tests updating an admin without changing permissions."""
+        self.client.force_login(self.user)
+
+        # Create an admin member to edit
+        admin_member = create_test_user()
+        admin_permission = UserPortfolioPermission.objects.create(
+            user=admin_member,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+        )
+
+        response = self.client.post(
+            reverse("member-permissions", kwargs={"pk": admin_permission.id}),
+            {
+                "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN,
+            },
+        )
+
+        # Verify redirect and success message
+        self.assertEqual(response.status_code, 302)
+
+        # assert addition emails are not sent to portfolio admins
+        mock_send_addition_emails.assert_not_called()
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_edit_member_permissions_admin_to_basic(self, mock_send_removal_emails, mock_send_addition_emails):
+        """Tests converting an admin to basic member."""
+        self.client.force_login(self.user)
+
+        # Create an admin member to edit
+        admin_member = create_test_user()
+        admin_permission = UserPortfolioPermission.objects.create(
+            user=admin_member,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS],
+        )
+
+        mock_send_removal_emails.return_value = True
+
+        response = self.client.post(
+            reverse("member-permissions", kwargs={"pk": admin_permission.id}),
+            {
+                "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER,
+                "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS,
+                "member_permissions": "no_access",
+                "domain_request_permissions": "no_access",
+            },
+        )
+
+        # Verify redirect and success message
+        self.assertEqual(response.status_code, 302)
+
+        # Verify database changes
+        admin_permission.refresh_from_db()
+        self.assertEqual(admin_permission.roles, [UserPortfolioRoleChoices.ORGANIZATION_MEMBER])
+
+        # assert removal emails are sent to portfolio admins
+        mock_send_addition_emails.assert_not_called()
+        mock_send_removal_emails.assert_called_once()
+
+        # Get the arguments passed to send_portfolio_admin_removal_emails
+        _, called_kwargs = mock_send_removal_emails.call_args
+
+        # Assert the email content
+        self.assertEqual(called_kwargs["email"], admin_member.email)
+        self.assertEqual(called_kwargs["requestor"], self.user)
+        self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("django.contrib.messages.warning")
+    @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_edit_member_permissions_admin_to_basic_notification_fails(
+        self, mock_send_removal_emails, mock_send_addition_emails, mock_messages_warning
+    ):
+        """Tests converting an admin to basic member."""
+        self.client.force_login(self.user)
+
+        # Create an admin member to edit
+        admin_member = create_test_user()
+        admin_permission = UserPortfolioPermission.objects.create(
+            user=admin_member,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS],
+        )
+
+        # False return indicates that at least one notification email failed to send
+        mock_send_removal_emails.return_value = False
+
+        response = self.client.post(
+            reverse("member-permissions", kwargs={"pk": admin_permission.id}),
+            {
+                "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER,
+                "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS,
+                "member_permissions": "no_access",
+                "domain_request_permissions": "no_access",
+            },
+        )
+
+        # Verify redirect and success message
+        self.assertEqual(response.status_code, 302)
+
+        # Verify database changes
+        admin_permission.refresh_from_db()
+        self.assertEqual(admin_permission.roles, [UserPortfolioRoleChoices.ORGANIZATION_MEMBER])
+
+        # assert removal emails are sent to portfolio admins
+        mock_send_addition_emails.assert_not_called()
+        mock_send_removal_emails.assert_called_once()
+
+        # Get the arguments passed to send_portfolio_admin_removal_emails
+        _, called_kwargs = mock_send_removal_emails.call_args
+
+        # Assert the email content
+        self.assertEqual(called_kwargs["email"], admin_member.email)
+        self.assertEqual(called_kwargs["requestor"], self.user)
+        self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
+        # Assert warning message is called correctly
+        mock_messages_warning.assert_called_once()
+        warning_args, _ = mock_messages_warning.call_args
+        self.assertIsInstance(warning_args[0], WSGIRequest)
+        self.assertEqual(warning_args[1], "Could not send email notification to existing organization admins.")
+
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)

From f405ae84570f703411690781f58cbae84cd1deb5 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 1 Feb 2025 17:51:40 -0500
Subject: [PATCH 16/17] tests for PortfolioInvitedMemberEditView

---
 src/registrar/tests/test_views_portfolio.py | 320 ++++++++++++++++++--
 1 file changed, 295 insertions(+), 25 deletions(-)

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 02d5a828d..74a2f4399 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -3892,6 +3892,7 @@ def test_edit_member_permissions_basic_to_admin(self, mock_send_removal_emails,
             additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS],
         )
 
+        # return indicator that notification emails sent successfully
         mock_send_addition_emails.return_value = True
 
         response = self.client.post(
@@ -3910,12 +3911,13 @@ def test_edit_member_permissions_basic_to_admin(self, mock_send_removal_emails,
 
         # assert addition emails are sent to portfolio admins
         mock_send_addition_emails.assert_called_once()
+        # assert removal emails are not sent
         mock_send_removal_emails.assert_not_called()
 
         # Get the arguments passed to send_portfolio_admin_addition_emails
         _, called_kwargs = mock_send_addition_emails.call_args
 
-        # Assert the email content
+        # Assert the notification email content
         self.assertEqual(called_kwargs["email"], basic_member.email)
         self.assertEqual(called_kwargs["requestor"], self.user)
         self.assertEqual(called_kwargs["portfolio"], self.portfolio)
@@ -3929,7 +3931,8 @@ def test_edit_member_permissions_basic_to_admin(self, mock_send_removal_emails,
     def test_edit_member_permissions_basic_to_admin_notification_fails(
         self, mock_send_removal_emails, mock_send_addition_emails, mock_messages_warning
     ):
-        """Tests converting a basic member to admin with full permissions."""
+        """Tests converting a basic member to admin with full permissions.
+        Handle when notification emails fail to send."""
         self.client.force_login(self.user)
 
         # Create a basic member to edit
@@ -3941,6 +3944,7 @@ def test_edit_member_permissions_basic_to_admin_notification_fails(
             additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS],
         )
 
+        # At least one notification email failed to send
         mock_send_addition_emails.return_value = False
 
         response = self.client.post(
@@ -3959,6 +3963,7 @@ def test_edit_member_permissions_basic_to_admin_notification_fails(
 
         # assert addition emails are sent to portfolio admins
         mock_send_addition_emails.assert_called_once()
+        # assert no removal emails are sent
         mock_send_removal_emails.assert_not_called()
 
         # Get the arguments passed to send_portfolio_admin_addition_emails
@@ -4002,7 +4007,7 @@ def test_edit_member_permissions_admin_to_admin(self, mock_send_removal_emails,
         # Verify redirect and success message
         self.assertEqual(response.status_code, 302)
 
-        # assert addition emails are not sent to portfolio admins
+        # assert addition and removal emails are not sent to portfolio admins
         mock_send_addition_emails.assert_not_called()
         mock_send_removal_emails.assert_not_called()
 
@@ -4010,30 +4015,36 @@ def test_edit_member_permissions_admin_to_admin(self, mock_send_removal_emails,
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)
     @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
-    def test_edit_member_permissions_basic_to_basic(self, mock_send_addition_emails):
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_edit_member_permissions_basic_to_basic(self, mock_send_removal_emails, mock_send_addition_emails):
         """Tests updating an admin without changing permissions."""
         self.client.force_login(self.user)
 
-        # Create an admin member to edit
-        admin_member = create_test_user()
-        admin_permission = UserPortfolioPermission.objects.create(
-            user=admin_member,
+        # Create a basic member to edit
+        basic_member = create_test_user()
+        basic_permission = UserPortfolioPermission.objects.create(
+            user=basic_member,
             portfolio=self.portfolio,
-            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
+            additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS],
         )
 
         response = self.client.post(
-            reverse("member-permissions", kwargs={"pk": admin_permission.id}),
+            reverse("member-permissions", kwargs={"pk": basic_permission.id}),
             {
-                "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN,
+                "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER,
+                "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS,
+                "member_permissions": "no_access",
+                "domain_request_permissions": "no_access",
             },
         )
 
         # Verify redirect and success message
         self.assertEqual(response.status_code, 302)
 
-        # assert addition emails are not sent to portfolio admins
+        # assert addition and removal emails are not sent to portfolio admins
         mock_send_addition_emails.assert_not_called()
+        mock_send_removal_emails.assert_not_called()
 
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
@@ -4050,7 +4061,6 @@ def test_edit_member_permissions_admin_to_basic(self, mock_send_removal_emails,
             user=admin_member,
             portfolio=self.portfolio,
             roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
-            additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS],
         )
 
         mock_send_removal_emails.return_value = True
@@ -4175,10 +4185,91 @@ def test_edit_member_permissions_validation(self):
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)
-    def test_edit_invited_member_permissions(self):
-        """Tests editing permissions for an invited (but not yet joined) member."""
+    def test_admin_removing_own_admin_role(self):
+        """Tests an admin removing their own admin role redirects to home.
+
+        Removing the admin role will remove both view and edit members permissions.
+        Note: The user can remove the edit members permissions but as long as they
+        stay in admin role, they will at least still have view members permissions.
+        """
+
+        self.client.force_login(self.user)
+
+        # Get the user's admin permission
+        admin_permission = UserPortfolioPermission.objects.get(user=self.user, portfolio=self.portfolio)
+
+        response = self.client.post(
+            reverse("member-permissions", kwargs={"pk": admin_permission.id}),
+            {
+                "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER,
+                "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS,
+                "member_permissions": "no_access",
+                "domain_request_permissions": "no_access",
+            },
+        )
+
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response["Location"], reverse("home"))
+
+
+class TestPortfolioInvitedMemberEditView(WebTest):
+    """Tests for the edit invited member page on portfolios"""
+
+    def setUp(self):
+        self.user = create_user()
+        # Create Portfolio
+        self.portfolio = Portfolio.objects.create(creator=self.user, organization_name="Test Portfolio")
+
+        # Add an invited member who has been invited to manage domains
+        self.invited_member_email = "invited@example.com"
+        self.invitation = PortfolioInvitation.objects.create(
+            email=self.invited_member_email,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
+            additional_permissions=[
+                UserPortfolioPermissionChoices.VIEW_MEMBERS,
+            ],
+        )
+
+        # Add an invited admin who has been invited to manage domains
+        self.invited_admin_email = "invitedadmin@example.com"
+        self.admin_invitation = PortfolioInvitation.objects.create(
+            email=self.invited_admin_email,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            additional_permissions=[],
+        )
+
+        # Assign permissions to the user making requests
+        UserPortfolioPermission.objects.create(
+            user=self.user,
+            portfolio=self.portfolio,
+            roles=[UserPortfolioRoleChoices.ORGANIZATION_ADMIN],
+            additional_permissions=[
+                UserPortfolioPermissionChoices.VIEW_MEMBERS,
+                UserPortfolioPermissionChoices.EDIT_MEMBERS,
+            ],
+        )
+
+    def tearDown(self):
+        PortfolioInvitation.objects.all().delete()
+        UserPortfolioPermission.objects.all().delete()
+        Portfolio.objects.all().delete()
+        User.objects.all().delete()
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_edit_invited_member_permissions_basic_to_admin(self, mock_send_removal_emails, mock_send_addition_emails):
+        """Tests editing permissions for an invited (but not yet joined) member.
+        Update basic member to admin."""
         self.client.force_login(self.user)
 
+        # email notifications send successfully
+        mock_send_addition_emails.return_value = True
+
         # Test updating invitation permissions
         response = self.client.post(
             reverse("invitedmember-permissions", kwargs={"pk": self.invitation.id}),
@@ -4193,24 +4284,82 @@ def test_edit_invited_member_permissions(self):
         updated_invitation = PortfolioInvitation.objects.get(pk=self.invitation.id)
         self.assertEqual(updated_invitation.roles, [UserPortfolioRoleChoices.ORGANIZATION_ADMIN])
 
+        # Assert that addition emails are sent
+        mock_send_addition_emails.assert_called_once()
+        # Assert that removal emails are not sent
+        mock_send_removal_emails.assert_not_called()
+
+        # Get the arguments passed to send_portfolio_admin_addition_emails
+        _, called_kwargs = mock_send_addition_emails.call_args
+
+        # Assert the notification email content
+        self.assertEqual(called_kwargs["email"], self.invited_member_email)
+        self.assertEqual(called_kwargs["requestor"], self.user)
+        self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)
-    def test_admin_removing_own_admin_role(self):
-        """Tests an admin removing their own admin role redirects to home.
+    @patch("django.contrib.messages.warning")
+    @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_edit_invited_member_permissions_basic_to_admin_notification_fails(self, mock_send_removal_emails, mock_send_addition_emails, mock_messages_warning):
+        """Tests editing permissions for an invited (but not yet joined) member.
+        Update basic member to admin."""
+        self.client.force_login(self.user)
 
-        Removing the admin role will remove both view and edit members permissions.
-        Note: The user can remove the edit members permissions but as long as they
-        stay in admin role, they will at least still have view members permissions.
-        """
+        # at least one email notification not sent successfully
+        mock_send_addition_emails.return_value = False
+
+        # Test updating invitation permissions
+        response = self.client.post(
+            reverse("invitedmember-permissions", kwargs={"pk": self.invitation.id}),
+            {
+                "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN,
+            },
+        )
+
+        self.assertEqual(response.status_code, 302)
 
+        # Verify invitation was updated
+        updated_invitation = PortfolioInvitation.objects.get(pk=self.invitation.id)
+        self.assertEqual(updated_invitation.roles, [UserPortfolioRoleChoices.ORGANIZATION_ADMIN])
+
+        # Assert that addition emails are sent
+        mock_send_addition_emails.assert_called_once()
+        # Assert that removal emails are not sent
+        mock_send_removal_emails.assert_not_called()
+
+        # Get the arguments passed to send_portfolio_admin_addition_emails
+        _, called_kwargs = mock_send_addition_emails.call_args
+
+        # Assert the notification email content
+        self.assertEqual(called_kwargs["email"], self.invited_member_email)
+        self.assertEqual(called_kwargs["requestor"], self.user)
+        self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
+        # Assert warning message is called correctly
+        mock_messages_warning.assert_called_once()
+        warning_args, _ = mock_messages_warning.call_args
+        self.assertIsInstance(warning_args[0], WSGIRequest)
+        self.assertEqual(warning_args[1], "Could not send email notification to existing organization admins.")
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_edit_invited_member_permissions_admin_to_basic(self, mock_send_removal_emails, mock_send_addition_emails):
+        """Tests editing permissions for an invited (but not yet joined) admin.
+        Update admin to basic member."""
         self.client.force_login(self.user)
 
-        # Get the user's admin permission
-        admin_permission = UserPortfolioPermission.objects.get(user=self.user, portfolio=self.portfolio)
+        # email notifications send successfully
+        mock_send_addition_emails.return_value = True
 
+        # Test updating invitation permissions
         response = self.client.post(
-            reverse("member-permissions", kwargs={"pk": admin_permission.id}),
+            reverse("invitedmember-permissions", kwargs={"pk": self.admin_invitation.id}),
             {
                 "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER,
                 "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS,
@@ -4220,4 +4369,125 @@ def test_admin_removing_own_admin_role(self):
         )
 
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response["Location"], reverse("home"))
+
+        # Verify invitation was updated
+        updated_invitation = PortfolioInvitation.objects.get(pk=self.admin_invitation.id)
+        self.assertEqual(updated_invitation.roles, [UserPortfolioRoleChoices.ORGANIZATION_MEMBER])
+
+        # Assert that addition emails are not sent
+        mock_send_addition_emails.assert_not_called()
+        # Assert that removal emails are sent
+        mock_send_removal_emails.assert_called_once()
+
+        # Get the arguments passed to send_portfolio_admin_removal_emails
+        _, called_kwargs = mock_send_removal_emails.call_args
+
+        # Assert the notification email content
+        self.assertEqual(called_kwargs["email"], self.invited_admin_email)
+        self.assertEqual(called_kwargs["requestor"], self.user)
+        self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("django.contrib.messages.warning")
+    @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_edit_invited_member_permissions_admin_to_basic_notification_fails(self, mock_send_removal_emails, mock_send_addition_emails, mock_messages_warning):
+        """Tests editing permissions for an invited (but not yet joined) admin.
+        Update basic member to admin. At least one notification email fails."""
+        self.client.force_login(self.user)
+
+        # at least one email notification not sent successfully
+        mock_send_removal_emails.return_value = False
+
+        # Test updating invitation permissions
+        response = self.client.post(
+            reverse("invitedmember-permissions", kwargs={"pk": self.admin_invitation.id}),
+            {
+                "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER,
+                "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS,
+                "member_permissions": "no_access",
+                "domain_request_permissions": "no_access",
+            },
+        )
+
+        self.assertEqual(response.status_code, 302)
+
+        # Verify invitation was updated
+        updated_invitation = PortfolioInvitation.objects.get(pk=self.admin_invitation.id)
+        self.assertEqual(updated_invitation.roles, [UserPortfolioRoleChoices.ORGANIZATION_MEMBER])
+
+        # Assert that addition emails are not sent
+        mock_send_addition_emails.assert_not_called()
+        # Assert that removal emails are sent
+        mock_send_removal_emails.assert_called_once()
+
+        # Get the arguments passed to send_portfolio_admin_removal_emails
+        _, called_kwargs = mock_send_removal_emails.call_args
+
+        # Assert the notification email content
+        self.assertEqual(called_kwargs["email"], self.invited_admin_email)
+        self.assertEqual(called_kwargs["requestor"], self.user)
+        self.assertEqual(called_kwargs["portfolio"], self.portfolio)
+
+        # Assert warning message is called correctly
+        mock_messages_warning.assert_called_once()
+        warning_args, _ = mock_messages_warning.call_args
+        self.assertIsInstance(warning_args[0], WSGIRequest)
+        self.assertEqual(warning_args[1], "Could not send email notification to existing organization admins.")
+
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_edit_invited_member_permissions_basic_to_basic(self, mock_send_removal_emails, mock_send_addition_emails):
+        """Tests editing permissions for an invited (but not yet joined) member.
+        Update basic member without changing role."""
+        self.client.force_login(self.user)
+
+        # Test updating invitation permissions
+        response = self.client.post(
+            reverse("invitedmember-permissions", kwargs={"pk": self.invitation.id}),
+            {
+                "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER,
+                "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS,
+                "member_permissions": "no_access",
+                "domain_request_permissions": "no_access",
+            },
+        )
+
+        self.assertEqual(response.status_code, 302)
+
+        # Assert that addition and removal emails are not sent
+        mock_send_addition_emails.assert_not_called()
+        mock_send_removal_emails.assert_not_called()
+
+    @less_console_noise_decorator
+    @override_flag("organization_feature", active=True)
+    @override_flag("organization_members", active=True)
+    @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
+    @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
+    def test_edit_invited_member_permissions_admin_to_admin(self, mock_send_removal_emails, mock_send_addition_emails):
+        """Tests editing permissions for an invited (but not yet joined) admin.
+        Update admin member without changing role."""
+        self.client.force_login(self.user)
+
+        # Test updating invitation permissions
+        response = self.client.post(
+            reverse("invitedmember-permissions", kwargs={"pk": self.admin_invitation.id}),
+            {
+                "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN,
+            },
+        )
+
+        self.assertEqual(response.status_code, 302)
+
+        # Assert that addition and removal emails are not sent
+        mock_send_addition_emails.assert_not_called()
+        mock_send_removal_emails.assert_not_called()
+
+
+

From 2ab3b04d4e4c9de7bcce93f71f5ffba2b0980d0e Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Sat, 1 Feb 2025 17:58:36 -0500
Subject: [PATCH 17/17] lint

---
 src/registrar/tests/test_views_portfolio.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py
index 74a2f4399..43ab8f7a2 100644
--- a/src/registrar/tests/test_views_portfolio.py
+++ b/src/registrar/tests/test_views_portfolio.py
@@ -4303,7 +4303,9 @@ def test_edit_invited_member_permissions_basic_to_admin(self, mock_send_removal_
     @patch("django.contrib.messages.warning")
     @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
     @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
-    def test_edit_invited_member_permissions_basic_to_admin_notification_fails(self, mock_send_removal_emails, mock_send_addition_emails, mock_messages_warning):
+    def test_edit_invited_member_permissions_basic_to_admin_notification_fails(
+        self, mock_send_removal_emails, mock_send_addition_emails, mock_messages_warning
+    ):
         """Tests editing permissions for an invited (but not yet joined) member.
         Update basic member to admin."""
         self.client.force_login(self.user)
@@ -4393,7 +4395,9 @@ def test_edit_invited_member_permissions_admin_to_basic(self, mock_send_removal_
     @patch("django.contrib.messages.warning")
     @patch("registrar.views.portfolios.send_portfolio_admin_addition_emails")
     @patch("registrar.views.portfolios.send_portfolio_admin_removal_emails")
-    def test_edit_invited_member_permissions_admin_to_basic_notification_fails(self, mock_send_removal_emails, mock_send_addition_emails, mock_messages_warning):
+    def test_edit_invited_member_permissions_admin_to_basic_notification_fails(
+        self, mock_send_removal_emails, mock_send_addition_emails, mock_messages_warning
+    ):
         """Tests editing permissions for an invited (but not yet joined) admin.
         Update basic member to admin. At least one notification email fails."""
         self.client.force_login(self.user)
@@ -4437,7 +4441,6 @@ def test_edit_invited_member_permissions_admin_to_basic_notification_fails(self,
         self.assertIsInstance(warning_args[0], WSGIRequest)
         self.assertEqual(warning_args[1], "Could not send email notification to existing organization admins.")
 
-
     @less_console_noise_decorator
     @override_flag("organization_feature", active=True)
     @override_flag("organization_members", active=True)
@@ -4488,6 +4491,3 @@ def test_edit_invited_member_permissions_admin_to_admin(self, mock_send_removal_
         # Assert that addition and removal emails are not sent
         mock_send_addition_emails.assert_not_called()
         mock_send_removal_emails.assert_not_called()
-
-
-