Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP #1129

Closed
wants to merge 1 commit into from
Closed

WIP #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/main/java/org/ilgcc/app/email/EmailConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,23 @@ public class EmailConstants {

@Getter
public enum EmailType {
FAMILY_CONFIRMATION_EMAIL("Family Confirmation Email"), FAMILY_CONFIRMATION_EMAIL_NO_PROVIDER(
"No Provider Family Confirmation Email");
FAMILY_CONFIRMATION_EMAIL("Family Confirmation Email", "familyConfirmationEmailSent"), FAMILY_CONFIRMATION_EMAIL_NO_PROVIDER(
"No Provider Family Confirmation Email", "familyConfirmationEmailSent");

private final String description;
private final String sentVariable;

EmailType(String description, String sentVariable) {

EmailType(String description) {
this.description = description;
this.sentVariable = sentVariable;
}

public String getDescription() {
return description;
}

public String getSentVariable() { return sentVariable}
}

public static final String FROM_ADDRESS = "[email protected]";
Expand Down
29 changes: 20 additions & 9 deletions src/main/java/org/ilgcc/app/submission/actions/SendFamilyConfirmationEmail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.util.Locale;
import lombok.extern.slf4j.Slf4j;
import org.ilgcc.app.email.EmailConstants;
import org.ilgcc.app.email.EmailConstants.EmailType;
import org.ilgcc.app.utils.SubmissionUtilities;
import org.ilgcc.jobs.SendEmailJob;
import org.springframework.context.MessageSource;
Expand All @@ -19,22 +20,31 @@ public class SendFamilyConfirmationEmail implements Action {
private final SendEmailJob sendEmailJob;
private final MessageSource messageSource;
private final SubmissionRepositoryService submissionRepositoryService;
private final String EMAIL_SUBJECT_KEY = "email.family-confirmation.subject";
private final String EMAIL_SENDER_NAME_KEY = "email.sender-name";
private final String RECIPIENT_EMAIL_INPUT_NAME = "parentContactEmail";

public SendFamilyConfirmationEmail(SendEmailJob sendEmailJob, MessageSource messageSource, SubmissionRepositoryService submissionRepositoryService) {
public SendFamilyConfirmationEmail(SendEmailJob sendEmailJob, MessageSource messageSource,
SubmissionRepositoryService submissionRepositoryService) {
this.sendEmailJob = sendEmailJob;
this.messageSource = messageSource;
this.submissionRepositoryService = submissionRepositoryService;
}

@Override
public void run(Submission familySubmission) {
String familyConfirmationEmailSent = (String) familySubmission.getInputData()
.getOrDefault("familyConfirmationEmailSent", "false");
if (familyConfirmationEmailSent.equals("true")) {
sendEmail(familySubmission, EmailType.FAMILY_CONFIRMATION_EMAIL);
}

public void sendEmail(Submission familySubmission, EmailType emailType) {
String confirmationEmailSent = (String) familySubmission.getInputData()
.getOrDefault(emailType.getSentVariable(), "false");
if (confirmationEmailSent.equals("true")) {
log.warn("Family confirmation email has already been sent for submission with ID: {}", familySubmission.getId());
return;
}
String familyEmail = familySubmission.getInputData().get("parentContactEmail").toString();

String familyEmail = familySubmission.getInputData().get(RECIPIENT_EMAIL_INPUT_NAME).toString();
if (familyEmail == null || familyEmail.isEmpty()) {
log.warn("Family email was empty when attempting to send family confirmation email for submission with ID: {}",
familySubmission.getId());
Expand All @@ -46,18 +56,19 @@ public void run(Submission familySubmission) {
Locale locale =
familySubmission.getInputData().getOrDefault("languageRead", "English").equals("Spanish") ? Locale.forLanguageTag(
"es") : Locale.ENGLISH;
String subject = messageSource.getMessage("email.family-confirmation.subject", new Object[]{familySubmissionShortCode},
String subject = messageSource.getMessage(EMAIL_SUBJECT_KEY, new Object[]{familySubmissionShortCode},
locale);

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

sendEmailJob.enqueueSendEmailJob(familyEmail, senderName, subject,
EmailConstants.EmailType.FAMILY_CONFIRMATION_EMAIL.getDescription(),
emailType.getDescription(),
createFamilyConfirmationEmailBody(familySubmission, familySubmissionShortCode, locale), familySubmission);
familySubmission.getInputData().put("familyConfirmationEmailSent", "true");
familySubmission.getInputData().put(EmailType.FAMILY_CONFIRMATION_EMAIL.getSentVariable(), "true");
submissionRepositoryService.save(familySubmission);
}


private Content createFamilyConfirmationEmailBody(Submission familySubmission, String confirmationCode, Locale locale) {
String parentFirstName = familySubmission.getInputData().get("parentFirstName").toString();
String emailLink = familySubmission.getInputData().get("emailLink").toString();
Expand Down
Loading