Skip to content

Commit 5da002b

Browse files
authored
[CCAP-684] - Adds new logic for provider and family confirmation emails (#1189)
1 parent 532e586 commit 5da002b

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/main/java/org/ilgcc/app/submission/actions/SendProviderAgreesToCareFamilyConfirmationEmail.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void run(FormSubmission formSubmission, Submission providerSubmission) {
6868
String familySubmissionConfirmationId = familySubmission.getShortCode();
6969

7070
Locale locale =
71-
providerSubmission.getInputData().getOrDefault("languageRead", "English").equals("Spanish") ? Locale.forLanguageTag(
71+
familySubmission.getInputData().getOrDefault("languageRead", "English").equals("Spanish") ? Locale.forLanguageTag(
7272
"es") : Locale.ENGLISH;
7373

7474
String senderName = messageSource.getMessage("email.general.sender-name", null, locale);

src/main/java/org/ilgcc/app/submission/actions/SendProviderConfirmationEmail.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.ilgcc.app.utils.ProviderSubmissionUtilities;
1818
import org.ilgcc.jobs.SendEmailJob;
1919
import org.springframework.context.MessageSource;
20+
import org.springframework.context.i18n.LocaleContextHolder;
2021
import org.springframework.stereotype.Component;
2122

2223
@Slf4j
@@ -26,6 +27,8 @@ public class SendProviderConfirmationEmail implements Action {
2627
protected static String EMAIL_SENT_STATUS_INPUT_NAME = "providerConfirmationEmailSent";
2728
protected static String RECIPIENT_EMAIL_INPUT_NAME = "providerResponseContactEmail";
2829

30+
protected static Locale locale;
31+
2932
protected static MessageSource messageSource;
3033

3134
protected final SubmissionRepositoryService submissionRepositoryService;
@@ -42,15 +45,14 @@ public SendProviderConfirmationEmail(SendEmailJob sendEmailJob, MessageSource me
4245
@Override
4346
public void run(Submission submission) {
4447
if (!skipEmailSend(submission)) {
45-
Locale locale =
46-
submission.getInputData().getOrDefault("languageRead", "English").equals("Spanish") ? Locale.forLanguageTag(
47-
"es") : Locale.ENGLISH;
4848
Optional<Map<String, Object>> emailData = getEmailData(submission);
4949

5050
if (emailData.isEmpty()) {
5151
return;
5252
}
5353

54+
locale = LocaleContextHolder.getLocale();
55+
5456
ILGCCEmail email = ILGCCEmail.createProviderConfirmationEmail(getSenderName(locale), getRecipientEmail(submission),
5557
setSubject(emailData.get(), locale), new Content("text/html", setBodyCopy(emailData.get(), locale)),
5658
submission.getId());

0 commit comments

Comments
 (0)