Updates for file src/main/resources/messages.properties on branch CCAP-673-Make-phone-number-in-family-confirmation-email-dynamic

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

@@ -63,11 +63,12 @@ private Content createFamilyConfirmationEmailBody(Submission familySubmission, S
         String emailLink = familySubmission.getInputData().get("emailLink").toString();
         String ccrAndR = familySubmission.getInputData().get("ccrrName").toString();
         String submittedDate = SubmissionUtilities.getFormattedSubmittedAtDate(familySubmission);
+        String ccrrPhoneNumber = (String) familySubmission.getInputData().getOrDefault("ccrrPhoneNumber", "");
 
         String p1 = messageSource.getMessage("email.family-confirmation.p1", new Object[]{parentFirstName}, locale);
         String p2 = messageSource.getMessage("email.family-confirmation.p2", null, locale);
         String p3 = messageSource.getMessage("email.family-confirmation.p3", new Object[]{emailLink}, locale);
-        String p4 = messageSource.getMessage("email.family-confirmation.p4", new Object[]{ccrAndR}, locale);
+        String p4 = messageSource.getMessage("email.family-confirmation.p4", new Object[]{ccrAndR, ccrrPhoneNumber}, locale);
         String p5 = messageSource.getMessage("email.family-confirmation.p5", new Object[]{confirmationCode, submittedDate},
                 locale);
         String p6 = messageSource.getMessage("email.family-confirmation.p6", null, locale);

src/main/resources/messages.properties

@@ -102,7 +102,7 @@ email.family-confirmation.subject=Your CCAP confirmation code: {0}
 email.family-confirmation.p1=<p>Hi {0},</p>
 email.family-confirmation.p2=<p>You completed the online Child Care Assistance Program (CCAP) application!</p>
 email.family-confirmation.p3=<p><strong>You need to email or text your child care provider so they can complete their part.</strong> They have 3 business days to complete the application using this unique link: {0}
-email.family-confirmation.p4=<p>You will receive mail or email about the status of your case within <strong>13-15 business days.</strong> If you don''t receive a notice within that time or need more information, reach out to your Child Care Resource and Referral (CCR&R) Agency, {0} by phone: (800) 848-8727 x225.</p>
+email.family-confirmation.p4=<p>You will receive mail or email about the status of your case within <strong>13-15 business days.</strong> If you don''t receive a notice within that time or need more information, reach out to your Child Care Resource and Referral (CCR&R) Agency, {0} by phone: <a href="tel:{1}">{1}</a>.</p>
 email.family-confirmation.p5=<p><strong>Your application details:</strong><br/>Confirmation code: {0}<br/>Status: Pending review<br/>Date of submission: {1}</p>
 email.family-confirmation.p6=<p><strong>What happens if my provider doesn't respond?</strong><br/>If your provider doesn't complete their part of the application in 3 business days, your application will automatically be forwarded to your CCR&R for processing. A worker will reach out to you and help you find an available child care provider.</p>
 email.family-confirmation.p7=<p><strong>What are the next steps in the process?</strong><br/>Your application will be reviewed by a worker at your CCR&R who will approve or deny the application based on CCAP program requirements. If they don't have enough information to make a decision, they will reach out to you by phone, email, or mail.</p>

src/main/resources/messages_es.properties

@@ -102,7 +102,7 @@ email.family-confirmation.subject=Su c
 email.family-confirmation.p1=<p>Hola {0},</p>
 email.family-confirmation.p2=<p>¡Ha completado la solicitud en línea del Programa de Asistencia para el Cuidado de Niños (CCAP)!</p>
 email.family-confirmation.p3=<p><strong>Necesita enviar un correo electrónico o un mensaje de texto a su proveedor de cuidado infantil para que complete la parte que le corresponde.</strong> Esta persona tiene  3 días hábiles para completar la solicitud utilizando este enlace único:  {0}
-email.family-confirmation.p4=<p>Recibirá una carta en el correo postal o  un correo electrónico sobre el estatus de su caso dentro de los próximos <strong>13 a 15 días hábiles</strong>. Si no recibe un aviso dentro de ese tiempo o necesita más información, comuníquese con su Agencia de Recursos y Referencias para el Cuidado de Niños (CCR&R), {0} llamando al: (800) 848-8727 x225.</p>
+email.family-confirmation.p4=<p>Recibirá una carta en el correo postal o un correo electrónico sobre el estatus de su caso dentro de los próximos <strong>13 a 15 días hábiles</strong>. Si no recibe un aviso dentro de ese tiempo o necesita más información, comuníquese con su Agencia de Recursos y Referencias para el Cuidado de Niños (CCR&R), <a href="tel:{1}">{1}</a>.</p>
 email.family-confirmation.p5=<p><strong>Detalles de su solicitud:</strong><br/>Código de confirmación: {0}<br/>Estatus:  Pendiente de revisión<br/>Fecha de envio: {1}</p>
 email.family-confirmation.p6=<p><strong>¿Qué sucede si mi proveedor no responde?</strong><br/>Si su proveedor no completa su parte de la solicitud en 3 días hábiles, su solicitud se enviará automáticamente a su CCR&R para su procesamiento. Alguien del personal se comunicará con usted y le ayudará a encontrar un proveedor de cuidado infantil disponible.</p>
 email.family-confirmation.p7=<p><strong>¿Cuáles son los próximos pasos en el proceso?</strong><br/>Su solicitud será revisada por alguien del personal de su CCR&R, quien aprobará o denegará la solicitud según los requisitos del programa CCAP. Si esta persona no tiene suficiente información para tomar una decisión, se comunicará con usted por teléfono, correo electrónico o correo postal.</p>

src/test/java/org/ilgcc/app/submission/actions/SetOrganizationIdAndCCRRNameTest.java

@@ -134,6 +134,7 @@ public void setsOrganizationIdFromApplicationWhenUnhoused() {
     public void setsOrganizationIdFromCountyWhenInvalidZipCode() {
         ResourceOrganization org = new ResourceOrganization();
         org.setName("4C: Community Coordinated Child Care");
+        org.setPhone("(312)333-3333");
         org.setResourceOrgId(new BigInteger("56522729391679"));
         when(applicationRouterService.getOrganizationIdByZipCode("94114")).thenReturn(Optional.empty());
         when(applicationRouterService.getOrganizationIdByZipCode("60530")).thenReturn(Optional.of(org));
@@ -148,6 +149,7 @@ public void setsOrganizationIdFromCountyWhenInvalidZipCode() {
 
         assertThat(submission.getInputData().get("organizationId").toString()).isEqualTo("56522729391679");
         assertThat(submission.getInputData().get("ccrrName").toString()).isEqualTo("4C: Community Coordinated Child Care");
+        assertThat(submission.getInputData().get("ccrrPhoneNumber").toString()).isEqualTo("(312)333-3333");
         assertThat(submission.getInputData().get("applicantAddressCounty").toString()).isEqualTo("Lee");
     }