Q016 field fix

Author: Nick Grippin

validation/src/main/scala/hmda/validation/rules/lar/macro/Q016.scala

@@ -10,6 +10,7 @@ import hmda.validation.rules.AggregateEditCheck
 import hmda.validation.rules.lar.`macro`.MacroEditTypes._
 
 import scala.concurrent.Future
+import scala.util.Try
 
 object Q016 extends AggregateEditCheck[LoanApplicationRegisterSource, LoanApplicationRegister] {
 
@@ -21,7 +22,9 @@ object Q016 extends AggregateEditCheck[LoanApplicationRegisterSource, LoanApplic
 
   override def apply[as: AS, mat: MAT, ec: EC](lars: LoanApplicationRegisterSource): Future[Result] = {
 
-    val belowIncomeThreshold = count(lars.filter(lar => lar.loan.amount < incomeCap))
+    val belowIncomeThreshold = count(lars
+      .filter(lar => Try(lar.applicant.income.toDouble).isSuccess)
+      .filter(lar => lar.applicant.income.toInt < incomeCap))
 
     val total = count(lars)
 

validation/src/test/scala/hmda/validation/rules/lar/macro/Q016Spec.scala

@@ -13,12 +13,17 @@ class Q016Spec extends MacroSpec {
   val sampleSize = testLars.size
   val sampleSizeTarget = (testLars.size * multiplier).toInt
   def underCap(lar: LoanApplicationRegister) = {
-    val underCapLoan = lar.loan.copy(amount = incomeCap - 1)
-    lar.copy(loan = underCapLoan)
+    val underCapApplicant = lar.applicant.copy(income = (incomeCap - 1).toString)
+    lar.copy(applicant = underCapApplicant)
   }
   def overCap(lar: LoanApplicationRegister) = {
-    val overCapLoan = lar.loan.copy(amount = incomeCap + 1)
-    lar.copy(loan = overCapLoan)
+    val overCapApplicant = lar.applicant.copy(income = (incomeCap + 1).toString)
+    lar.copy(applicant = overCapApplicant)
+  }
+
+  def naIncome(lar: LoanApplicationRegister) = {
+    val naApplicant = lar.applicant.copy(income = "NA")
+    lar.copy(applicant = naApplicant)
   }
 
   property(s"be valid if under cap loans < $multiplier * over cap loans") {
@@ -39,5 +44,11 @@ class Q016Spec extends MacroSpec {
     invalidLarSource.mustFail
   }
 
+  property(s"be valid if NA loans > $multiplier * over cap loans") {
+    val numOfRelevantLars = sampleSizeTarget + 1
+    val validLarSource = newLarSource(testLars, numOfRelevantLars, naIncome, overCap)
+    validLarSource.mustPass
+  }
+
   override def check: AggregateEditCheck[LoanApplicationRegisterSource, LoanApplicationRegister] = Q016
 }