[CCAP-567] - Refactor address validation flow for parentHome, parentMailing, providerResponseService, providerMailing addresses

src/main/java/org/ilgcc/app/inputs/Gcc.java

@@ -73,7 +73,7 @@ public class Gcc extends FlowInputs {
     @NotBlank(message = "{errors.provide-zip}")
     private String parentHomeZipCode;
 
-    private String organizationId;
+    private String useSuggestedParentHomeAddress;
 
     // parent-mailing-address
     private Boolean parentMailingAddressSameAsHomeAddress;
@@ -86,7 +86,7 @@ public class Gcc extends FlowInputs {
     private String parentMailingState;
     @NotBlank(message = "{errors.provide-zip}")
     private String parentMailingZipCode;
-    private String useSuggestedParentAddress;
+    private String useSuggestedParentMailingAddress;
     private String parentConfirmSuggestedAddress;
     // parent-comm-preference
     @NotBlank(message = "{errors.invalid-communication-preference}")
@@ -98,6 +98,8 @@ public class Gcc extends FlowInputs {
     @Email(regexp = RegexUtils.EMAIL_REGEX, message = "{errors.invalid-email}")
     private String parentContactEmail;
 
+    private String organizationId;
+
     // parent-has-a-partner
     private String parentHasPartner;
     private String parentHasQualifyingPartner;

src/main/java/org/ilgcc/app/pdf/ApplicationPreparer.java

@@ -1,5 +1,6 @@
 package org.ilgcc.app.pdf;
 
+import static java.util.Collections.emptyList;
 import static org.ilgcc.app.utils.SubmissionUtilities.formatToStringFromLocalDate;
 
 import formflow.library.data.Submission;
@@ -52,6 +53,22 @@ public Map<String, SubmissionField> prepareSubmissionFields(Submission submissio
         results.put("partnerFullName",
                 new SingleField("partnerFullName", String.format("%s, %s", partnerLastName, partnerFirstName), null));
 
+        List<String> mailingAddressFields = List.of(
+                "parentMailingStreetAddress1",
+                "parentMailingStreetAddress2",
+                "parentMailingCity",
+                "parentMailingState",
+                "parentMailingZipCode");
+
+        List sameAddress = (List) inputData.getOrDefault("parentMailingAddressSameAsHomeAddress[]", emptyList());
+
+        if (sameAddress.contains("yes")) {
+            for (String fieldName : mailingAddressFields) {
+                results.put(fieldName,
+                        new SingleField(fieldName, "", null));
+            }
+        }
+
         String rentalIncome = inputData.getOrDefault("unearnedIncomeRental", "").toString();
         String dividendIncome = inputData.getOrDefault("unearnedIncomeDividends", "").toString();
         String unemploymentIncome = inputData.getOrDefault("unearnedIncomeUnemployment", "").toString();

src/main/java/org/ilgcc/app/pdf/ProviderApplicationPreparer.java

@@ -1,5 +1,6 @@
 package org.ilgcc.app.pdf;
 
+import static java.util.Collections.emptyList;
 import static org.ilgcc.app.utils.SubmissionUtilities.formatToStringFromLocalDate;
 import static org.ilgcc.app.utils.SubmissionUtilities.hasNotChosenProvider;
 import static org.ilgcc.app.utils.SubmissionUtilities.hasProviderResponse;
@@ -12,13 +13,13 @@
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import org.ilgcc.app.submission.actions.FormatSubmittedAtDate;
 import org.ilgcc.app.utils.ProviderSubmissionUtilities;
-import org.ilgcc.app.utils.SubmissionUtilities;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -47,7 +48,7 @@ private Map<String, SubmissionField> prepareProviderResponse() {
 
         Map<String, Object> providerInputData = providerSubmission.getInputData();
 
-        List<String> providerFields = List.of(
+        List<String> providerFields = new ArrayList<>(Arrays.asList(
                 "providerResponseProviderNumber",
                 "providerResponseFirstName",
                 "providerResponseLastName",
@@ -57,8 +58,26 @@ private Map<String, SubmissionField> prepareProviderResponse() {
                 "providerConviction",
                 "providerConvictionExplanation",
                 "providerIdentityCheckDateOfBirthDate",
-                "providerTaxIdEIN"
-        );
+                "providerTaxIdEIN",
+                "providerResponseServiceStreetAddress1",
+                "providerResponseServiceStreetAddress2",
+                "providerResponseServiceCity",
+                "providerResponseServiceState",
+                "providerResponseServiceZipCode"
+        ));
+
+        List<String> mailingAddressFields = List.of(
+                "providerMailingStreetAddress1",
+                "providerMailingStreetAddress2",
+                "providerMailingCity",
+                "providerMailingState",
+                "providerMailingZipCode");
+
+        List sameAddress = (List) providerInputData.getOrDefault("providerMailingAddressSameAsServiceAddress[]", emptyList());
+
+        if (sameAddress.isEmpty()) {
+            providerFields.addAll(mailingAddressFields);
+        };
 
         for (String fieldName : providerFields) {
             results.put(fieldName,
@@ -69,8 +88,6 @@ private Map<String, SubmissionField> prepareProviderResponse() {
                 new HashMap<String, String>());
         results.put("clientResponseConfirmationCode", new SingleField("clientResponseConfirmationCode",
                 (String) client.getOrDefault("clientResponseConfirmationCode", ""), null));
-        results.putAll(prepareProviderAddressData(providerInputData));
-        results.putAll(prepareProviderMailingAddressData(providerInputData));
 
         results.put("providerLicenseNumber",
                 new SingleField("providerLicenseNumber", providerLicense(providerInputData), null));
@@ -122,45 +139,9 @@ private Map<String, SubmissionField> prepareNoProviderData(String shortCode) {
         return results;
     }
 
-    private Map<String, SubmissionField> prepareProviderAddressData(Map<String, Object> inputData) {
-        var results = new HashMap<String, SubmissionField>();
-
-        Map<String, String> providerAddressMapped = SubmissionUtilities.getAddress(inputData, "providerResponseService");
-
-        results.put("providerResponseServiceStreetAddress1", new SingleField("providerResponseServiceStreetAddress1",
-                providerAddressMapped.get("address1"), null));
-        results.put("providerResponseServiceStreetAddress2", new SingleField("providerResponseServiceStreetAddress2",
-                providerAddressMapped.get("address2"), null));
-        results.put("providerResponseServiceCity",
-                new SingleField("providerResponseServiceCity", providerAddressMapped.get("city"), null));
-        results.put("providerResponseServiceState",
-                new SingleField("providerResponseServiceState", providerAddressMapped.get("state"), null));
-        results.put("providerResponseServiceZipCode",
-                new SingleField("providerResponseServiceZipCode", providerAddressMapped.get("zipCode"), null));
-
-        return results;
-    }
-
-    private Map<String, SubmissionField> prepareProviderMailingAddressData(Map<String, Object> inputData) {
-        var results = new HashMap<String, SubmissionField>();
-        Map<String, String> mailingAddressMapped = SubmissionUtilities.getAddress(inputData, "providerMailing");
-
-        results.put("providerMailingStreetAddress1", new SingleField("providerMailingStreetAddress1",
-                mailingAddressMapped.get("address1"), null));
-        results.put("providerMailingStreetAddress2", new SingleField("providerMailingStreetAddress2",
-                mailingAddressMapped.get("address2"), null));
-        results.put("providerMailingCity",
-                new SingleField("providerMailingCity", mailingAddressMapped.get("city"), null));
-        results.put("providerMailingState",
-                new SingleField("providerMailingState", mailingAddressMapped.get("state"), null));
-        results.put("providerMailingZipCode",
-                new SingleField("providerMailingZipCode", mailingAddressMapped.get("zipCode"), null));
-
-        return results;
-    }
 
     private String providerSignature(Map<String, Object> providerInputData) {
-        String providerSignature =  (String) providerInputData.getOrDefault("providerSignedName", "");
+        String providerSignature = (String) providerInputData.getOrDefault("providerSignedName", "");
         if (!providerSignature.isEmpty()) {
             return providerSignature;
         }

src/main/java/org/ilgcc/app/submission/actions/SaveValidatedAddress.java

@@ -0,0 +1,71 @@
+package org.ilgcc.app.submission.actions;
+
+import static formflow.library.inputs.FieldNameMarkers.UNVALIDATED_FIELD_MARKER_VALIDATED;
+import static org.ilgcc.app.utils.AddressUtilities.hasMatchingCity;
+import static org.ilgcc.app.utils.AddressUtilities.hasMatchingState;
+import static org.ilgcc.app.utils.AddressUtilities.hasMatchingStreetAddress;
+import static org.ilgcc.app.utils.AddressUtilities.hasMatchingZipCode;
+import static org.ilgcc.app.utils.AddressUtilities.suggestedAddressKey;
+import static org.ilgcc.app.utils.AddressUtilities.useSuggestedAddressKey;
+
+import formflow.library.config.submission.Action;
+import formflow.library.data.FormSubmission;
+import formflow.library.data.Submission;
+import formflow.library.data.SubmissionRepositoryService;
+import java.util.Map;
+
+abstract class SaveValidatedAddress implements Action {
+
+    private final SubmissionRepositoryService submissionRepositoryService;
+    private final String addressGroupInputPrefix;
+
+    public SaveValidatedAddress(SubmissionRepositoryService submissionRepositoryService, String addressGroupInputPrefix) {
+        this.submissionRepositoryService = submissionRepositoryService;
+        this.addressGroupInputPrefix = addressGroupInputPrefix;
+    }
+
+    @Override
+    public void run(FormSubmission formSubmission, Submission submission) {
+        boolean useValidatedAddress = formSubmission.getFormData()
+                .getOrDefault(useSuggestedAddressKey(suggestedAddressKey, addressGroupInputPrefix), "false").equals("true");
+
+        if (useValidatedAddress) {
+            Map<String, Object> inputData = submission.getInputData();
+            if (!hasMatchingStreetAddress(inputData, addressGroupInputPrefix)) {
+                String addressKey = addressGroupInputPrefix + "StreetAddress1";
+                submission = updateValue(submission, addressKey);
+                submission.getInputData().put(addressGroupInputPrefix + "StreetAddress2", "");
+            }
+
+            if (!hasMatchingCity(inputData, addressGroupInputPrefix)) {
+                String addressKey = addressGroupInputPrefix + "City";
+                submission = updateValue(submission, addressKey);
+            }
+
+            if (!hasMatchingZipCode(inputData, addressGroupInputPrefix)) {
+                String addressKey = addressGroupInputPrefix + "ZipCode";
+                String addressValidatedKey = addressKey + UNVALIDATED_FIELD_MARKER_VALIDATED;
+                String zipCodeValue = (String) submission.getInputData().getOrDefault(addressValidatedKey, "");
+                if (!zipCodeValue.isBlank() && zipCodeValue.length() >= 5) {
+                    submission.getInputData().put(addressKey, zipCodeValue.substring(0, 5));
+                }
+            }
+
+            if (!hasMatchingState(inputData, addressGroupInputPrefix)) {
+                String addressKey = addressGroupInputPrefix + "State";
+                submission = updateValue(submission, addressKey);
+
+            }
+
+            submissionRepositoryService.save(submission);
+        }
+    }
+
+    private Submission updateValue(Submission submission, String key) {
+        String addressValidatedKey = key + UNVALIDATED_FIELD_MARKER_VALIDATED;
+        submission.getInputData().put(key, submission.getInputData().get(addressValidatedKey));
+        return submission;
+    }
+}
+
+