Fix V628_1.

cfpb · Jul 10, 2024 · 536b885 · 536b885
1 parent 03e17b6
commit 536b885
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/hmda/src/main/scala/hmda/validation/rules/lar/validity/common/V628_1.scala b/hmda/src/main/scala/hmda/validation/rules/lar/validity/common/V628_1.scala
@@ -19,14 +19,15 @@ object V628_1 extends EditCheck[LoanApplicationRegister] {
                               OtherHispanicOrLatino,
                               NotHispanicOrLatino,
                               InformationNotProvided,
-                              EthnicityNotApplicable,
-                              EthnicityNoCoApplicant)
+                              EthnicityNotApplicable)
 
   override def apply(lar: LoanApplicationRegister): ValidationResult =
     if(lar.applicant.ethnicity.otherHispanicOrLatino.isEmpty) {
-      lar.applicant.ethnicity.ethnicity1 is containedIn(validEthnicities) and (lar.applicant.ethnicity.ethnicity1.code not equalTo(0))
+      lar.applicant.ethnicity.ethnicity1 is containedIn(validEthnicities) and (lar.applicant.ethnicity.ethnicity1 not equalTo(EmptyEthnicityValue))
     }
     else {
-      lar.applicant.ethnicity.ethnicity1 is containedIn(validEthnicities) or (lar.applicant.ethnicity.ethnicity1.code is equalTo(0))
+      val x = lar.applicant.ethnicity.ethnicity1 is containedIn(validEthnicities)
+      val y = lar.applicant.ethnicity.ethnicity1 is equalTo(EmptyEthnicityValue)
+      lar.applicant.ethnicity.ethnicity1 is containedIn(validEthnicities) or (lar.applicant.ethnicity.ethnicity1 is equalTo(EmptyEthnicityValue))
     }
 }
diff --git a/hmda/src/test/scala/hmda/validation/rules/lar/validity/common/V628_1Spec.scala b/hmda/src/test/scala/hmda/validation/rules/lar/validity/common/V628_1Spec.scala
@@ -16,11 +16,11 @@ class V628_1Spec extends LarEditCheckSpec {
 
       val unapplicableLar = lar.copy(
         applicant = lar.applicant.copy(ethnicity =
-          lar.applicant.ethnicity.copy(otherHispanicOrLatino = "test"))) //if free form is not blank and ethnicity is provided correctly
-      unapplicableLar.mustPass
+          lar.applicant.ethnicity.copy(otherHispanicOrLatino = "test")))
 
       val ethnicityValid = applicableLar.applicant.ethnicity
         .copy(ethnicity1 = HispanicOrLatino)
+
       val ethnicityInvalid = applicableLar.applicant.ethnicity
         .copy(ethnicity1 = new InvalidEthnicityCode)
       lar