Fix expense calculator bug

src/main/java/org/mdbenefits/app/submission/actions/CheckExpeditedSnapEligibility.java

@@ -30,6 +30,7 @@ public void run(Submission submission) {
 
         BigDecimal moneyOnHandAmount = convertToBigDecimal(
                 inputData.getOrDefault("expeditedMoneyOnHandAmount", "0").toString());
+
         BigDecimal householdIncomeAmount = convertToBigDecimal(
                 inputData.getOrDefault("householdIncomeLast30Days", "0").toString());
         if (!isApplyingForExpeditedSnap) {

src/main/java/org/mdbenefits/app/submission/actions/ClearUnusedExpensesFields.java

@@ -22,7 +22,7 @@ public class ClearUnusedExpensesFields implements Action {
     public void run(Submission submission) {
         Map<String, String> submissionInputData = (Map) submission.getInputData();
         List<String> householdHomeExpenses = (List) submission.getInputData().getOrDefault("householdHomeExpenses[]", List.of());
-        boolean none = householdHomeExpenses.contains("NONE");
+        boolean none = householdHomeExpenses.contains("None");
 
         for (HomeExpensesType type : HomeExpensesType.values()) {
             if (none || !householdHomeExpenses.contains(type.name())) {

src/main/java/org/mdbenefits/app/submission/actions/MaybeClearMoneyOnHandAmount.java

@@ -0,0 +1,30 @@
+package org.mdbenefits.app.submission.actions;
+
+import formflow.library.config.submission.Action;
+import formflow.library.data.FormSubmission;
+import formflow.library.data.Submission;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class MaybeClearMoneyOnHandAmount implements Action {
+
+    /**
+     * This action will clear out the expeditedMoneyOnHandAmount field, if the householdMoneyOnHandLessThan100 is equal to "true";
+     * This is useful in the case that the user goes forward and enters an amount and then goes back and indicates that they have
+     * less than the money on hand threshold.
+     *
+     * @param formSubmission the data being submitted.
+     * @param submission     submission object the action is associated with, not null
+     */
+    @Override
+    public void run(FormSubmission formSubmission, Submission submission) {
+        boolean isMoneyOnHandLessThan100 = ((String) formSubmission.getFormData()
+                .get("householdMoneyOnHandLessThan100")).equalsIgnoreCase("true");
+
+        if (isMoneyOnHandLessThan100) {
+            formSubmission.getFormData().put("expeditedMoneyOnHandAmount", "0");
+        }
+    }
+}

src/main/java/org/mdbenefits/app/utils/ExpenseCalculator.java

@@ -26,11 +26,12 @@ public BigDecimal totalUtilitiesExpenses() {
         Map<String, Object> inputData = submission.getInputData();
 
         expenses.forEach(val -> {
-            String inputFieldName = HomeExpensesType.getEnumByName(val).getInputFieldName();
-            expenseAmounts.add(
-                    new BigDecimal(inputData.getOrDefault(inputFieldName, "0").toString())
-                            .setScale(2, RoundingMode.HALF_UP));
-
+            if (!val.equalsIgnoreCase("None")) {
+                String inputFieldName = HomeExpensesType.getEnumByName(val).getInputFieldName();
+                expenseAmounts.add(
+                        new BigDecimal(inputData.getOrDefault(inputFieldName, "0").toString())
+                                .setScale(2, RoundingMode.HALF_UP));
+            }
         });
 
         return expenseAmounts.stream().reduce(BigDecimal.ZERO, BigDecimal::add);

src/main/resources/flows-config.yaml

@@ -82,6 +82,7 @@ flow:
     nextScreens:
       - name: expeditedSnapMoneyOnHand
   expeditedSnapMoneyOnHand:
+    onPostAction: MaybeClearMoneyOnHandAmount
     beforeSaveAction: CheckExpeditedSnapEligibility
     nextScreens:
       - name: expeditedSnapQualificationNotice
@@ -270,6 +271,7 @@ flow:
         condition: IsApplyingForSnap
       - name: householdMedicalExpenses
   householdMoneyOnHand:
+    onPostAction: MaybeClearMoneyOnHandAmount
     beforeSaveAction: CheckExpeditedSnapEligibility
     nextScreens:
       - name: householdMoneyOnHandAmount