use null safe comparison

codeforamerica · Oct 17, 2023 · 0b09c81 · 0b09c81
1 parent 58c7b35
commit 0b09c81
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/main/java/org/ladocuploader/app/utils/IncomeCalculator.java b/src/main/java/org/ladocuploader/app/utils/IncomeCalculator.java
@@ -1,11 +1,14 @@
 package org.ladocuploader.app.utils;
 
 import formflow.library.data.Submission;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
+@Slf4j
 public class IncomeCalculator {
   Submission submission;
   public IncomeCalculator(Submission submission) {
@@ -27,19 +30,21 @@ public static double futureIncomeForJob(Map<String, Object> job) throws NumberFo
     if (job.getOrDefault("jobPaidByHour", "false").toString().equals("true")) {
       var hoursPerWeek = Double.parseDouble(job.get("hoursPerWeek").toString());
       var hourlyWage = Double.parseDouble(job.get("hourlyWage").toString());
+      log.info("Returning hourly wage");
       return hoursPerWeek * hourlyWage * (52.0 / 12);
     } else {
-      var payPeriod = job.getOrDefault("payPeriod", "It varies");
+      var payPeriod = job.getOrDefault("payPeriod", "It varies").toString();
       var payPeriodAmount = Double.parseDouble(job.get("payPeriodAmount").toString());
-      if (payPeriod == "Every week"){
+      if (Objects.equals(payPeriod, "Every week")){
         return payPeriodAmount * (52.0 / 12);
-      } else if (payPeriod == "Every 2 weeks"){
+      } else if (Objects.equals(payPeriod, "Every 2 weeks")){
         return (payPeriodAmount * ((52.0 / 2) / 12));
-      } else if (payPeriod == "Twice a month"){
+      } else if (Objects.equals(payPeriod, "Twice a month")){
         return payPeriodAmount * 2;
-      } else if (payPeriod == "Every month"){
+      } else if (Objects.equals(payPeriod, "Every month")){
         return payPeriodAmount;
       }
+      log.info("Using 30D estimate");
       // based on 30D estimate
       return payPeriodAmount;
     }

diff --git a/src/main/resources/templates/laDigitalAssister/householdIncomeByJob.html b/src/main/resources/templates/laDigitalAssister/householdIncomeByJob.html
@@ -12,9 +12,9 @@
                     th:replace="'fragments/cardHeader' :: cardHeader(header=#{income-by-job.header}, subtext=#{income-by-job.subheader})"/>
 
         <th:block th:replace="~{fragments/continueButton :: continue}" />
-        <span class="text--small spacing-below-0">
-          <a th:href="'/flow/' + ${flow} + '/householdAnnualIncome'" th:text="#{income-by-job.enter-directly}"></a>
-        </span>
+<!--        <span class="text&#45;&#45;small spacing-below-0">-->
+<!--          <a th:href="'/flow/' + ${flow} + '/householdAnnualIncome'" th:text="#{income-by-job.enter-directly}"></a>-->
+<!--        </span>-->
       </main>
     </div>
   </section>

diff --git a/src/main/resources/templates/laDigitalAssister/householdIncomeList.html b/src/main/resources/templates/laDigitalAssister/householdIncomeList.html
@@ -34,7 +34,7 @@
                       </div>
 
                       <div class="subflow-list__item-actions">
-                        <a th:href="'/flow/laDigitalAssister/' + ${iterationStartScreen} + '/' + ${incomeItem.uuid} + '/edit'"
+                        <a th:href="'/flow/laDigitalAssister/householdEmployerName/' + ${incomeItem.uuid} + '/edit'"
                            th:text="#{income-list.edit-job}"
                            class="subflow-edit"
                            th:id="'edit-iteration-' + ${incomeItem.uuid}">