diff --git a/src/main/java/org/ilgcc/app/file_transfer/DocumentTransferRequestService.java b/src/main/java/org/ilgcc/app/file_transfer/DocumentTransferRequestService.java index ab217fb2e..9a6811bdd 100644 --- a/src/main/java/org/ilgcc/app/file_transfer/DocumentTransferRequestService.java +++ b/src/main/java/org/ilgcc/app/file_transfer/DocumentTransferRequestService.java @@ -57,7 +57,7 @@ public void sendDocumentTransferServiceRequest(String presignedUrl, Submission s throw new RuntimeException(errorMessage, e); } - try (BufferedReader br = new BufferedReader( + try (BufferedReader br = new BufferedReader ( new InputStreamReader(httpUrlConnection.getInputStream(), StandardCharsets.UTF_8))) { StringBuilder response = new StringBuilder(); String responseLine = null; diff --git a/src/main/java/org/ilgcc/app/submission/actions/GenerateDummyClientSubmissionForDev.java b/src/main/java/org/ilgcc/app/submission/actions/GenerateDummyClientSubmissionForDev.java index 84e726213..4814aa282 100644 --- a/src/main/java/org/ilgcc/app/submission/actions/GenerateDummyClientSubmissionForDev.java +++ b/src/main/java/org/ilgcc/app/submission/actions/GenerateDummyClientSubmissionForDev.java @@ -28,7 +28,7 @@ public class GenerateDummyClientSubmissionForDev implements Action { @Autowired Environment env; - + public GenerateDummyClientSubmissionForDev(SubmissionRepositoryService submissionRepositoryService, SubmissionRepository submissionRepository, HttpSession httpSession) { this.submissionRepositoryService = submissionRepositoryService; @@ -44,7 +44,7 @@ public void run(FormSubmission formSubmission, Submission submission) { Optional existingDummyClientSubmision = submissionRepositoryService.findByShortCode("DEV-123ABC"); existingDummyClientSubmision.ifPresent(submissionRepository::delete); - Map inputData = createFamilySubmission(); + Map inputData = createFamilySubmission(submission); Submission dummyClientSubmission = new Submission(); dummyClientSubmission.setSubmittedAt(OffsetDateTime.now().minusDays(1)); @@ -58,7 +58,7 @@ public void run(FormSubmission formSubmission, Submission submission) { } } - private @NotNull Map createFamilySubmission() { + private @NotNull Map createFamilySubmission(Submission providerSubmission) { Map inputData = new HashMap<>(); inputData.put("familyIntendedProviderName", "Dev Provider"); inputData.put("parentFirstName", "Devy"); @@ -72,6 +72,7 @@ public void run(FormSubmission formSubmission, Submission submission) { inputData.put("parentHomeState", "CA - California"); inputData.put("parentHomeZipCode", "94103"); inputData.put("parentHasPartner", "false"); + inputData.put("providerResponseSubmissionId", providerSubmission.getId().toString()); List> children = new ArrayList<>(); Map child1 = new HashMap<>(); diff --git a/src/main/java/org/ilgcc/app/submission/actions/UploadProviderSubmissionToS3.java b/src/main/java/org/ilgcc/app/submission/actions/UploadProviderSubmissionToS3.java index bcce85b7a..e146a282b 100644 --- a/src/main/java/org/ilgcc/app/submission/actions/UploadProviderSubmissionToS3.java +++ b/src/main/java/org/ilgcc/app/submission/actions/UploadProviderSubmissionToS3.java @@ -56,9 +56,9 @@ public UploadProviderSubmissionToS3(PdfService pdfService, CloudFileRepository c public void run(Submission providerSubmission) { if (waitForProviderResponseFlag) { var clientId = ProviderSubmissionUtilities.getClientId(providerSubmission); - if(clientId !=null && clientId.isPresent()){ + if (clientId !=null && clientId.isPresent()) { Optional familySubmissionOptional = submissionRepositoryService.findById(clientId.get()); - if(familySubmissionOptional.isPresent()){ + if (familySubmissionOptional.isPresent()) { log.info("Provider submitted response for client ID {}, enqueuing transfer of documents.", clientId.get()); Submission familySubmission = familySubmissionOptional.get(); familySubmission.getInputData().put("providerResponseSubmissionId", providerSubmission.getId().toString()); @@ -67,10 +67,10 @@ public void run(Submission providerSubmission) { familySubmission, FileNameUtility.getFileNameForPdf(familySubmission, "Provider-Responded")); enqueueDocumentTransfer.enqueueUploadedDocumentBySubmission(userFileRepositoryService, uploadedDocumentTransmissionJob, s3PresignService, familySubmission); - }else{ + } else { log.error(String.format("We can not find a match for your family submission: %s", clientId.get())); } - }else{ + } else { log.error(String.format("Family Submission Id is Blank for the provider submission: %s.", providerSubmission.getId().toString())); } diff --git a/src/main/resources/flows-config.yaml b/src/main/resources/flows-config.yaml index 3c53ad0bc..03ef7442e 100644 --- a/src/main/resources/flows-config.yaml +++ b/src/main/resources/flows-config.yaml @@ -577,10 +577,7 @@ flow: info: nextScreens: - name: service-address - condition: EnableProviderRegistration - - name: confirm-address service-address: - condition: EnableProviderRegistration nextScreens: - name: confirm-address confirm-address: @@ -594,7 +591,6 @@ flow: nextScreens: - name: submit-complete-final submit-complete-final: - beforeDisplayAction: RemoveDummySubmissionForDev nextScreens: - name: registration-getting-started condition: EnableProviderRegistration diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 82c855186..2952cfe63 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -1196,17 +1196,21 @@ provider-response-submit-complete.notice-no=We will notify the CCR&R of your res provider-response-submit-complete.button-no=Return to home #info -provider-response-info.title=Provider Info -provider-response-info.header=Your provider information +provider-response-info.title=Tell us about yourself +provider-response-info.header=Tell us about yourself provider-response-info.business-name=Business name provider-response-info.business-name-help=If you have one, enter the business name you are registered under. provider-response-info.first-name=First name provider-response-info.first-name-help=Enter your first name. provider-response-info.last-name=Last name provider-response-info.last-name-help=Enter your last name. + +#provider-address +provider-response-provider-service-address.title=Child care location +provider-response-provider-service-address.header=Where are you providing the child care? provider-response-info.street-address=Street address provider-response-info.street-address-help=Provide the location where care is taking place. If you are a relative or friend providing care, use your home address. -provider-response-info.street-address-2=Street address line 2 +provider-response-info.street-address-2=Apartment # provider-response-info.street-address-2-help=This is optional. provider-response-info.city=City provider-response-info.state=State diff --git a/src/main/resources/templates/providerresponse/info.html b/src/main/resources/templates/providerresponse/info.html index 94e532b06..dfc75884c 100644 --- a/src/main/resources/templates/providerresponse/info.html +++ b/src/main/resources/templates/providerresponse/info.html @@ -15,10 +15,6 @@ th:replace="~{fragments/form :: form(action=${formAction}, content=~{::info})}">
- - +
- +
-
-
-
-
-
- - - -
- -
-
- -
- - -
-
-
+
+
+
+
+
+ + + + +
+ +
+
+ +
+ + +
+
+
- \ 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 26a8a3748..9ec60bfcb 100644 --- a/src/test/java/org/ilgcc/app/journeys/ProviderresponseFlowJourneyTest.java +++ b/src/test/java/org/ilgcc/app/journeys/ProviderresponseFlowJourneyTest.java @@ -87,6 +87,10 @@ void ProviderresponseJourneyTest_validLink() { testPage.enter("providerResponseBusinessName", "Business Name"); testPage.enter("providerResponseFirstName", "First Name"); testPage.enter("providerResponseLastName", "Last Name"); + testPage.clickButton("Continue"); + + // service-address + assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-provider-service-address.title")); testPage.enter("providerResponseServiceStreetAddress1", "123 Main St"); testPage.enter("providerResponseServiceCity", "City"); testPage.selectFromDropdown("providerResponseServiceState", "IL - Illinois"); @@ -189,6 +193,10 @@ void ProviderresponseJourneyTest_noLink() { testPage.enter("providerResponseBusinessName", "Business Name"); testPage.enter("providerResponseFirstName", "First Name"); testPage.enter("providerResponseLastName", "Last Name"); + testPage.clickButton("Continue"); + + // service-address + assertThat(testPage.getTitle()).isEqualTo(getEnMessage("provider-response-provider-service-address.title")); testPage.enter("providerResponseServiceStreetAddress1", "123 Main St"); testPage.enter("providerResponseServiceCity", "City"); testPage.selectFromDropdown("providerResponseServiceState", "IL - Illinois");