Merge pull request cfpb#1092 from nickgrippin/q061-fix

Fix Q061

Author: schbetsy

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

@@ -20,14 +20,14 @@ object Q061 extends AggregateEditCheck[LoanApplicationRegisterSource, LoanApplic
 
   override def apply[as: AS, mat: MAT, ec: EC](lars: LoanApplicationRegisterSource): Future[Result] = {
 
-    val firstLienHoepaLoans =
-      count(lars.filter(lar => lar.hoepaStatus == 1 && lar.actionTakenType == 1 && lar.lienStatus == 1 && lar.rateSpread != "NA")
-        .filter(lar => lar.rateSpread.toInt >= 5))
+    val firstLienPropertyLoans =
+      count(lars.filter(lar => lar.loan.propertyType == 1 && lar.actionTakenType == 1 && lar.lienStatus == 1 && lar.rateSpread != "NA")
+        .filter(lar => lar.rateSpread.toDouble > 5.0))
 
     val total = count(lars.filter(lar => lar.actionTakenType == 1))
 
     for {
-      f <- firstLienHoepaLoans
+      f <- firstLienPropertyLoans
       t <- total
     } yield {
       f.toDouble is lessThanOrEqual(t * multiplier)

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

@@ -10,10 +10,11 @@ class Q061Spec extends LessThanOrEqualToPropertyMacroSpec {
 
   override def irrelevantLar(lar: LoanApplicationRegister) = lar.copy(rateSpread = "NA").copy(actionTakenType = 1)
   override def relevantLar(lar: LoanApplicationRegister) = {
-    lar.copy(actionTakenType = 1).copy(hoepaStatus = 1).copy(rateSpread = "5").copy(lienStatus = 1).copy(actionTakenType = 1)
+    val newLoan = lar.loan.copy(propertyType = 1)
+    lar.copy(actionTakenType = 1).copy(loan = newLoan).copy(rateSpread = "5.01").copy(lienStatus = 1).copy(actionTakenType = 1)
   }
 
-  lessThanOrEqualToPropertyTests("first lien hoepa loans", multiplier, relevantLar, irrelevantLar)
+  lessThanOrEqualToPropertyTests("first lien property type loans", multiplier, relevantLar, irrelevantLar)
 
   override def check: AggregateEditCheck[LoanApplicationRegisterSource, LoanApplicationRegister] = Q061
 }