Do not permit blank CHILD_SUPPORT_AGENCY_CALCULATION

hmcts · Jul 1, 2024 · cc49882 · cc49882
1 parent 8789a03
commit cc49882
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/...gov/hmcts/reform/finrem/caseorchestration/service/bulkscan/validation/FormAValidator.java b/...gov/hmcts/reform/finrem/caseorchestration/service/bulkscan/validation/FormAValidator.java
@@ -8,6 +8,7 @@
 import uk.gov.hmcts.reform.bsp.common.model.shared.in.InputScannedDoc;
 import uk.gov.hmcts.reform.bsp.common.model.validation.out.OcrValidationResult;
 import uk.gov.hmcts.reform.bsp.common.service.BulkScanFormValidator;
+import uk.gov.hmcts.reform.finrem.caseorchestration.model.ccd.Gender;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -19,7 +20,6 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
-import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static uk.gov.hmcts.reform.bsp.common.model.validation.BulkScanValidationPatterns.CCD_EMAIL_REGEX;
 import static uk.gov.hmcts.reform.bsp.common.model.validation.BulkScanValidationPatterns.CCD_PHONE_NUMBER_REGEX;
 import static uk.gov.hmcts.reform.bsp.common.service.validation.PostcodeValidator.validatePostcode;
@@ -149,15 +149,17 @@ public class FormAValidator extends BulkScanFormValidator {
         ));
         ALLOWED_VALUES_PER_FIELD.put(CHILD_SUPPORT_AGENCY_CALCULATION_MADE, asList(
             "Yes",
-            "No",
-            EMPTY
+            "No"
         ));
         ALLOWED_VALUES_PER_FIELD.put(AUTHORISATION_SIGNED_BY, asList(
             "Applicant",
             "Litigation Friend",
             "Applicant's solicitor"
         ));
-        final List<String> genderEnum = asList("Male", "Female", EMPTY);
+        final List<String> genderEnum = asList(
+            Gender.MALE.getValue(),
+            Gender.FEMALE.getValue()
+        );
         ALLOWED_VALUES_PER_FIELD.put(GENDER_CHILD_1, genderEnum);
         ALLOWED_VALUES_PER_FIELD.put(GENDER_CHILD_2, genderEnum);
     }

diff --git a/.../finrem/caseorchestration/service/bulkscan/transformation/FormAToCaseTransformerTest.java b/.../finrem/caseorchestration/service/bulkscan/transformation/FormAToCaseTransformerTest.java
@@ -166,7 +166,7 @@ public void shouldTransformFieldsAccordingly() {
     }
 
     @Test
-    public void shouldEmptyChildGenderIsNotGiven() {
+    public void shouldTransformEmptyChildGenderIsNotGiven() {
         ExceptionRecord incomingExceptionRecord = createExceptionRecord(asList(
             new OcrDataField(OcrFieldName.NAME_CHILD_1, "Bilbo Baggins"),
             new OcrDataField(OcrFieldName.GENDER_CHILD_1, ""),

diff --git a/...hmcts/reform/finrem/caseorchestration/service/bulkscan/validation/FormAValidatorTest.java b/...hmcts/reform/finrem/caseorchestration/service/bulkscan/validation/FormAValidatorTest.java
@@ -268,16 +268,16 @@ public void shouldFailFieldsHavingInvalidValues() {
                 "to meet expenses incurred by a child in being educated or training for work",
                 "when either the child or the person with care of the child "
                     + "or the absent parent of the child is not habitually resident in the United Kingdom"),
-            CHILD_SUPPORT_AGENCY_CALCULATION_MADE + " must be \"Yes\", \"No\" or left blank",
+            CHILD_SUPPORT_AGENCY_CALCULATION_MADE + " must be \"Yes\" or \"No\"",
             mustBeOneOf(AUTHORISATION_SIGNED_BY,
                 "Applicant",
                 "Litigation Friend",
                 "Applicant's solicitor"),
             AUTHORISATION_DATE + " must be a valid date",
             DATE_OF_BIRTH_CHILD_1 + " must be a valid date",
             DATE_OF_BIRTH_CHILD_2 + " must be a valid date",
-            GENDER_CHILD_1 + " must be \"Male\", \"Female\" or left blank",
-            GENDER_CHILD_2 + " must be \"Male\", \"Female\" or left blank",
+            GENDER_CHILD_1 + " must be \"Male\" or \"Female\"",
+            GENDER_CHILD_2 + " must be \"Male\" or \"Female\"",
             mandatoryFieldIsMissing.apply(APPLICANT_ADDRESS_LINE_1),
             mandatoryFieldIsMissing.apply(APPLICANT_ADDRESS_POSTCODE),
             mandatoryFieldIsMissing.apply(RESPONDENT_ADDRESS_LINE_1),