Update IncomeDetailsPreparer

codeforamerica · Jun 18, 2024 · c08ff22 · c08ff22
1 parent 1596cc9
commit c08ff22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 76 deletions.
diff --git a/src/main/java/org/mdbenefits/app/preparers/IncomeDetailsPreparer.java b/src/main/java/org/mdbenefits/app/preparers/IncomeDetailsPreparer.java
@@ -35,7 +35,6 @@ public Map<String, SubmissionField> prepareSubmissionFields(Submission submissio
 
         results.putAll(prepareIncome(submission));
         results.putAll(prepareAdditionIncome(submission));
-        results.putAll(prepareMoneyOnHandResources(submission));
         results.putAll(prepareHasMoreThanHundredOnHand(submission));
         return results;
     }
@@ -145,38 +144,13 @@ private void writeAdditionalIncomeFields(Submission submission, AdditionalIncome
                         null
                 ));
     }
-
-    private Map<String, SubmissionField> prepareMoneyOnHandResources(Submission submission) {
-        Map<String, SubmissionField> fields = new HashMap<>();
-        var moneyOnHandSelected = (List<String>) submission.getInputData().getOrDefault("moneyOnHandTypes[]", emptyList());
-
-        if (moneyOnHandSelected.isEmpty()) {
-            return fields;
-        }
-        if (isNoneOfAboveSelection(moneyOnHandSelected)) {
-            fields.put("householdHasResourcesOrAssets", new SingleField("householdHasResourcesOrAssets", "false", null
-            ));
-            return fields;
-        } else {
-            int i = 1;
-            for (var type : MoneyOnHandType.values()) {
-                if (moneyOnHandSelected.contains(type.name())) {
-                    fields.put("householdHasResourcesOrAssets", new SingleField("householdHasResourcesOrAssets", "true", null
-                    ));
-                    fields.put("resourcesOrAssetsType" + i,
-                            new SingleField("resourcesOrAssetsType" + i, messagesSource.getMessage(
-                                    type.getLabelSrc(), null, Locale.ENGLISH), null));
-                    i++;
-                }
-            }
-        }
-        return fields;
-    }
 
     private Map<String, SubmissionField> prepareHasMoreThanHundredOnHand(Submission submission) {
         Map<String, SubmissionField> fields = new HashMap<>();
-        if (submission.getInputData().containsKey("expeditedMoneyOnHandAmount")) {
-            fields.put("householdHasResourcesOrAssets", new SingleField("householdHasResourcesOrAssets", "true", null));
+        Map<String, Object> inputData = submission.getInputData();
+        if (inputData.containsKey("expeditedMoneyOnHandAmount")) {
+            double expeditedMoneyOnHandAmount = Double.parseDouble(inputData.get("expeditedMoneyOnHandAmount").toString());
+            fields.put("householdHasResourcesOrAssets", new SingleField("householdHasResourcesOrAssets", expeditedMoneyOnHandAmount > 0 ? "true" : "false", null));
         }
         return fields;
     }

diff --git a/src/main/resources/templates/mdBenefitsFlow/householdMoneyOnHandType.html b/src/main/resources/templates/mdBenefitsFlow/householdMoneyOnHandType.html