From 241426431580ec51530ddf6134529f107d913e24 Mon Sep 17 00:00:00 2001
From: Ana Medrano Fernandez <8609011+analoo@users.noreply.github.com>
Date: Thu, 1 Feb 2024 09:48:48 -0800
Subject: [PATCH] pay frequency type issue resolved (#591)

* pay frequency type issue resolved

* resolved test failures

* changes per Sree feedback

---------

Co-authored-by: Ana Medrano Fernandez <amedrano@codeforamerica.org@Anas-MacBook-Pro-2.local>
---
 .../app/data/enums/PayFrequencyType.java      | 35 +++++++++++++++++++
 .../app/utils/SubmissionUtilities.java        |  4 ++-
 src/main/resources/messages.properties        |  5 +--
 src/main/resources/messages_es.properties     |  1 +
 .../householdIncomeList.html                  |  2 +-
 .../laDigitalAssister/jobPayAmount.html       | 17 +++++----
 .../laDigitalAssister/jobPayPeriod.html       | 31 +++++++---------
 7 files changed, 66 insertions(+), 29 deletions(-)
 create mode 100644 src/main/java/org/ladocuploader/app/data/enums/PayFrequencyType.java

diff --git a/src/main/java/org/ladocuploader/app/data/enums/PayFrequencyType.java b/src/main/java/org/ladocuploader/app/data/enums/PayFrequencyType.java
new file mode 100644
index 000000000..803ddfcde
--- /dev/null
+++ b/src/main/java/org/ladocuploader/app/data/enums/PayFrequencyType.java
@@ -0,0 +1,35 @@
+package org.ladocuploader.app.data.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+import lombok.Getter;
+
+@Getter
+public enum PayFrequencyType {
+  EVERY_WEEK("Every week", "job-pay-period.every-week"),
+  EVERY_TWO_WEEKS("Every 2 weeks", "job-pay-period.every-two-weeks"),
+  TWICE_A_MONTH("Twice a month", "job-pay-period.twice-a-month"),
+  EVERY_MONTH("Every month", "job-pay-period.every-month"),
+  VARIES("It varies", "job-pay-period.it-varies");
+
+  private final String value;
+  private final String labelSrc;
+
+  static private final Map<String, PayFrequencyType> MAP_BY_VALUE = new HashMap<>();
+
+  static {
+    for (PayFrequencyType type : PayFrequencyType.values()) {
+      MAP_BY_VALUE.put(type.value, type);
+    }
+  }
+
+  PayFrequencyType(String value, String labelSrc) {
+    this.value = value;
+    this.labelSrc = labelSrc;
+  }
+
+  public static String getLabelSrcFromValue(String value) {
+    PayFrequencyType expenseType = (PayFrequencyType) MAP_BY_VALUE.get(value);
+    return expenseType != null ? expenseType.labelSrc : null;
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/org/ladocuploader/app/utils/SubmissionUtilities.java b/src/main/java/org/ladocuploader/app/utils/SubmissionUtilities.java
index 54e024adf..68551657e 100644
--- a/src/main/java/org/ladocuploader/app/utils/SubmissionUtilities.java
+++ b/src/main/java/org/ladocuploader/app/utils/SubmissionUtilities.java
@@ -193,8 +193,10 @@ public static ArrayList<HashMap<String, Object>> getHouseholdIncomeReviewItems(S
         item.put("jobName", job.get("employerName"));
         item.put("isApplicant", name.equals(applicantFullName));
         // TODO: handle income types - hourly vs. non hourly
-        var payPeriod = job.getOrDefault("jobPaidByHour", "false").equals("true") ? "Hourly, " + job.get("hoursPerWeek").toString() + " hours per week" : job.getOrDefault("payPeriod", "It varies").toString();
+        var payPeriod = job.getOrDefault("jobPaidByHour", "false").equals("true") ? "Hourly" : job.get("payPeriod").toString();
+        var hoursPerWeek = job.getOrDefault("hoursPerWeek", "").toString();
         item.put("payPeriod", payPeriod);
+        item.put("hoursPerWeek", hoursPerWeek);
 
         // TODO: add wage amount and not future income
         var payAmount = job.getOrDefault("jobPaidByHour", "false").equals("true") ? job.get("hourlyWage").toString() : job.get("payPeriodAmount").toString();
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 05b3030f3..dcb152373 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -783,8 +783,8 @@ income-confirmation.header=Got it! You're almost done with the income section.
 income-confirmation.subtext=Do you want to add another job for your household?
 
 job-pay-period.title=Pay period
-job-pay-period-self.header=How often do you get paid? 
-job-pay-period-household.header=How often does {0} get paid? 
+job-pay-period-self.header=How often do you get paid?
+job-pay-period-household.header=How often does {0} get paid?
 job-pay-period.every-week=Every week
 job-pay-period.every-two-weeks=Every 2 weeks
 job-pay-period.twice-a-month=Twice a month
@@ -803,6 +803,7 @@ income-list.monthly-income=Your monthly household income
 income-list.continue=I'm done adding jobs
 income-list.box-title=Your monthly household income
 income-list.total-income=Total monthly household income
+income-list.hourly-statement=Hourly, {0} hours per week
 income-list.total-monthly-pay=Total monthly household income
 income-list.no-jobs-added=No jobs added
 income-list.thats-you=(that's you!)
diff --git a/src/main/resources/messages_es.properties b/src/main/resources/messages_es.properties
index 0448dfadd..0c430bf3e 100644
--- a/src/main/resources/messages_es.properties
+++ b/src/main/resources/messages_es.properties
@@ -803,6 +803,7 @@ income-list.monthly-income=Ingresos mensuales del hogar
 income-list.continue=He terminado de agregar los trabajos
 income-list.box-title=Ingresos mensuales del hogar
 income-list.total-income=Total de ingresos mensuales del hogar
+income-list.hourly-statement=Por hora, {0} horas por semana
 income-list.total-monthly-pay=Total de ingresos mensuales del hogar
 income-list.no-jobs-added=No se agregaron trabajos
 income-list.thats-you=(¡Usted!)
diff --git a/src/main/resources/templates/laDigitalAssister/householdIncomeList.html b/src/main/resources/templates/laDigitalAssister/householdIncomeList.html
index 86ce717b7..fb3fbbe57 100644
--- a/src/main/resources/templates/laDigitalAssister/householdIncomeList.html
+++ b/src/main/resources/templates/laDigitalAssister/householdIncomeList.html
@@ -39,7 +39,7 @@
                                th:text="${incomeItem.jobName.toUpperCase()}"></div>
                         </strong>
                         <div><strong th:text="${incomeItem.income}"></strong></div>
-                        <div><span th:text="${incomeItem.payPeriod}"></span></div>
+                        <div><span th:text="${incomeItem.payPeriod == 'Hourly' ? #messages.msgWithParams('income-list.hourly-statement', incomeItem.hoursPerWeek) : #messages.msg(T(org.ladocuploader.app.data.enums.PayFrequencyType).getLabelSrcFromValue(incomeItem.payPeriod))}"></span></div>
                       </div>
 
                       <div class="subflow-list__item-actions">
diff --git a/src/main/resources/templates/laDigitalAssister/jobPayAmount.html b/src/main/resources/templates/laDigitalAssister/jobPayAmount.html
index 64f451cbb..930b4c619 100644
--- a/src/main/resources/templates/laDigitalAssister/jobPayAmount.html
+++ b/src/main/resources/templates/laDigitalAssister/jobPayAmount.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
-<th:block th:with="messageVariant=${fieldData.getOrDefault('payPeriod', 'It varies') == 'It varies' ? 'variable' : 'fixed'}">
+<th:block
+    th:with="messageVariant=${fieldData.getOrDefault('payPeriod', 'It varies') == 'It varies' ? 'variable' : 'fixed'}">
   <head th:replace="~{fragments/head :: head(title=#{job-pay-amount.title})}"></head>
   <body>
   <div class="page-wrapper">
@@ -11,12 +12,16 @@
         <main id="content" role="main" class="form-card spacing-above-35">
           <p class="grey-text" th:text="${fieldData.get('employerName')}"></p>
           <th:block
-              th:replace="~{fragments/cardHeader :: cardHeader(header=${messageVariant == 'fixed' ? #messages.msgWithParams('job-pay-amount.fixed.header', fieldData.getOrDefault('payPeriod', 'in the last 30 days').toLowerCase()) : #messages.msg('job-pay-amount.variable.header')}, subtext=#{job-pay-amount.subtext})}"/>
-          <th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::content})}">
+              th:with="labelValue=${#messages.msg(T(org.ladocuploader.app.data.enums.PayFrequencyType).getLabelSrcFromValue(fieldData.get('payPeriod'))).toLowerCase()}">
+            <th:block
+                th:replace="~{fragments/cardHeader :: cardHeader(header=${messageVariant == 'fixed' ? #messages.msgWithParams('job-pay-amount.fixed.header', labelValue) : #messages.msg('job-pay-amount.variable.header')}, subtext=#{job-pay-amount.subtext})}"/>
+          </th:block>
+          <th:block
+              th:replace="~{fragments/form :: form(action=${formAction}, content=~{::content})}">
             <th:block th:ref="content">
               <div class="form-card__content">
                 <th:block
-                  th:replace="~{fragments/inputs/money :: money(inputName='payPeriodAmount',
+                    th:replace="~{fragments/inputs/money :: money(inputName='payPeriodAmount',
                   ariaLabel='header')}"/>
 
               </div>
@@ -24,7 +29,7 @@
 
 
                 <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(
-                  text=#{general.inputs.continue})}" />
+                  text=#{general.inputs.continue})}"/>
 
               </div>
             </th:block>
@@ -33,7 +38,7 @@
       </div>
     </section>
   </div>
-  <th:block th:replace="~{fragments/footer :: footer}" />
+  <th:block th:replace="~{fragments/footer :: footer}"/>
   </body>
 </th:block>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/laDigitalAssister/jobPayPeriod.html b/src/main/resources/templates/laDigitalAssister/jobPayPeriod.html
index 89c23717d..a3768c99d 100644
--- a/src/main/resources/templates/laDigitalAssister/jobPayPeriod.html
+++ b/src/main/resources/templates/laDigitalAssister/jobPayPeriod.html
@@ -14,34 +14,27 @@
           <p class="grey-text" th:text="${fieldData.get('employerName')}"></p>
           <th:block
               th:replace="~{fragments/cardHeader :: cardHeader(header=${hhMemberUUID == 'you' ? #messages.msg('job-pay-period-self.header') : #messages.msgWithParams('job-pay-period-household.header', householdMemberName)})}"/>
-          <th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::content})}">
+          <th:block
+              th:replace="~{fragments/form :: form(action=${formAction}, content=~{::content})}">
             <th:block th:ref="content">
               <div class="form-card__content">
                 <th:block th:replace="~{fragments/inputs/radioFieldset ::
                               radioFieldset(inputName='payPeriod',
                               ariaLabel='header',
                               content=~{::radioContent})}">
-                              <th:block th:ref="radioContent">
-                                <!-- Copy the below input if you want to add more -->
-                                <th:block
-                                    th:replace="~{fragments/inputs/radio :: radio(inputName='payPeriod',value=#{job-pay-period.every-week}, label=#{job-pay-period.every-week})}"/>
-                                <th:block
-                                    th:replace="~{fragments/inputs/radio :: radio(inputName='payPeriod',value=#{job-pay-period.every-two-weeks}, label=#{job-pay-period.every-two-weeks})}"/>
-                                <th:block
-                                    th:replace="~{fragments/inputs/radio :: radio(inputName='payPeriod',value=#{job-pay-period.twice-a-month}, label=#{job-pay-period.twice-a-month})}"/>
-                                <th:block
-                                    th:replace="~{fragments/inputs/radio :: radio(inputName='payPeriod',value=#{job-pay-period.every-month}, label=#{job-pay-period.every-month})}"/>
-                                <th:block
-                                    th:replace="~{fragments/inputs/radio :: radio(inputName='payPeriod',value=#{job-pay-period.it-varies}, label=#{job-pay-period.it-varies})}"/>
-                              </th:block>
-                            </th:block>
+                  <th:block th:ref="radioContent">
+                    <th:block
+                        th:each="payPeriod : ${T(org.ladocuploader.app.data.enums.PayFrequencyType).values()}">
+                      <th:block
+                          th:replace="~{fragments/inputs/radio :: radio(inputName='payPeriod', value=${payPeriod.getValue()}, label=#{${payPeriod.getLabelSrc()}})}"/>
+                    </th:block>
+                  </th:block>
+                </th:block>
 
               </div>
               <div class="form-card__footer">
-
-
                 <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(
-                  text=#{general.inputs.continue})}" />
+                  text=#{general.inputs.continue})}"/>
 
               </div>
             </th:block>
@@ -50,7 +43,7 @@
       </div>
     </section>
   </div>
-  <th:block th:replace="~{fragments/footer :: footer}" />
+  <th:block th:replace="~{fragments/footer :: footer}"/>
   </body>
 </th:block>
 </html>
\ No newline at end of file