updates to Q621, Q551_1, and V695_3 based on PR comments

cfpb · Sep 17, 2024 · e0f5d6b · e0f5d6b
1 parent 4b65a5d
commit e0f5d6b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 22 deletions.
diff --git a/hmda/src/main/scala/hmda/validation/rules/lar/quality/_2025/Q621.scala b/hmda/src/main/scala/hmda/validation/rules/lar/quality/_2025/Q621.scala
@@ -12,15 +12,14 @@ object Q621 extends EditCheck[LoanApplicationRegister] {
   override def name: String = "Q621"
 
   override def parent: String = "Q621"
-  // valid number between 4 and 12 digits
-  val regex1 = "^\\d{4,12}$"
 
   override def apply(lar: LoanApplicationRegister): ValidationResult = {
-    if (lar.larIdentifier.NMLSRIdentifier.matches(regex1) ) {
-      ValidationSuccess
-    } else
-    {
-      ValidationFailure
-    }
+
+    val NMLSRLen = lar.larIdentifier.NMLSRIdentifier.length
+    val nmlsRID = lar.larIdentifier.NMLSRIdentifier
+
+      (NMLSRLen is lessThanOrEqual(12)) and
+      (NMLSRLen is greaterThanOrEqual(4)) and
+      ( nmlsRID is numeric)
   }
 }
diff --git a/hmda/src/main/scala/hmda/validation/rules/lar/quality/_2025/Q651_1.scala b/hmda/src/main/scala/hmda/validation/rules/lar/quality/_2025/Q651_1.scala
@@ -15,10 +15,8 @@ object Q651_1 extends EditCheck[LoanApplicationRegister] {
   override def parent: String = "Q651"
 
   override def apply(lar: LoanApplicationRegister): ValidationResult ={
-    when((lar.loan.combinedLoanToValueRatio is numeric) and
-      (lar.loan.combinedLoanToValueRatio.toFloat is lessThan(1.5) ) and
-      (lar.loan.combinedLoanToValueRatio.toFloat is greaterThan(0))) {
-       ValidationFailure
-    }
+
+    val cltv= lar.loan.combinedLoanToValueRatio
+    when((cltv is numeric) and (cltv is greaterThan(0))) { cltv not lessThan(1.5) }
   }
 }
diff --git a/hmda/src/main/scala/hmda/validation/rules/lar/validity/2025/V695_3.scala b/hmda/src/main/scala/hmda/validation/rules/lar/validity/2025/V695_3.scala
@@ -10,17 +10,15 @@ object V695_3 extends EditCheck[LoanApplicationRegister] {
   override def name: String = "V695-3"
 
   override def parent: String = "V695"
-   // valid number between 4 and 12 digits
-  val regex1 = "^\\d{4,12}$"
-
 
   override def apply(lar: LoanApplicationRegister): ValidationResult = {
-    if (lar.larIdentifier.NMLSRIdentifier.matches(regex1) ) {
-      ValidationSuccess
-    } else
-      {
-        ValidationFailure
-      }
+
+    val NMLSRLen = lar.larIdentifier.NMLSRIdentifier.length
+    val nmlsRID = lar.larIdentifier.NMLSRIdentifier
+
+    (NMLSRLen is lessThanOrEqual(12)) and
+      (NMLSRLen is greaterThanOrEqual(4)) and
+      ( nmlsRID is numeric)
   }
 
 }