From ffa1bd959ef5af32cf629993a0e94fd6a351217a Mon Sep 17 00:00:00 2001
From: Chibuisi Enyia <cenyia@codeforamerica.org>
Date: Mon, 2 Dec 2024 09:23:49 -0600
Subject: [PATCH] [CCAP-477] Set submit screen to submit-complete-final. (#852)

---
 src/main/resources/flows-config.yaml          |  5 --
 src/main/resources/messages.properties        |  3 +-
 .../providerresponse/submit-complete.html     | 25 ------
 .../ProviderresponseFlowJourneyTest.java      | 86 +++++++++++--------
 4 files changed, 52 insertions(+), 67 deletions(-)
 delete mode 100644 src/main/resources/templates/providerresponse/submit-complete.html
diff --git a/src/main/resources/flows-config.yaml b/src/main/resources/flows-config.yaml
index e49bb6e09..1d7e3d9e9 100644
--- a/src/main/resources/flows-config.yaml
+++ b/src/main/resources/flows-config.yaml
@@ -558,8 +558,6 @@ flow:
     beforeDisplayAction: FindApplicationData
     nextScreens:
       - name: info
-        condition: EnableProviderRegistration
-      - name: submit-complete
         condition: ProviderAgreedToCare
       - name: confirm-deny-care
   confirm-deny-care:
@@ -567,9 +565,6 @@ flow:
     afterSaveAction: UploadProviderSubmissionToS3
     nextScreens:
       - name: submit-complete-final
-  submit-complete:
-    nextScreens:
-      - name: info
   info:
     nextScreens:
       - name: service-address
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 37f460eb5..e0fa7481c 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -1199,7 +1199,6 @@ provider-response-response.button.no=No, I don't agree to care
 #submit-complete
 provider-response-submit-complete.title=Response recorded
 provider-response-submit-complete.header=Your response has been recorded
-provider-response-submit-complete.notice-yes=Next, we will collect your provider information. This usually takes 2-3 minutes.
 provider-response-submit-complete.notice-no=We will notify the CCR&R of your response.
 provider-response-submit-complete.button-no=Return to home
 
@@ -1275,7 +1274,7 @@ registration-getting-started.accordion.first.list-2=Not a parent, stepparent, ad
 registration-getting-started.accordion.first.list-3=Not a person living in the home who is a parent of the child's sibling or has a child in common with the applicant
 registration-getting-started.accordion.first.list-4=Not a member of the parent's Temporary Assistance for Needy Families (TANF) unit
 registration-getting-started.accordion.first.paragraph-2=You will also have to do background checks and trainings. For more information, visit the IDHS website.
-registration-getting-started.accordion.second.label=Find your documents 
+registration-getting-started.accordion.second.label=Find your documents
 registration-getting-started.accordion.second.paragraph-1: At the end of this application you will have the option to upload documents from your phone or computer.
 registration-getting-started.accordion.second.paragraph-2: The most commonly requested documents verify your identity and provider status.
 registration-getting-started.accordion.second.paragraph-3: Here are some examples:
diff --git a/src/main/resources/templates/providerresponse/submit-complete.html b/src/main/resources/templates/providerresponse/submit-complete.html
deleted file mode 100644
index 4e22c1f48..000000000
--- a/src/main/resources/templates/providerresponse/submit-complete.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html th:lang="${#locale.language}">
-<head th:replace="~{fragments/head :: head(title=#{'provider-response-submit-complete.title'})}"></head>
-<body>
-<div class="page-wrapper">
-    <div th:replace="~{fragments/toolbar :: toolbar}"></div>
-    <div class="grid">
-        <div th:replace="~{fragments/goBack :: goBackLink}"></div>
-        <main id="content" role="main" class="form-card spacing-above-35">
-            <th:block
-                    th:replace="~{fragments/gcc-icons :: greenCheck}"></th:block>
-            <th:block
-                    th:replace="~{fragments/cardHeader :: cardHeader(header=#{'provider-response-submit-complete.header'})}"/>
-            <div class="notice spacing-below-60 notice--gray"
-                 th:text="#{'provider-response-submit-complete.notice-yes'}"></div>
-            <div class="form-card__footer">
-                <th:block th:replace="~{fragments/continueButton :: continue}"/>
-            </div>
-        </main>
-    </div>
-</div>
-<th:block th:replace="~{fragments/footer :: footer}"/>
-</body>
-</html>
-:
\ No newline at end of file
diff --git a/src/test/java/org/ilgcc/app/journeys/ProviderresponseFlowJourneyTest.java b/src/test/java/org/ilgcc/app/journeys/ProviderresponseFlowJourneyTest.java
index 303832638..9977393cd 100644
--- a/src/test/java/org/ilgcc/app/journeys/ProviderresponseFlowJourneyTest.java
+++ b/src/test/java/org/ilgcc/app/journeys/ProviderresponseFlowJourneyTest.java
@@ -21,18 +21,18 @@ public class ProviderresponseFlowJourneyTest extends AbstractBasePageTest {
     private static String CONF_CODE = "A2123B";
 
     @Test
-    void ProviderresponseJourneyTest_validLink() {
+    void ProviderresponseJourneyTest_validLink_No_Agreement_To_Care(){
         testPage.navigateToFlowScreen("gcc/activities-parent-intro");
 
         saveSubmission(getSessionSubmissionTestBuilder().withDayCareProvider().withParentDetails()
-                .with("parentPreferredName", "FirstName").withChild("First", "Child", "Yes").withChild("Second", "Child", "No")
-                .withChild("NoAssistance", "Child", "No").withConstantChildcareSchedule(0)
-                .withSubmittedAtDate(OffsetDateTime.now()).withShortCode(CONF_CODE).build());
+            .with("parentPreferredName", "FirstName").withChild("First", "Child", "Yes").withChild("Second", "Child", "No")
+            .withChild("NoAssistance", "Child", "No").withConstantChildcareSchedule(0)
+            .withSubmittedAtDate(OffsetDateTime.now()).withShortCode(CONF_CODE).build());
 
         testPage.clickContinue();
 
         driver.navigate()
-                .to("http://localhost:%s/providerresponse/submit/%s?utm_medium=test".formatted(localServerPort, CONF_CODE));
+            .to("http://localhost:%s/providerresponse/submit/%s?utm_medium=test".formatted(localServerPort, CONF_CODE));
 
         // submit-start when application is still active
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-submit-start.title"));
@@ -61,25 +61,59 @@ void ProviderresponseJourneyTest_validLink() {
         assertThat(testPage.elementDoesNotExistById("child-name-1")).isTrue();
         assertThat(testPage.elementDoesNotExistById("child-name-2")).isTrue();
 
-        testPage.clickElementById("providerResponseAgreeToCare-true-label");
+        testPage.clickElementById("providerResponseAgreeToCare-false-label");
         testPage.clickContinue();
 
-        // submit-complete
-        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-submit-complete.title"));
-        assertThat(testPage.findElementsByClass("notice").get(0).getText()).isEqualTo(
-                getEnMessage("provider-response-submit-complete.notice-yes"));
+        //confirm-deny-care
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-confirm-deny-care.title"));
+        testPage.clickButton(getEnMessage("provider-response-confirm-deny-care.confirm-button"));
 
-        testPage.goBack();
+        //submit-complete-final
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-submit-complete-final.title"));
+        assertThat(testPage.elementDoesNotExistById("continue-link")).isFalse();
+    }
+    @Test
+    void ProviderresponseJourneyTest_validLink() {
+        testPage.navigateToFlowScreen("gcc/activities-parent-intro");
+
+        saveSubmission(getSessionSubmissionTestBuilder().withDayCareProvider().withParentDetails()
+                .with("parentPreferredName", "FirstName").withChild("First", "Child", "Yes").withChild("Second", "Child", "No")
+                .withChild("NoAssistance", "Child", "No").withConstantChildcareSchedule(0)
+                .withSubmittedAtDate(OffsetDateTime.now()).withShortCode(CONF_CODE).build());
+
+        testPage.clickContinue();
+
+        driver.navigate()
+                .to("http://localhost:%s/providerresponse/submit/%s?utm_medium=test".formatted(localServerPort, CONF_CODE));
+
+        // submit-start when application is still active
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-submit-start.title"));
+        testPage.clickButton(getEnMessage("provider-response-submit-start.active.button"));
+
+        // ccap-registration
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-ccap-registration.title"));
+        testPage.enter("providerResponseProviderNumber", "123456789012345");
+        testPage.clickContinue();
+
+        // confirmation-code
+        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-confirmation-code.title"));
+        testPage.findElementTextById("providerResponseFamilyShortCode").equals(CONF_CODE);
+        testPage.clickContinue();
 
         // response
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-response.title"));
-        testPage.clickElementById("providerResponseAgreeToCare-true-label");
-        testPage.clickContinue();
+        assertThat(testPage.findElementTextById("confirmation-code")).isEqualTo(CONF_CODE);
+        assertThat(testPage.findElementTextById("parent-name")).isEqualTo("FirstName parent last");
+
+        assertThat(testPage.findElementTextById("child-name-0")).isEqualTo("First Child");
+        assertThat(testPage.findElementTextById("child-age-0")).isEqualTo("Age 22");
+        assertThat(testPage.findElementTextById("child-schedule-0")).isNotNull();
+        assertThat(testPage.findElementTextById("child-start-0")).isEqualTo("01/10/2025");
+
+        assertThat(testPage.elementDoesNotExistById("child-name-1")).isTrue();
+        assertThat(testPage.elementDoesNotExistById("child-name-2")).isTrue();
 
-        // submit-complete
-        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-submit-complete.title"));
-        assertThat(testPage.findElementsByClass("notice").get(0).getText()).isEqualTo(
-                getEnMessage("provider-response-submit-complete.notice-yes"));
+        testPage.clickElementById("providerResponseAgreeToCare-true-label");
         testPage.clickContinue();
 
         //basic-info
@@ -170,24 +204,6 @@ void ProviderresponseJourneyTest_noLink() {
         testPage.clickElementById("providerResponseAgreeToCare-true-label");
         testPage.clickContinue();
 
-        // submit-complete
-        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-submit-complete.title"));
-        assertThat(testPage.findElementsByClass("notice").get(0).getText()).isEqualTo(
-                getEnMessage("provider-response-submit-complete.notice-yes"));
-
-        testPage.goBack();
-
-        // response
-        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-response.title"));
-        testPage.clickElementById("providerResponseAgreeToCare-true-label");
-        testPage.clickContinue();
-
-        // submit-complete
-        assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-submit-complete.title"));
-        assertThat(testPage.findElementsByClass("notice").get(0).getText()).isEqualTo(
-                getEnMessage("provider-response-submit-complete.notice-yes"));
-        testPage.clickContinue();
-
         //basic-info
         assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-info.title"));
         testPage.enter("providerResponseBusinessName", "Business Name");
