Merge branch 'master' into submission-filename

Author: schbetsy

publication/src/main/scala/hmda/publication/reports/util/ReportUtil.scala

@@ -18,10 +18,13 @@ import scala.concurrent.Future
 object ReportUtil extends SourceUtils {
 
   def msaReport(fipsCode: String): MSAReport = {
-    val cbsa = CbsaLookup.values.find(x => x.cbsa == fipsCode).getOrElse(Cbsa())
-    val stateFips = cbsa.key.substring(0, 2)
-    val state = StateAbrvLookup.values.find(s => s.state == stateFips).getOrElse(StateAbrv("", "", ""))
-    MSAReport(fipsCode, CbsaLookup.nameFor(fipsCode), state.stateAbrv, state.stateName)
+    CbsaLookup.values.find(x => x.cbsa == fipsCode) match {
+      case Some(cbsa) =>
+        val stateFips = cbsa.key.substring(0, 2)
+        val state = StateAbrvLookup.values.find(s => s.state == stateFips).getOrElse(StateAbrv("", "", ""))
+        MSAReport(fipsCode, CbsaLookup.nameFor(fipsCode), state.stateAbrv, state.stateName)
+      case None => MSAReport("", "", "", "")
+    }
   }
 
   def calculateMedianIncomeIntervals(fipsCode: Int): Array[Double] = {

publication/src/test/scala/hmda/publication/reports/util/ReportUtilSpec.scala

@@ -0,0 +1,54 @@
+package hmda.publication.reports.util
+
+import akka.actor.ActorSystem
+import akka.stream.ActorMaterializer
+import akka.stream.scaladsl.Source
+import hmda.model.fi.lar.LarGenerators
+import hmda.model.publication.reports.MSAReport
+import hmda.publication.reports.util.ReportUtil._
+import hmda.query.repository.filing.LarConverter._
+import org.scalatest.{ AsyncWordSpec, MustMatchers }
+
+class ReportUtilSpec extends AsyncWordSpec with MustMatchers with LarGenerators {
+
+  implicit val system = ActorSystem()
+  implicit val ec = system.dispatcher
+  implicit val materializer = ActorMaterializer()
+
+  "msaReport" must {
+    "get MSA info for given fips code and return MSAReport object" in {
+      msaReport("10380") mustBe MSAReport("10380", "Aguadilla-Isabela, PR", "PR", "Puerto Rico")
+      msaReport("26980") mustBe MSAReport("26980", "Iowa City, IA", "IA", "Iowa")
+      msaReport("41100") mustBe MSAReport("41100", "St. George, UT", "UT", "Utah")
+    }
+
+    "Return empty MSAReport if fips code is invalid" in {
+      msaReport("bogus") mustBe MSAReport("", "", "", "")
+    }
+  }
+
+  "calculateMedianIncomeIntervals" must {
+    "get median income info for given fips, convert to thousands" in {
+      calculateMedianIncomeIntervals(10380)(2) mustBe 18.267
+      calculateMedianIncomeIntervals(26980)(2) mustBe 81.027
+      calculateMedianIncomeIntervals(41100)(2) mustBe 58.145
+    }
+    "return array of 50%, 80%, 100%, and 120% levels of median income (in thousands)" in {
+      def roundTo3(v: Double) = BigDecimal(v).setScale(3, BigDecimal.RoundingMode.HALF_UP).toDouble
+      calculateMedianIncomeIntervals(26980) mustBe Array(40.5135, 64.8216, 81.027, 97.2324)
+      calculateMedianIncomeIntervals(41100).map(roundTo3) mustBe Array(29.073, 46.516, 58.145, 69.774)
+    }
+  }
+
+  "calculateYear" must {
+    "given a larSource, return the Activity Year for the LARs in it" in {
+      // Activity Year is the same year as Action Taken Date. This is enforced by edit S270
+      val lars = larListGen.sample.get.map(_.copy(actionTakenDate = 20090822))
+      val src = Source.fromIterator(() => lars.toIterator)
+        .map(lar => toLoanApplicationRegisterQuery(lar))
+
+      calculateYear(src).map(_ mustBe 2009)
+    }
+  }
+
+}

query/src/main/scala/hmda/query/view/institutions/InstitutionView.scala

@@ -93,8 +93,11 @@ class InstitutionView extends HmdaPersistentActor {
       sender() ! state.institutions
 
     case FindInstitutionByPeriodAndDomain(domain) =>
-      sender() ! state.institutions.filter(i => i.emailDomains.map(e => extractDomain(e)).contains(domain.toLowerCase))
-
+      if (domain.isEmpty) {
+        sender() ! Set.empty[Institution]
+      } else {
+        sender() ! state.institutions.filter(i => i.emailDomains.map(e => extractDomain(e)).contains(domain.toLowerCase))
+      }
   }
 
   override def receiveRecover: Receive = super.receiveRecover orElse {

query/src/test/scala/hmda/query/view/institutions/InstitutionViewSpec.scala

@@ -2,7 +2,7 @@ package hmda.query.view.institutions
 
 import akka.actor.ActorRef
 import akka.testkit.TestProbe
-import hmda.model.institution.InstitutionGenerators
+import hmda.model.institution.{ Institution, InstitutionGenerators }
 import hmda.persistence.messages.CommonMessages.GetState
 import hmda.persistence.messages.events.institutions.InstitutionEvents.{ InstitutionCreated, InstitutionModified }
 import hmda.persistence.model.ActorSpec
@@ -17,6 +17,10 @@ class InstitutionViewSpec extends ActorSpec {
   val i3 = InstitutionGenerators.sampleInstitution
   val i4 = i3.copy(cra = true)
 
+  val e1 = Institution.empty.copy(id = "1", emailDomains = Set("test.com", "", ""))
+  val e2 = Institution.empty.copy(id = "2", emailDomains = Set("", "", ""))
+  val e3 = Institution.empty.copy(id = "3", emailDomains = Set("test.com", "", ""))
+
   val institutionQuery = createInstitutionView(system)
 
   implicit val ec = system.dispatcher
@@ -29,6 +33,9 @@ class InstitutionViewSpec extends ActorSpec {
     institutionQuery ! EventWithSeqNr(2, InstitutionCreated(i2))
     institutionQuery ! EventWithSeqNr(3, InstitutionCreated(i3))
     institutionQuery ! EventWithSeqNr(4, InstitutionModified(i4))
+    institutionQuery ! EventWithSeqNr(5, InstitutionCreated(e1))
+    institutionQuery ! EventWithSeqNr(6, InstitutionCreated(e2))
+    institutionQuery ! EventWithSeqNr(7, InstitutionCreated(e3))
   }
 
   "Institutions View" must {
@@ -50,7 +57,7 @@ class InstitutionViewSpec extends ActorSpec {
     }
     "return full list of institutions" in {
       probe.send(institutionQuery, GetState)
-      probe.expectMsg(Set(i1, i2, i4))
+      probe.expectMsg(Set(i1, i2, i4, e1, e2, e3))
     }
     "return reference to institution query projector" in {
       probe.send(institutionQuery, GetProjectionActorRef)
@@ -61,6 +68,21 @@ class InstitutionViewSpec extends ActorSpec {
       probe.send(institutionQuery, GetInstitutionByRespondentId(i1.respondentId))
       probe.expectMsg(i1)
     }
+
+    "return a set of institutions that match a domain" in {
+      probe.send(institutionQuery, FindInstitutionByPeriodAndDomain("test.com"))
+      probe.expectMsg(Set(e1, e3))
+    }
+
+    "return an empty set when requesting a domain that doesn't exist" in {
+      probe.send(institutionQuery, FindInstitutionByPeriodAndDomain("notest.com"))
+      probe.expectMsg(Set())
+    }
+
+    "return an empty set when requesting a blank domain" in {
+      probe.send(institutionQuery, FindInstitutionByPeriodAndDomain(""))
+      probe.expectMsg(Set())
+    }
   }
 
 }

validation/src/main/scala/hmda/validation/rules/lar/validity/V280.scala

@@ -11,9 +11,9 @@ object V280 extends EditCheck[LoanApplicationRegister] {
 
   val cbsaTracts = CBSATractLookup.values
 
-  val validMSAs = cbsaTracts.map(cbsa => cbsa.geoIdMsa).toSet
+  val validMSAs = cbsaTracts.map(cbsa => cbsa.geoIdMsa).filterNot(msa => msa.isEmpty).toSet
 
-  val validMDs = cbsaTracts.map(cbsa => cbsa.metDivFp).toSet
+  val validMDs = cbsaTracts.map(cbsa => cbsa.metDivFp).filterNot(md => md.isEmpty).toSet
 
   override def name: String = "V280"
 

validation/src/test/scala/hmda/validation/rules/lar/validity/V280Spec.scala

@@ -38,5 +38,13 @@ class V280Spec extends LarEditCheckSpec {
     }
   }
 
+  property("Fails for a blank MSA code") {
+    forAll(larGen) { lar =>
+      val inValidGeography = lar.geography.copy(msa = "")
+      val inValidLar = lar.copy(geography = inValidGeography)
+      inValidLar.mustFail
+    }
+  }
+
   override def check: EditCheck[LoanApplicationRegister] = V280
 }