From b250375de0644cbdddc723c4428a401a4da38e1d Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Tue, 1 Jul 2025 13:01:16 -0700
Subject: [PATCH] FEB email bugfix [litterbox] (#3930)

* Pass in summary context to omb submission confirmation email

* Update email template spacing
---
 .../portfolio_domain_request_summary.txt      | 44 ++++++-------------
 src/registrar/views/domain_request.py         | 10 ++++-
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/src/registrar/templates/emails/includes/portfolio_domain_request_summary.txt b/src/registrar/templates/emails/includes/portfolio_domain_request_summary.txt
index 99ebc7467..2da94896e 100644
--- a/src/registrar/templates/emails/includes/portfolio_domain_request_summary.txt
+++ b/src/registrar/templates/emails/includes/portfolio_domain_request_summary.txt
@@ -2,49 +2,31 @@
 
 Requesting entity: {# if blockmakes a newline #}
 {{ domain_request|display_requesting_entity }}
+
 .gov domain:
 {{ domain_request.requested_domain.name }}
 {% if requires_feb_questions %}
-    Meets naming requirements
-    {% if domain_request.feb_naming_requirements %}
-        {{ domain_request.feb_naming_requirements }}
-    {% else %}
-        No
-        {{ domain_request.feb_naming_requirements_details }}
-    {% endif %}
-{% endif %}
-{% if domain_request.alternative_domains.all %}
+Meets naming requirements:
+{% if domain_request.feb_naming_requirements %}Yes{% else %}No. {{ domain_request.feb_naming_requirements_details }}{% endif %}{% endif %}{% if domain_request.alternative_domains.all %}
 Alternative domains:
-{% for site in domain_request.alternative_domains.all %}{% spaceless %}{{ site.website }}{% endspaceless %}
-{% endfor %}{% endif %}
+{% for site in domain_request.alternative_domains.all %}{% spaceless %}{{ site.website }}{% endspaceless %}{% endfor %}{% endif %}
+
 Purpose of your domain:
-{% if requires_feb_questions %}
-{{ purpose_label }}
+{% if requires_feb_questions %}{{ purpose_label }}
 {{ domain_request.purpose }}
+
 Interagency initiative:
-{% if domain_request.is_interagency_initiative %}
-{{ domain_request.interagency_initiative_details }}
-{% else %}
-No
-{% endif %}
+{% if domain_request.is_interagency_initiative %}{{ domain_request.interagency_initiative_details }}{% else %}No{% endif %}
+
 Target time frame:
-{% if domain_request.has_target_time_frame %}
-{{ domain_request.time_frame_details }}
-{% else %}
-No
-{% endif %}
-{% else %}
-{{ domain_request.purpose }}
-{% endif %}
-{% if domain_request.anything_else %}
+{% if domain_request.has_target_time_frame %}{{ domain_request.time_frame_details }}{% else %}No{% endif %}
+{% else %}{{ domain_request.purpose }}{% endif %}{% if domain_request.anything_else %}
 Additional details:
-{{ domain_request.anything_else }}
-{% endif %}
+{{ domain_request.anything_else }}{% endif %}
 {% if recipient %}
 Your contact information:
 {% spaceless %}{% include "emails/includes/contact.txt" with contact=recipient %}{% endspaceless %}
 {% endif %}
-
 Administrators from your organization:{% for admin in domain_request.portfolio.portfolio_admin_users %}
-{% spaceless %}{% if admin != recipient %}{% include "emails/includes/contact.txt" with contact=admin %}{% endif %}{% endspaceless %}
+{% spaceless %}{% if not recipient or admin != recipient %}{% include "emails/includes/contact.txt" with contact=admin %}{% endif %}{% endspaceless %}
 {% endfor %}
\ No newline at end of file
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 32428c90c..6b4eb440d 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -1002,7 +1002,15 @@ class Review(DomainRequestWizard):
             return
 
         try:
-            context = {"domain_request": self.domain_request, "date": date.today()}
+            purpose_label = DomainRequest.FEBPurposeChoices.get_purpose_label(self.domain_request.feb_purpose_choice)
+            # requires_feb_questions and purpose_label used to pass into portfolio_domain_request_summary template
+            context = {
+                "domain_request": self.domain_request,
+                "date": date.today(),
+                "requires_feb_questions": True,
+                "purpose_label": purpose_label,
+            }
+
             send_templated_email(
                 "emails/omb_submission_confirmation.txt",
                 "emails/omb_submission_confirmation_subject.txt",