Replace specific D5-1 object with generic D5X

Author: schbetsy

publication/src/main/scala/hmda/publication/reports/disclosure/D51.scala

@@ -3,75 +3,25 @@ package hmda.publication.reports.disclosure
 import akka.NotUsed
 import akka.stream.scaladsl.Source
 import hmda.publication.reports._
-import hmda.model.publication.reports._
-import hmda.publication.reports.util.ReportUtil._
-import hmda.publication.reports.util.ReportsMetaDataLookup
 import hmda.query.model.filing.LoanApplicationRegisterQuery
 
 import scala.concurrent.Future
 
-case class D51(
-  respondentId: String,
-  institutionName: String,
-  year: Int,
-  msa: MSAReport,
-  applicantIncomes: List[ApplicantIncome],
-  total: List[Disposition],
-  reportDate: String = formattedCurrentDate,
-  table: String = D51.metaData.reportTable,
-  description: String = D51.metaData.description
-) extends DisclosureReport
-
 object D51 {
-  val metaData = ReportsMetaDataLookup.values("D51")
-  val dispositions = metaData.dispositions
 
-  // Table filters:
-  // Loan Type 2,3,4
-  // Property Type 1,2
-  // Purpose of Loan 1
+  def filters(lar: LoanApplicationRegisterQuery): Boolean = {
+    (lar.loanType == 2 || lar.loanType == 3 || lar.loanType == 4) &&
+      (lar.propertyType == 1 || lar.propertyType == 2) &&
+      (lar.purpose == 1)
+  }
+
   def generate[ec: EC, mat: MAT, as: AS](
     larSource: Source[LoanApplicationRegisterQuery, NotUsed],
     fipsCode: Int,
     respondentId: String,
     institutionNameF: Future[String]
-  ): Future[D51] = {
-
-    val lars = larSource
-      .filter(lar => lar.respondentId == respondentId)
-      .filter(lar => lar.msa != "NA")
-      .filter(lar => lar.msa.toInt == fipsCode)
-      .filter { lar =>
-        (lar.loanType == 2 || lar.loanType == 3 || lar.loanType == 4) &&
-          (lar.propertyType == 1 || lar.propertyType == 2) &&
-          (lar.purpose == 1)
-      }
-    val larsWithIncome = lars.filter(lar => lar.income != "NA")
-
-    val msa = msaReport(fipsCode.toString)
-
-    val incomeIntervals = calculateMedianIncomeIntervals(fipsCode)
-    val applicantIncomesF = applicantIncomesWithBorrowerCharacteristics(larsWithIncome, incomeIntervals, dispositions)
-
-    val yearF = calculateYear(larSource)
-    val totalF = calculateDispositions(lars, dispositions)
-
-    for {
-      institutionName <- institutionNameF
-      year <- yearF
-      applicantIncomes <- applicantIncomesF
-      total <- totalF
-    } yield {
-
-      D51(
-        respondentId,
-        institutionName,
-        year,
-        msa,
-        applicantIncomes,
-        total
-      )
-    }
+  ): Future[D5X] = {
 
+    D5X.generate("D51", filters, larSource, fipsCode, respondentId, institutionNameF)
   }
 }

publication/src/main/scala/hmda/publication/reports/disclosure/DisclosureReports.scala

@@ -7,7 +7,7 @@ import akka.util.Timeout
 import com.typesafe.config.ConfigFactory
 import hmda.model.institution.Institution
 import hmda.persistence.model.HmdaSupervisorActor.FindActorByName
-import hmda.publication.reports.protocol.disclosure.D51Protocol._
+import hmda.publication.reports.protocol.disclosure.D5XProtocol._
 import hmda.query.repository.filing.FilingCassandraRepository
 import hmda.query.view.institutions.InstitutionView
 import hmda.query.view.institutions.InstitutionView.GetInstitutionByRespondentId

publication/src/main/scala/hmda/publication/reports/protocol/disclosure/D51Protocol.scala

@@ -17,16 +17,4 @@ object DisclosureReportGenerators {
     } yield D5X(respId, instName, year, msa, applicantIncomes, total, "D5-X", "description")
   }
 
-  def d51Gen: Gen[D51] = {
-    for {
-      respId <- Gen.alphaStr
-      instName <- Gen.alphaStr
-      year = Calendar.getInstance().get(Calendar.YEAR)
-      reportDate = formatDate(Calendar.getInstance().toInstant)
-      msa <- msaReportGen
-      applicantIncomes <- Gen.listOfN(5, applicantIncomeGen)
-      total <- totalDispositionGen
-    } yield D51(respId, instName, year, msa, applicantIncomes, total, reportDate)
-  }
-
 }