Merge pull request cfpb#1098 from nickgrippin/q016-fix

Q016 - field reference fix

Author: schbetsy

persistence/src/test/scala/hmda/persistence/processing/HmdaFileValidatorSpec.scala

@@ -129,7 +129,6 @@ class HmdaFileValidatorSpec extends ActorSpec with BeforeAndAfterEach with HmdaF
         List(
           MacroValidationError("Q008"),
           MacroValidationError("Q010"),
-          MacroValidationError("Q016"),
           MacroValidationError("Q023")
         ),
         macroVerified = false

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,31 +13,42 @@ 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.toString)
+    lar.copy(applicant = overCapApplicant)
   }
 
-  property(s"be valid if under cap loans < $multiplier * over cap loans") {
+  def naIncome(lar: LoanApplicationRegister) = {
+    val naApplicant = lar.applicant.copy(income = "NA")
+    lar.copy(applicant = naApplicant)
+  }
+
+  property(s"be valid if under cap loans < $multiplier * total loans") {
     val numOfRelevantLars = sampleSizeTarget - 1
     val validLarSource = newLarSource(testLars, numOfRelevantLars, underCap, overCap)
     validLarSource.mustPass
   }
 
-  property(s"be invalid if under cap loans = $multiplier * over cap loans") {
+  property(s"be invalid if under cap loans = $multiplier * total loans") {
     val numOfRelevantLars = sampleSizeTarget
     val validLarSource = newLarSource(testLars, numOfRelevantLars, underCap, overCap)
     validLarSource.mustPass
   }
 
-  property(s"be invalid if under cap loans > $multiplier * over cap loans") {
+  property(s"be invalid if under cap loans > $multiplier * total loans") {
     val numOfRelevantLars = sampleSizeTarget + 1
     val invalidLarSource = newLarSource(testLars, numOfRelevantLars, underCap, overCap)
     invalidLarSource.mustFail
   }
 
+  property(s"be valid if NA loans > $multiplier * total loans") {
+    val numOfRelevantLars = sampleSizeTarget + 1
+    val validLarSource = newLarSource(testLars, numOfRelevantLars, naIncome, overCap)
+    validLarSource.mustPass
+  }
+
   override def check: AggregateEditCheck[LoanApplicationRegisterSource, LoanApplicationRegister] = Q016
 }