updated medical flow

src/main/java/org/ladocuploader/app/csv/model/ECEApplicationCsvModel.java

@@ -109,11 +109,12 @@
         "Gross Income October: {{96104436-97f9-4b6b-9596-48bec6d73d49}}",
         "Gross Income November: {{51bc9013-0aba-4ccb-9b65-691693b65a3e}}",
         "Gross Income December: {{55abbef5-1595-4916-8e8e-468a616fee04}}",
-        "My rent/house payments, utilities, food, and transportation expenses are being paid for by: {{801d7ffb-c6ef-4f4a-947a-754f3f5e1051}} {{3d0e1ee7-629e-433c-b861-1bc337e770bc}}",
+        "My rent/house payments, utilities, food, and transportation expenses are being paid for by: {{3d0e1ee7-629e-433c-b861-1bc337e770bc}}",
         "Upload documentation of your Unemployment Benefits: a Monetary Determination letter from the Workforce Commission {{cff9e036-1b9c-4c21-8e8e-2b7bbdf04efb}}",
         "Enter the number of months you have been without income: {{6485dab3-b8e0-4c44-9460-7811e9feec18}}",
         "I am (check all that apply) {{422428f3-d96b-4df7-8c24-8e09454ddd8a}}",
         "If 'Other' please describe your employment status {{f5cd0c9f-84b9-447d-a039-7f05d6d38072}}",
+        "My rent/house payments, utilities, food, and transportation expenses are being paid for by: {{801d7ffb-c6ef-4f4a-947a-754f3f5e1051}}",
         "Is Adult 1 (yourself) in school, in a training program, or seeking work? {{c906066e-72bd-441a-9fef-6674d9b5fe1d}}",
         "Upload proof of HIRE account registration with date of registration OR proof of unemployment pay statement {{db824fb9-9ab1-4446-a0f3-4f55248a21cd}}",
         "Provide a school transcript, detailed school schedule, or letter from the registrar {{74af906d-47d9-4c15-b97b-7211f0162cdc}}",
@@ -566,7 +567,7 @@ private void setMaritalStatus(final String maritalStatus) {
     String adultOneGrossIncomeDecember;
 
     // *** no questions for this one *** //
-    @CsvBindByName(column="My rent/house payments, utilities, food, and transportation expenses are being paid for by: {{801d7ffb-c6ef-4f4a-947a-754f3f5e1051}} {{3d0e1ee7-629e-433c-b861-1bc337e770bc}}")
+    @CsvBindByName(column="My rent/house payments, utilities, food, and transportation expenses are being paid for by: {{3d0e1ee7-629e-433c-b861-1bc337e770bc}}")
     String adultOneHouseholdThingsPaidForByIrregularIncome; // TODO assumption it means irregular, not sure
 
     // *** no questions for this one *** //
@@ -584,6 +585,9 @@ private void setMaritalStatus(final String maritalStatus) {
     @CsvBindByName(column="If 'Other' please describe your employment status {{f5cd0c9f-84b9-447d-a039-7f05d6d38072}}")
     String adultOneIAmOtherEmploymentStatusDescription;
 
+    @CsvBindByName(column="My rent/house payments, utilities, food, and transportation expenses are being paid for by: {{801d7ffb-c6ef-4f4a-947a-754f3f5e1051}}")
+    String adultOneHousingPayments;
+
     // mapped
     @CsvBindByName(column="Is Adult 1 (yourself) in school, in a training program, or seeking work? {{c906066e-72bd-441a-9fef-6674d9b5fe1d}}")
     String isAdultOneSchoolTrainingSeekingWork;

src/main/resources/flows-config.yaml

@@ -377,10 +377,15 @@ flow:
     nextScreens:
       - name: liheap
         condition: ReceivesEnergyAssistance
-      - name: householdMedicalExpenses
+      - name: expensesElderlyCare
   liheap:
+    nextScreens:
+      - name: expensesElderlyCare
+  expensesElderlyCare:
     nextScreens:
       - name: householdMedicalExpenses
+        condition: HasElderlyCareExpenses
+      - name: expensesDependentCare
   householdMedicalExpenses:
     nextScreens:
       - name: householdMedicalExpensesAmount
@@ -401,14 +406,6 @@ flow:
     nextScreens:
       - name: expensesChildSupportAmount
         condition: HasChildSupportExpenses
-      - name: expensesElderlyCare
-  expensesChildSupportAmount:
-    nextScreens:
-      - name: expensesElderlyCare
-  expensesElderlyCare:
-    nextScreens:
-      - name: expensesElderlyCareAmount
-        condition: HasElderlyCareExpenses
       - name: nolaEceLinks
         condition: EligibleForEceLinks
       - name: wicLinks
@@ -418,7 +415,7 @@ flow:
       - name: wicApply
         condition: EligibleForWicApply
       - name: finalSignPost
-  expensesElderlyCareAmount:
+  expensesChildSupportAmount:
     nextScreens:
       - name: nolaEceLinks
         condition: EligibleForEceLinks

src/main/resources/pdf-map.yaml

@@ -33,6 +33,7 @@ inputFields:
   expeditedSnapPhoneExpensesBool: expeditedSnapPhoneExpensesBool
   copyOfApplicationInd: copyOfApplicationInd
   paperCopyInd: paperCopyInd
+  hasElderlyCareExpenses: hasElderlyCareExpenses
   electronicCopyInd: electronicCopyInd
   signature: signature
   applicantBirthdayFormatted: applicantBirthday

src/test/java/org/ladocuploader/app/journeys/LaDigitalAssisterFlowJourneyTest.java

@@ -693,7 +693,7 @@ void fullDigitalAssisterFlow() {
     assertThat(testPage.getTitle()).isEqualTo(message("energy-assistance.title"));
     testPage.clickButton("No");
 
-    assertThat(testPage.getTitle()).isEqualTo(message("medical-expenses-amount.title"));
+    assertThat(testPage.getTitle()).isEqualTo(message("elderlycare.title"));
     testPage.goBack();
 
     assertThat(testPage.getTitle()).isEqualTo(message("energy-assistance.title"));
@@ -702,7 +702,8 @@ void fullDigitalAssisterFlow() {
     assertThat(testPage.getTitle()).isEqualTo(message("liheap.title"));
     testPage.clickButton("Yes");
 
-    assertThat(testPage.getTitle()).isEqualTo(message("medical-expenses.title"));
+    assertThat(testPage.getTitle()).isEqualTo(message("elderlycare.title"));
+    testPage.clickButton("Yes");
 
     testPage.clickElementById("householdMedicalExpenses-dentalBills-label");
     testPage.clickContinue();
@@ -725,21 +726,6 @@ void fullDigitalAssisterFlow() {
     assertThat(testPage.getTitle()).isEqualTo(message("childsupportexpenses.title"));
     testPage.clickButton("No");
 
-    assertThat(testPage.getTitle()).isEqualTo(message("elderlycare.title"));
-    testPage.goBack();
-
-    testPage.clickButton("Yes");
-    assertThat(testPage.getTitle()).isEqualTo(message("childsupportexpenses-amount.title"));
-    testPage.enter("expensesChildSupport", "150");
-    testPage.clickContinue();
-
-    assertThat(testPage.getTitle()).isEqualTo(message("elderlycare.title"));
-    testPage.clickButton("Yes");
-
-    assertThat(testPage.getTitle()).isEqualTo(message("elderlycare-amount.title"));
-    testPage.enter("expensesElderlyCare", "123");
-    testPage.clickContinue();
-
     var title = testPage.getTitle();
     if ("ECE link".equals(title)) {
       testPage.clickButton("Yes");
@@ -756,8 +742,20 @@ void fullDigitalAssisterFlow() {
       testPage.clickContinue();
     }
 
-    // Final SignPost
     assertThat(testPage.getTitle()).isEqualTo(message("final-signpost.title"));
+//    testPage.goBack();
+
+//    assertThat(testPage.getTitle()).isEqualTo(message("childsupportexpenses.title"));
+//    testPage.clickButton("Yes");
+//
+//
+////    testPage.clickButton("Yes");
+//    assertThat(testPage.getTitle()).isEqualTo(message("childsupportexpenses-amount.title"));
+//    testPage.enter("expensesChildSupport", "150");
+//    testPage.clickContinue();
+//
+//    // Final SignPost
+//    assertThat(testPage.getTitle()).isEqualTo(message("final-signpost.title"));
     testPage.clickContinue();
 
     assertThat(testPage.getTitle()).isEqualTo(message("ebtcard-title"));