back to basic applicant income model

Author: Nick Grippin

model/shared/src/main/scala/hmda/model/publication/reports/ApplicantIncome.scala

@@ -2,19 +2,5 @@ package hmda.model.publication.reports
 
 case class ApplicantIncome(
   applicantIncome: ApplicantIncomeEnum,
-  characteristics: Characteristics
+  borrowerCharacteristics: List[BorrowerCharacteristic]
 )
-
-case class Characteristics(
-    raceBorrowerCharacteristic: RaceBorrowerCharacteristic,
-    ethnicityBorrowerCharacteristic: EthnicityBorrowerCharacteristic,
-    minorityStatusBorrowerCharacteristic: MinorityStatusBorrowerCharacteristic
-) {
-  def +(other: Characteristics): Characteristics = {
-    Characteristics(
-      raceBorrowerCharacteristic + other.raceBorrowerCharacteristic,
-      ethnicityBorrowerCharacteristic + other.ethnicityBorrowerCharacteristic,
-      minorityStatusBorrowerCharacteristic + other.minorityStatusBorrowerCharacteristic
-    )
-  }
-}

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

@@ -23,10 +23,22 @@ case class N52(
   def +(a52: A52): N52 = {
 
     val combinedIncomes = a52.applicantIncomes.map(income => {
-      val newC = applicantIncomes.find(i => i.applicantIncome == income.applicantIncome).get.characteristics
-      val originalC = income.characteristics
+      val newC = applicantIncomes.find(i => i.applicantIncome == income.applicantIncome).get.borrowerCharacteristics
+      val originalC = income.borrowerCharacteristics
 
-      ApplicantIncome(income.applicantIncome, newC + originalC)
+      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 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))
     })
 
     val combinedDispositions = a52.total.map(disposition => {

publication/src/main/scala/hmda/publication/reports/protocol/ApplicantIncomeProtocol.scala

@@ -1,11 +1,7 @@
 package hmda.publication.reports.protocol
 
-import hmda.model.publication.reports.{ ApplicantIncome, Characteristics }
+import hmda.model.publication.reports.ApplicantIncome
 
-trait ApplicantIncomeProtocol extends ApplicantIncomeEnumProtocol with CharacteristicsProtocol {
+trait ApplicantIncomeProtocol extends ApplicantIncomeEnumProtocol with BorrowerCharacteristicProtocol {
   implicit val applicantIncomeFormat = jsonFormat2(ApplicantIncome.apply)
 }
-
-trait CharacteristicsProtocol extends BorrowerCharacteristicProtocol {
-  implicit val characteristicsProtocol = jsonFormat3(Characteristics.apply)
-}

publication/src/main/scala/hmda/publication/reports/protocol/BorrowerCharacteristicProtocol.scala

@@ -5,48 +5,45 @@ import spray.json._
 
 trait BorrowerCharacteristicProtocol extends CharacteristicProtocol {
 
-  implicit object RaceBorrowerCharacteristicFormat extends RootJsonFormat[RaceBorrowerCharacteristic] {
-    override def write(obj: RaceBorrowerCharacteristic): JsValue =
-      JsObject(
-        "characteristic" -> JsString("Race"),
-        "races" -> obj.toJson
-      )
-
-    override def read(json: JsValue): RaceBorrowerCharacteristic = json match {
+  implicit object BorrowerCharacteristicFormat extends RootJsonFormat[BorrowerCharacteristic] {
+    override def write(obj: BorrowerCharacteristic): JsValue = obj match {
+
+      case RaceBorrowerCharacteristic(races) =>
+        JsObject(
+          "characteristic" -> JsString("Race"),
+          "races" -> races.toJson
+        )
+
+      case EthnicityBorrowerCharacteristic(ethnicities) =>
+        JsObject(
+          "characteristic" -> JsString("Ethnicity"),
+          "ethnicities" -> ethnicities.toJson
+        )
+
+      case MinorityStatusBorrowerCharacteristic(minorityStatus) =>
+        JsObject(
+          "characteristic" -> JsString("Minority Status"),
+          "minorityStatus" -> minorityStatus.toJson
+        )
+
+    }
+
+    override def read(json: JsValue): BorrowerCharacteristic = json match {
       case JsObject(fields) if fields.isDefinedAt("races") =>
         RaceBorrowerCharacteristic(
           fields("races").convertTo[List[RaceCharacteristic]]
         )
-    }
-  }
-
-  implicit object EthnicityBorrowerCharacteristicFormat extends RootJsonFormat[EthnicityBorrowerCharacteristic] {
-    override def write(obj: EthnicityBorrowerCharacteristic): JsValue =
-      JsObject(
-        "characteristic" -> JsString("Ethnicity"),
-        "ethnicities" -> obj.toJson
-      )
 
-    override def read(json: JsValue): EthnicityBorrowerCharacteristic = json match {
       case JsObject(fields) if fields.isDefinedAt("ethnicities") =>
         EthnicityBorrowerCharacteristic(
           fields("ethnicities").convertTo[List[EthnicityCharacteristic]]
         )
-    }
-  }
 
-  implicit object MinorityStatusBorrowerCharacteristicFormat extends RootJsonFormat[MinorityStatusBorrowerCharacteristic] {
-    override def write(obj: MinorityStatusBorrowerCharacteristic): JsValue =
-      JsObject(
-        "characteristic" -> JsString("Minority Status"),
-        "minorityStatus" -> obj.toJson
-      )
-
-    override def read(json: JsValue): MinorityStatusBorrowerCharacteristic = json match {
       case JsObject(fields) if fields.isDefinedAt("minorityStatus") =>
         MinorityStatusBorrowerCharacteristic(
           fields("minorityStatus").convertTo[List[MinorityStatusCharacteristic]]
         )
     }
+
   }
 }

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

@@ -118,15 +118,16 @@ object ReportUtil extends SourceUtils {
   def borrowerCharacteristicsByIncomeInterval[ec: EC, mat: MAT, as: AS](
     larsByIncome: Map[ApplicantIncomeEnum, Source[LoanApplicationRegisterQuery, NotUsed]],
     dispositions: List[DispositionType]
-  ): Map[ApplicantIncomeEnum, Future[Characteristics]] = {
+  ): Map[ApplicantIncomeEnum, Future[List[BorrowerCharacteristic]]] = {
     larsByIncome.map {
       case (income, lars) =>
-        val characteristics =
-          for {
-            r <- raceBorrowerCharacteristic(lars, dispositions)
-            e <- ethnicityBorrowerCharacteristic(lars, dispositions)
-            m <- minorityStatusBorrowerCharacteristic(lars, dispositions)
-          } yield Characteristics(r, e, m)
+        val characteristics = Future.sequence(
+          List(
+            raceBorrowerCharacteristic(lars, dispositions),
+            ethnicityBorrowerCharacteristic(lars, dispositions),
+            minorityStatusBorrowerCharacteristic(lars, dispositions)
+          )
+        )
         income -> characteristics
     }
   }