fixes to cbsa lookup, n52 test passing

Author: Nick Grippin

census/src/main/resources/jul_2015_cbsa.csv

@@ -10,7 +10,7 @@ import com.github.tototoshi.csv.CSVParser.parse
 object CbsaLookup extends CbsaResourceUtils {
   val values: Seq[Cbsa] = {
     val lines = resourceLines("/jul_2015_cbsa.csv", "ISO-8859-1")
-    lines.map { line =>
+    lines.drop(3).map { line =>
       val values = parse(line, '\\', ',', '"').getOrElse(List())
       val cbsaCode = values(0)
       val metroDivCode = values(1)

census/src/main/scala/hmda/census/model/CbsaLookup.scala

@@ -56,7 +56,6 @@ object A52 {
       year <- yearF
       total <- totalF
     } yield {
-
       A52(
         year,
         msa,

publication/src/main/scala/hmda/publication/reports/aggregate/A52.scala

@@ -21,32 +21,35 @@ case class N52(
     description: String = N52.metaData.description
 ) extends NationalAggregateReport {
   def +(a52: A52): N52 = {
+    if (applicantIncomes.isEmpty) {
+      N52(a52.year, a52.reportDate, a52.applicantIncomes, a52.total)
+    } else {
+      val combinedIncomes = a52.applicantIncomes.map(income => {
+        val newC = applicantIncomes.find(i => i.applicantIncome == income.applicantIncome).get.borrowerCharacteristics
+        val originalC = income.borrowerCharacteristics
 
-    val combinedIncomes = a52.applicantIncomes.map(income => {
-      val newC = applicantIncomes.find(i => i.applicantIncome == income.applicantIncome).get.borrowerCharacteristics
-      val originalC = income.borrowerCharacteristics
+        val nR = newC.find(_.isInstanceOf[RaceBorrowerCharacteristic]).get.asInstanceOf[RaceBorrowerCharacteristic]
+        val oR = originalC.find(_.isInstanceOf[RaceBorrowerCharacteristic]).get.asInstanceOf[RaceBorrowerCharacteristic]
+        val cR = oR + nR
 
-      val nR = newC.find(_.isInstanceOf[RaceBorrowerCharacteristic]).get.asInstanceOf[RaceBorrowerCharacteristic]
-      val oR = originalC.find(_.isInstanceOf[RaceBorrowerCharacteristic]).get.asInstanceOf[RaceBorrowerCharacteristic]
-      val cR = oR + nR
+        val nE = newC.find(_.isInstanceOf[EthnicityBorrowerCharacteristic]).get.asInstanceOf[EthnicityBorrowerCharacteristic]
+        val oE = originalC.find(_.isInstanceOf[EthnicityBorrowerCharacteristic]).get.asInstanceOf[EthnicityBorrowerCharacteristic]
+        val cE = oE + nE
 
-      val nE = newC.find(_.isInstanceOf[EthnicityBorrowerCharacteristic]).get.asInstanceOf[EthnicityBorrowerCharacteristic]
-      val oE = originalC.find(_.isInstanceOf[EthnicityBorrowerCharacteristic]).get.asInstanceOf[EthnicityBorrowerCharacteristic]
-      val cE = oE + nE
+        val nM = newC.find(_.isInstanceOf[MinorityStatusBorrowerCharacteristic]).get.asInstanceOf[MinorityStatusBorrowerCharacteristic]
+        val oM = originalC.find(_.isInstanceOf[MinorityStatusBorrowerCharacteristic]).get.asInstanceOf[MinorityStatusBorrowerCharacteristic]
+        val cM = oM + nM
 
-      val nM = newC.find(_.isInstanceOf[MinorityStatusBorrowerCharacteristic]).get.asInstanceOf[MinorityStatusBorrowerCharacteristic]
-      val oM = originalC.find(_.isInstanceOf[MinorityStatusBorrowerCharacteristic]).get.asInstanceOf[MinorityStatusBorrowerCharacteristic]
-      val cM = oM + nM
+        ApplicantIncome(income.applicantIncome, List(cR, cE, cM))
+      })
 
-      ApplicantIncome(income.applicantIncome, List(cR, cE, cM))
-    })
-
-    val combinedDispositions = a52.total.map(disposition => {
-      val originalDisposition = total.find(d => d.disposition == disposition.disposition).get
-      disposition + originalDisposition
-    })
+      val combinedDispositions = a52.total.map(disposition => {
+        val originalDisposition = total.find(d => d.disposition == disposition.disposition).get
+        disposition + originalDisposition
+      })
 
-    N52(year, reportDate, combinedIncomes, combinedDispositions, table, description)
+      N52(year, reportDate, combinedIncomes, combinedDispositions, table, description)
+    }
   }
 }
 

publication/src/main/scala/hmda/publication/reports/national/N52.scala

@@ -25,7 +25,7 @@ class N52Spec extends AsyncWordSpec with MustMatchers with LarGenerators with Be
     system.terminate()
   }
 
-  val fips = CbsaLookup.values.map(_.cbsa)
+  val fips = CbsaLookup.values.map(_.cbsa).filterNot(_.isEmpty)
   val fipsGen = Gen.oneOf(fips)
   def propType = Gen.oneOf(1, 2).sample.get