[CCAP-684] - Adds new logic for provider and family confirmation emai…

…ls (#1189)
codeforamerica · Feb 24, 2025 · 5da002b · 5da002b
1 parent 532e586
commit 5da002b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...ava/org/ilgcc/app/submission/actions/SendProviderAgreesToCareFamilyConfirmationEmail.java b/...ava/org/ilgcc/app/submission/actions/SendProviderAgreesToCareFamilyConfirmationEmail.java
@@ -68,7 +68,7 @@ public void run(FormSubmission formSubmission, Submission providerSubmission) {
         String familySubmissionConfirmationId = familySubmission.getShortCode();
 
         Locale locale =
-                providerSubmission.getInputData().getOrDefault("languageRead", "English").equals("Spanish") ? Locale.forLanguageTag(
+                familySubmission.getInputData().getOrDefault("languageRead", "English").equals("Spanish") ? Locale.forLanguageTag(
                         "es") : Locale.ENGLISH;
 
         String senderName = messageSource.getMessage("email.general.sender-name", null, locale);

diff --git a/src/main/java/org/ilgcc/app/submission/actions/SendProviderConfirmationEmail.java b/src/main/java/org/ilgcc/app/submission/actions/SendProviderConfirmationEmail.java
@@ -17,6 +17,7 @@
 import org.ilgcc.app.utils.ProviderSubmissionUtilities;
 import org.ilgcc.jobs.SendEmailJob;
 import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Component;
 
 @Slf4j
@@ -26,6 +27,8 @@ public class SendProviderConfirmationEmail implements Action {
     protected static String EMAIL_SENT_STATUS_INPUT_NAME = "providerConfirmationEmailSent";
     protected static String RECIPIENT_EMAIL_INPUT_NAME = "providerResponseContactEmail";
 
+    protected static Locale locale;
+
     protected static MessageSource messageSource;
 
     protected final SubmissionRepositoryService submissionRepositoryService;
@@ -42,15 +45,14 @@ public SendProviderConfirmationEmail(SendEmailJob sendEmailJob, MessageSource me
     @Override
     public void run(Submission submission) {
         if (!skipEmailSend(submission)) {
-            Locale locale =
-                    submission.getInputData().getOrDefault("languageRead", "English").equals("Spanish") ? Locale.forLanguageTag(
-                            "es") : Locale.ENGLISH;
             Optional<Map<String, Object>> emailData = getEmailData(submission);
 
             if (emailData.isEmpty()) {
                 return;
             }
 
+            locale = LocaleContextHolder.getLocale();
+
             ILGCCEmail email = ILGCCEmail.createProviderConfirmationEmail(getSenderName(locale), getRecipientEmail(submission),
                     setSubject(emailData.get(), locale), new Content("text/html", setBodyCopy(emailData.get(), locale)),
                     submission.getId());