Default reportDate to current date

Author: schbetsy

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

@@ -1,12 +1,9 @@
 package hmda.publication.reports.aggregate
 
-import java.util.Calendar
-
 import akka.NotUsed
 import akka.stream.scaladsl.Source
 import hmda.model.publication.reports.{ ApplicantIncome, Disposition, MSAReport }
 import hmda.publication.reports._
-import hmda.publication.reports.util.DateUtil._
 import hmda.publication.reports.util.ReportUtil._
 import hmda.publication.reports.util.ReportsMetaDataLookup
 import hmda.query.model.filing.LoanApplicationRegisterQuery
@@ -15,10 +12,10 @@ import scala.concurrent.Future
 
 case class A52(
   year: Int,
-  reportDate: String,
   msa: MSAReport,
   applicantIncomes: List[ApplicantIncome],
   total: List[Disposition],
+  reportDate: String = formattedCurrentDate,
   table: String = A52.metaData.reportTable,
   description: String = A52.metaData.description
 ) extends AggregateReport
@@ -62,7 +59,6 @@ object A52 {
 
       A52(
         year,
-        formatDate(Calendar.getInstance().toInstant),
         msa,
         applicantIncomes,
         total

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

@@ -1,12 +1,9 @@
 package hmda.publication.reports.disclosure
 
-import java.util.Calendar
-
 import akka.NotUsed
 import akka.stream.scaladsl.Source
 import hmda.publication.reports._
 import hmda.model.publication.reports._
-import hmda.publication.reports.util.DateUtil._
 import hmda.publication.reports.util.ReportUtil._
 import hmda.publication.reports.util.ReportsMetaDataLookup
 import hmda.query.model.filing.LoanApplicationRegisterQuery
@@ -17,10 +14,10 @@ case class D51(
   respondentId: String,
   institutionName: String,
   year: Int,
-  reportDate: String,
   msa: MSAReport,
   applicantIncomes: List[ApplicantIncome],
   total: List[Disposition],
+  reportDate: String = formattedCurrentDate,
   table: String = D51.metaData.reportTable,
   description: String = D51.metaData.description
 ) extends DisclosureReport
@@ -70,7 +67,6 @@ object D51 {
         respondentId,
         institutionName,
         year,
-        formatDate(Calendar.getInstance().toInstant),
         msa,
         applicantIncomes,
         total

publication/src/main/scala/hmda/publication/reports/protocol/aggregate/A52Protocol.scala

@@ -39,10 +39,10 @@ object A52Protocol
         case Seq(table, reportType, description, year, reportDate, msa, applicantIncomes, total) =>
           A52(
             year.convertTo[Int],
-            reportDate.convertTo[String],
             msa.convertTo[MSAReport],
             applicantIncomes.convertTo[List[ApplicantIncome]],
-            total.convertTo[List[Disposition]]
+            total.convertTo[List[Disposition]],
+            reportDate.convertTo[String]
           )
       }
   }

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

@@ -47,10 +47,10 @@ object D51Protocol
             respondentId.convertTo[String],
             institutionName.convertTo[String],
             year.convertTo[Int],
-            reportDate.convertTo[String],
             msa.convertTo[MSAReport],
             applicantIncomes.convertTo[List[ApplicantIncome]],
-            total.convertTo[List[Disposition]]
+            total.convertTo[List[Disposition]],
+            reportDate.convertTo[String]
           )
       }
   }

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

@@ -1,11 +1,14 @@
 package hmda.publication.reports.util
 
+import java.util.Calendar
+
 import akka.NotUsed
 import akka.stream.scaladsl.Source
 import hmda.census.model._
 import hmda.model.publication.reports.ApplicantIncomeEnum._
 import hmda.model.publication.reports._
 import hmda.publication.reports.{ AS, EC, MAT }
+import hmda.publication.reports.util.DateUtil._
 import hmda.publication.reports.util.DispositionType._
 import hmda.publication.reports.util.RaceUtil.raceBorrowerCharacteristic
 import hmda.publication.reports.util.EthnicityUtil.ethnicityBorrowerCharacteristic
@@ -17,6 +20,10 @@ import scala.concurrent.Future
 
 object ReportUtil extends SourceUtils {
 
+  def formattedCurrentDate: String = {
+    formatDate(Calendar.getInstance().toInstant)
+  }
+
   def msaReport(fipsCode: String): MSAReport = {
     CbsaLookup.values.find(x => x.cbsa == fipsCode) match {
       case Some(cbsa) =>

publication/src/test/scala/hmda/publication/reports/aggregate/AggregateReportGenerators.scala

@@ -14,6 +14,6 @@ object AggregateReportGenerators {
       reportDate = formatDate(Calendar.getInstance().toInstant)
       applicantIncomes <- Gen.listOfN(5, applicantIncomeGen)
       total <- totalDispositionGen
-    } yield A52(year, reportDate, msa, applicantIncomes, total)
+    } yield A52(year, msa, applicantIncomes, total, reportDate)
   }
 }

publication/src/test/scala/hmda/publication/reports/disclosure/DisclosureReportGenerators.scala

@@ -16,7 +16,7 @@ object DisclosureReportGenerators {
       msa <- msaReportGen
       applicantIncomes <- Gen.listOfN(5, applicantIncomeGen)
       total <- totalDispositionGen
-    } yield D51(respId, instName, year, reportDate, msa, applicantIncomes, total)
+    } yield D51(respId, instName, year, msa, applicantIncomes, total, reportDate)
   }
 
 }