Skip to content

Commit 215405d

Browse files
committed
Consistent name for D5-X reports
1 parent 4273203 commit 215405d

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ object D53 {
1919
fipsCode: Int,
2020
respondentId: String,
2121
institutionNameF: Future[String]
22-
): Future[Series5DisclosureReport] = {
22+
): Future[D5X] = {
2323

2424
D5X.generate("D53", filters, larSource, fipsCode, respondentId, institutionNameF)
2525

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ trait DisclosureReport {
2525

2626
}
2727

28-
case class Series5DisclosureReport(
28+
case class D5X(
2929
respondentId: String,
3030
institutionName: String,
3131
year: Int,
@@ -45,7 +45,7 @@ object D5X {
4545
fipsCode: Int,
4646
respondentId: String,
4747
institutionNameF: Future[String]
48-
): Future[Series5DisclosureReport] = {
48+
): Future[D5X] = {
4949

5050
val metaData = ReportsMetaDataLookup.values(reportId)
5151
val dispositions = metaData.dispositions
@@ -73,7 +73,7 @@ object D5X {
7373
total <- totalF
7474
} yield {
7575

76-
Series5DisclosureReport(
76+
D5X(
7777
respondentId,
7878
institutionName,
7979
year,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package hmda.publication.reports.protocol.disclosure
22

33
import hmda.model.publication.reports.{ ApplicantIncome, Disposition, MSAReport }
44
import hmda.model.publication.reports.ReportTypeEnum.Disclosure
5-
import hmda.publication.reports.disclosure.Series5DisclosureReport
5+
import hmda.publication.reports.disclosure.D5X
66
import hmda.publication.reports.protocol.{ ApplicantIncomeProtocol, MSAReportProtocol, ReportTypeEnumProtocol }
77
import spray.json._
88
import spray.json.DefaultJsonProtocol
@@ -13,9 +13,9 @@ object D5XProtocol
1313
with MSAReportProtocol
1414
with ApplicantIncomeProtocol {
1515

16-
implicit object D5XFormat extends RootJsonFormat[Series5DisclosureReport] {
16+
implicit object D5XFormat extends RootJsonFormat[D5X] {
1717

18-
override def write(obj: Series5DisclosureReport): JsValue = {
18+
override def write(obj: D5X): JsValue = {
1919
JsObject(
2020
"respondentId" -> JsString(obj.respondentId),
2121
"institutionName" -> JsString(obj.institutionName),
@@ -30,7 +30,7 @@ object D5XProtocol
3030
)
3131
}
3232

33-
override def read(json: JsValue): Series5DisclosureReport = json.asJsObject.getFields(
33+
override def read(json: JsValue): D5X = json.asJsObject.getFields(
3434
"respondentId",
3535
"institutionName",
3636
"year",
@@ -42,7 +42,7 @@ object D5XProtocol
4242
"desc"
4343
) match {
4444
case Seq(respondentId, institutionName, year, reportDate, msa, applicantIncomes, total, table, desc) =>
45-
Series5DisclosureReport(
45+
D5X(
4646
respondentId.convertTo[String],
4747
institutionName.convertTo[String],
4848
year.convertTo[Int],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class D5XProtocolSpec extends PropSpec with PropertyChecks with MustMatchers {
1010

1111
property("D5X Report must convert to and from JSON") {
1212
forAll(d5XGen) { d5X =>
13-
d5X.toJson.convertTo[Series5DisclosureReport] mustBe d5X
13+
d5X.toJson.convertTo[D5X] mustBe d5X
1414
}
1515
}
1616

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@ package hmda.publication.reports.disclosure
33
import java.util.Calendar
44
import hmda.publication.reports.ReportGenerators._
55
import org.scalacheck.Gen
6-
import hmda.publication.reports.util.DateUtil._
76

87
object DisclosureReportGenerators {
98

10-
def d5XGen: Gen[Series5DisclosureReport] = {
9+
def d5XGen: Gen[D5X] = {
1110
for {
1211
respId <- Gen.alphaStr
1312
instName <- Gen.alphaStr
1413
year = Calendar.getInstance().get(Calendar.YEAR)
1514
msa <- msaReportGen
1615
applicantIncomes <- Gen.listOfN(5, applicantIncomeGen)
1716
total <- totalDispositionGen
18-
} yield Series5DisclosureReport(respId, instName, year, msa, applicantIncomes, total, "D5-X", "description")
17+
} yield D5X(respId, instName, year, msa, applicantIncomes, total, "D5-X", "description")
1918
}
2019

2120
def d51Gen: Gen[D51] = {

0 commit comments

Comments
 (0)