Add new V619_2 edit with dynamic year.

cfpb · Sep 20, 2024 · 3c7b159 · 3c7b159
1 parent 3a95db9
commit 3c7b159
Show file tree

Hide file tree

Showing 25 changed files with 71 additions and 147 deletions.
diff --git a/hmda/src/main/scala/hmda/validation/engine/2018/LarEngine2018.scala b/hmda/src/main/scala/hmda/validation/engine/2018/LarEngine2018.scala
@@ -3,6 +3,7 @@ package hmda.validation.engine
 import hmda.model.filing.lar.LoanApplicationRegister
 import hmda.validation.context.ValidationContext
 import hmda.validation.rules.lar.quality._2018._
+import hmda.validation.rules.lar.validity.common.V619_2
 import hmda.validation.rules.lar.quality.common._
 import hmda.validation.rules.lar.syntactical.{ S300, S301 }
 import hmda.validation.rules.lar.validity.{_2018,_}
@@ -40,7 +41,7 @@ private[engine] object LarEngine2018 extends ValidationEngine[LoanApplicationReg
     V617,
     V618,
     V619_1,
-    _2018.V619_2,
+    V619_2.withYear("2018"),
     V619_3,
     V620,
     V621,

diff --git a/hmda/src/main/scala/hmda/validation/engine/2019/LarEngine2019.scala b/hmda/src/main/scala/hmda/validation/engine/2019/LarEngine2019.scala
@@ -3,6 +3,7 @@ package hmda.validation.engine
 import hmda.model.filing.lar.LoanApplicationRegister
 import hmda.validation.context.ValidationContext
 import hmda.validation.rules.lar.quality._2019._
+import hmda.validation.rules.lar.validity.common.V619_2
 import hmda.validation.rules.lar.quality.common._
 import hmda.validation.rules.lar.syntactical.{ S300, S301 }
 import hmda.validation.rules.lar.validity.{_2019,_}
@@ -41,7 +42,7 @@ private[engine] object LarEngine2019 extends ValidationEngine[LoanApplicationReg
     V617,
     V618,
     V619_1,
-    _2019.V619_2,
+    V619_2.withYear("2019"),
     V619_3,
     V620,
     V621,

diff --git a/hmda/src/main/scala/hmda/validation/engine/2020/LarEngine2020.scala b/hmda/src/main/scala/hmda/validation/engine/2020/LarEngine2020.scala
@@ -3,6 +3,7 @@ package hmda.validation.engine
 import hmda.model.filing.lar.LoanApplicationRegister
 import hmda.validation.context.ValidationContext
 import hmda.validation.rules.lar.quality._2019._
+import hmda.validation.rules.lar.validity.common.V619_2
 import hmda.validation.rules.lar.quality.{common, _2020 => quality2020}
 import hmda.validation.rules.lar.quality.common._
 import hmda.validation.rules.lar.syntactical.{S300, S301}
@@ -43,7 +44,7 @@ private[engine] object LarEngine2020 extends ValidationEngine[LoanApplicationReg
     V617,
     V618,
     V619_1,
-    _2020.V619_2,
+    V619_2.withYear("2020"),
     V619_3,
     V620,
     V621,

diff --git a/hmda/src/main/scala/hmda/validation/engine/2020Qscala/LarEngine2020Q.scala b/hmda/src/main/scala/hmda/validation/engine/2020Qscala/LarEngine2020Q.scala
@@ -10,6 +10,7 @@ import hmda.validation.rules.lar.validity._
 import hmda.validation.rules.lar.validity._2020
 import hmda.census.records.CensusRecords
 import hmda.validation.rules.lar.validity._2020.V716
+import hmda.validation.rules.lar.validity.common.V619_2
 
 private[engine] object LarEngine2020Q extends ValidationEngine[LoanApplicationRegister] {
 
@@ -43,7 +44,7 @@ private[engine] object LarEngine2020Q extends ValidationEngine[LoanApplicationRe
     V617,
     V618,
     V619_1,
-    _2020.V619_2,
+    V619_2.withYear("2020"),
     V619_3,
     V620,
     V621,

diff --git a/hmda/src/main/scala/hmda/validation/engine/2021/LarEngine2021.scala b/hmda/src/main/scala/hmda/validation/engine/2021/LarEngine2021.scala
@@ -3,6 +3,7 @@ package hmda.validation.engine
 import hmda.model.filing.lar.LoanApplicationRegister
 import hmda.validation.context.ValidationContext
 import hmda.validation.rules.lar.quality.{_2020 => quality2020, _2021 => quality2021}
+import hmda.validation.rules.lar.validity.common.V619_2
 import hmda.validation.rules.lar.quality.common._
 import hmda.validation.rules.lar.syntactical.{S300, S301}
 import hmda.validation.rules.lar.validity._
@@ -41,7 +42,7 @@ private[engine] object LarEngine2021 extends ValidationEngine[LoanApplicationReg
     V617,
     V618,
     V619_1,
-    _2021.V619_2,
+    V619_2.withYear("2021"),
     V619_3,
     V620,
     V621,

diff --git a/hmda/src/main/scala/hmda/validation/engine/2021Qscala/LarEngine2021Q.scala b/hmda/src/main/scala/hmda/validation/engine/2021Qscala/LarEngine2021Q.scala
@@ -9,6 +9,7 @@ import hmda.validation.rules.lar.syntactical.{S300, S301}
 import hmda.validation.rules.lar.validity._
 import hmda.validation.rules.lar.validity._2020
 import hmda.census.records.CensusRecords
+import hmda.validation.rules.lar.validity.common.V619_2
 
 private[engine] object LarEngine2021Q extends ValidationEngine[LoanApplicationRegister] {
 
@@ -42,7 +43,7 @@ private[engine] object LarEngine2021Q extends ValidationEngine[LoanApplicationRe
     V617,
     V618,
     V619_1,
-    _2021.V619_2,
+    V619_2.withYear("2021"),
     V619_3,
     V620,
     V621,

diff --git a/hmda/src/main/scala/hmda/validation/engine/2022/LarEngine2022.scala b/hmda/src/main/scala/hmda/validation/engine/2022/LarEngine2022.scala
@@ -4,6 +4,7 @@ package hmda.validation.engine
 import hmda.model.filing.lar.LoanApplicationRegister
 import hmda.validation.context.ValidationContext
 import hmda.validation.rules.lar.quality._2019._
+import hmda.validation.rules.lar.validity.common.V619_2
 import hmda.validation.rules.lar.quality.{_2020 => quality2020, _2021 => quality2021, _2022 => quality2022}
 import hmda.validation.rules.lar.quality.common._
 import hmda.validation.rules.lar.syntactical.{S300, S301}
@@ -42,7 +43,7 @@ private[engine] object LarEngine2022 extends ValidationEngine[LoanApplicationReg
     V617,
     V618,
     V619_1,
-    _2022.V619_2,
+    V619_2.withYear("2022"),
     V619_3,
     V620,
     V621,

diff --git a/hmda/src/main/scala/hmda/validation/engine/2022Qscala/LarEngine2022Q.scala b/hmda/src/main/scala/hmda/validation/engine/2022Qscala/LarEngine2022Q.scala
@@ -9,6 +9,7 @@ import hmda.validation.rules.lar.quality.common._
 import hmda.validation.rules.lar.syntactical.{S300, S301}
 import hmda.validation.rules.lar.validity.{_2020, _2022, _}
 import hmda.census.records.CensusRecords
+import hmda.validation.rules.lar.validity.common.V619_2
 
 private[engine] object LarEngine2022Q extends ValidationEngine[LoanApplicationRegister] {
 
@@ -42,7 +43,7 @@ private[engine] object LarEngine2022Q extends ValidationEngine[LoanApplicationRe
     V617,
     V618,
     V619_1,
-    _2022.V619_2,
+    V619_2.withYear("2022"),
     V619_3,
     V620,
     V621,

diff --git a/hmda/src/main/scala/hmda/validation/engine/2023/LarEngine2023.scala b/hmda/src/main/scala/hmda/validation/engine/2023/LarEngine2023.scala
@@ -4,6 +4,7 @@ package hmda.validation.engine
 import hmda.model.filing.lar.LoanApplicationRegister
 import hmda.validation.context.ValidationContext
 import hmda.validation.rules.lar.quality._2019._
+import hmda.validation.rules.lar.validity.common.V619_2
 import hmda.validation.rules.lar.quality.{_2020 => quality2020, _2021 => quality2021, _2022 => quality2022}
 import hmda.validation.rules.lar.quality.common._
 import hmda.validation.rules.lar.syntactical.{S300, S301}
@@ -42,7 +43,7 @@ private[engine] object LarEngine2023 extends ValidationEngine[LoanApplicationReg
     V617,
     V618,
     V619_1,
-    _2023.V619_2,
+    V619_2.withYear("2023"),
     V619_3,
     V620,
     V621,

diff --git a/hmda/src/main/scala/hmda/validation/engine/2023Qscala/LarEngine2023Q.scala b/hmda/src/main/scala/hmda/validation/engine/2023Qscala/LarEngine2023Q.scala
@@ -9,6 +9,7 @@ import hmda.validation.rules.lar.quality.common._
 import hmda.validation.rules.lar.syntactical.{S300, S301}
 import hmda.validation.rules.lar.validity.{_2020, _2022, _}
 import hmda.census.records.CensusRecords
+import hmda.validation.rules.lar.validity.common.V619_2
 
 private[engine] object LarEngine2023Q extends ValidationEngine[LoanApplicationRegister] {
 
@@ -42,7 +43,7 @@ private[engine] object LarEngine2023Q extends ValidationEngine[LoanApplicationRe
     V617,
     V618,
     V619_1,
-    _2023.V619_2,
+    V619_2.withYear("2023"),
     V619_3,
     V620,
     V621,

diff --git a/hmda/src/main/scala/hmda/validation/engine/2024/LarEngine2024.scala b/hmda/src/main/scala/hmda/validation/engine/2024/LarEngine2024.scala
@@ -4,6 +4,7 @@ package hmda.validation.engine
 import hmda.model.filing.lar.LoanApplicationRegister
 import hmda.validation.context.ValidationContext
 import hmda.validation.rules.lar.quality._2019._
+import hmda.validation.rules.lar.validity.common.V619_2
 import hmda.validation.rules.lar.quality.{_2020 => quality2020, _2021 => quality2021, _2022 => quality2022, _2025 => quality2025}
 import hmda.validation.rules.lar.quality.common._
 import hmda.validation.rules.lar.syntactical.{S300, S301}
@@ -43,7 +44,7 @@ private[engine] object LarEngine2024 extends ValidationEngine[LoanApplicationReg
     V617,
     V618,
     V619_1,
-    _2024.V619_2,
+    V619_2.withYear("2024"),
     V619_3,
     V620,
     V621,

diff --git a/hmda/src/main/scala/hmda/validation/engine/2025/LarEngine2025.scala b/hmda/src/main/scala/hmda/validation/engine/2025/LarEngine2025.scala
@@ -4,6 +4,7 @@ package hmda.validation.engine
 import hmda.model.filing.lar.LoanApplicationRegister
 import hmda.validation.context.ValidationContext
 import hmda.validation.rules.lar.quality._2019._
+import hmda.validation.rules.lar.validity.common.V619_2
 import hmda.validation.rules.lar.quality.{_2020 => quality2020, _2021 => quality2021, _2022 => quality2022, _2025 => quality2025}
 import hmda.validation.rules.lar.quality.common._
 import hmda.validation.rules.lar.syntactical.{S300, S301}
@@ -43,7 +44,7 @@ private[engine] object LarEngine2025 extends ValidationEngine[LoanApplicationReg
     V617,
     V618,
     V619_1,
-    _2024.V619_2,
+    V619_2.withYear("2025"),
     V619_3,
     V620,
     V621,

diff --git a/hmda/src/main/scala/hmda/validation/rules/lar/validity/2018/V619_2.scala b/hmda/src/main/scala/hmda/validation/rules/lar/validity/2018/V619_2.scala
diff --git a/hmda/src/main/scala/hmda/validation/rules/lar/validity/2019/V619_2.scala b/hmda/src/main/scala/hmda/validation/rules/lar/validity/2019/V619_2.scala
diff --git a/hmda/src/main/scala/hmda/validation/rules/lar/validity/2020/V619_2.scala b/hmda/src/main/scala/hmda/validation/rules/lar/validity/2020/V619_2.scala
diff --git a/hmda/src/main/scala/hmda/validation/rules/lar/validity/2021/V619_2.scala b/hmda/src/main/scala/hmda/validation/rules/lar/validity/2021/V619_2.scala
diff --git a/hmda/src/main/scala/hmda/validation/rules/lar/validity/2022/V619_2.scala b/hmda/src/main/scala/hmda/validation/rules/lar/validity/2022/V619_2.scala
diff --git a/hmda/src/main/scala/hmda/validation/rules/lar/validity/2024/V619_2.scala b/hmda/src/main/scala/hmda/validation/rules/lar/validity/2024/V619_2.scala
diff --git a/...tion/rules/lar/validity/2023/V619_2.scala → ...on/rules/lar/validity/common/V619_2.scala b/...tion/rules/lar/validity/2023/V619_2.scala → ...on/rules/lar/validity/common/V619_2.scala
@@ -1,21 +1,24 @@
-package hmda.validation.rules.lar.validity._2023
-
+package hmda.validation.rules.lar.validity.common
 
 import hmda.model.filing.lar.LoanApplicationRegister
 import hmda.validation.dsl.PredicateCommon._
 import hmda.validation.dsl.PredicateSyntax._
 import hmda.validation.dsl.ValidationResult
 import hmda.validation.rules.EditCheck
 
-object V619_2 extends EditCheck[LoanApplicationRegister] {
+object V619_2 {
+  def withYear(year: String): EditCheck[LoanApplicationRegister] =
+    new V619_2(year)
+
+}
+
+class V619_2 private (year: String) extends EditCheck[LoanApplicationRegister] {
   override def name: String = "V619-2"
 
   override def parent: String = "V619"
 
   override def apply(lar: LoanApplicationRegister): ValidationResult = {
-    val year = "2023"
-
     lar.action.actionTakenDate.toString.slice(0, 4) is equalTo(year)
   }
 
-}
+}
diff --git a/hmda/src/test/scala/hmda/validation/rules/lar/validity/2018/V619_2Spec.scala b/hmda/src/test/scala/hmda/validation/rules/lar/validity/2018/V619_2Spec.scala
@@ -4,11 +4,10 @@ import hmda.model.filing.lar.LarGenerators._
 import hmda.model.filing.lar.LoanApplicationRegister
 import hmda.validation.rules.EditCheck
 import hmda.validation.rules.lar.LarEditCheckSpec
-import hmda.validation.rules.lar.validity._2018.V619_2
-
+import hmda.validation.rules.lar.validity.common.V619_2
 
 class V619_2Spec extends LarEditCheckSpec {
-  override def check: EditCheck[LoanApplicationRegister] = V619_2
+  override def check: EditCheck[LoanApplicationRegister] = V619_2.withYear("2018")
 
   property("Action taken date must be in the current year") {
     forAll(larGen) { lar =>

diff --git a/hmda/src/test/scala/hmda/validation/rules/lar/validity/2019/V619_2Spec.scala b/hmda/src/test/scala/hmda/validation/rules/lar/validity/2019/V619_2Spec.scala
@@ -4,10 +4,10 @@ import hmda.model.filing.lar.LarGenerators._
 import hmda.model.filing.lar.LoanApplicationRegister
 import hmda.validation.rules.EditCheck
 import hmda.validation.rules.lar.LarEditCheckSpec
-import hmda.validation.rules.lar.validity._2019.V619_2
+import hmda.validation.rules.lar.validity.common.V619_2
 
 class V619_2Spec extends LarEditCheckSpec {
-  override def check: EditCheck[LoanApplicationRegister] = V619_2
+  override def check: EditCheck[LoanApplicationRegister] = V619_2.withYear("2019")
 
   property("Action taken date must be in the current year") {
     forAll(larGen) { lar =>