Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions data-browser/src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ server {
2019 = "data-browser/datasets/2019/filtered-queries/three-year"
2020 = "data-browser/datasets/2020/filtered-queries/three-year"
2021 = "data-browser/datasets/2021/filtered-queries/three-year"
2022 = "data-browser/datasets/2022/filtered-queries/one-year"
2022 = "data-browser/datasets/2022/filtered-queries/three-year"
2023 = "data-browser/datasets/2023/filtered-queries/one-year"
2024 = "data-browser/datasets/2024/filtered-queries/snapshot"
2024 = "data-browser/datasets/2024/filtered-queries/one-year"
2025 = "data-browser/datasets/2025/filtered-queries/snapshot"
}
// this is where s3 files with unique md5 hash strings are saved
}
Expand All @@ -54,9 +55,10 @@ dbconfig {
database = ${?PG_DATABASE}

table {
2024 = "modifiedlar2024_snapshot_v3"
2025 = "modifiedlar2025_snapshot_06022026"
2024 = "modifiedlar2024_one_year_06012026"
2023 = "modifiedlar2023_one_year_05192025_v2"
2022 = "modifiedlar2022_one_year_05012024"
2022 = "modifiedlar2022_three_year_06012026"
2021 = "modifiedlar2021_three_year_05192025_v2"
2020 = "modifiedlar2020_three_year_05012024"
2019 = "modifiedlar2019_three_year_04122023"
Expand Down
11 changes: 8 additions & 3 deletions data-browser/src/main/scala/hmda/dataBrowser/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ trait Settings {
}

object database {
val tableName2025: String = config.getString("dbconfig.table.2025")
val tableName2024: String = config.getString("dbconfig.table.2024")
val tableName2023: String = config.getString("dbconfig.table.2023")
val tableName2022: String = config.getString("dbconfig.table.2022")
Expand All @@ -49,7 +50,8 @@ trait Settings {
case 2022 => tableName2022
case 2023 => tableName2023
case 2024 => tableName2024
case _ => tableName2024
case 2025 => tableName2025
case _ => tableName2025
}
ModifiedLarTable(selected)
}
Expand All @@ -63,7 +65,8 @@ trait Settings {
case 2022 => tableName2022
case 2023 => tableName2023
case 2024 => tableName2024
case _ => tableName2024
case 2025 => tableName2025
case _ => tableName2025
}

selected
Expand Down Expand Up @@ -101,7 +104,9 @@ trait Settings {
case 2022 => config.getString("server.s3.routes.filtered-queries.2022")
case 2023 => config.getString("server.s3.routes.filtered-queries.2023")
case 2024 => config.getString("server.s3.routes.filtered-queries.2024")
case _ => config.getString("server.s3.routes.filtered-queries.2024")
case 2025 => config.getString("server.s3.routes.filtered-queries.2025")
case _ => config.getString("server.s3.routes.filtered-queries.2025")

}
selected
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ trait DataBrowserDirectives extends Settings {
import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport._
complete((BadRequest, "must provide years value parameter"))

case xs if xs.exists(year => (year < 2018) || (year > 2024)) => // TODO: Change this to 2017 when 2017 is released
case xs if xs.exists(year => (year < 2018) || (year > 2025)) => // TODO: Change this to 2017 when 2017 is released
import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport._
complete((BadRequest, s"must provide years in the range of 2018-2023, you have provided (${xs.mkString(", ")})"))

Expand Down
5 changes: 3 additions & 2 deletions institutions-api/src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@ counts:{
defaultInstitution:"institutions2025_quarterly_08192025"

transmittalSheet:{
2024 = "transmittalsheet2024_snapshot_v3"
2025 = "transmittalsheet2024_snapshot_06022026"
2024 = "transmittalsheet2024_one_year_06012026"
2023 = "transmittalsheet2023_one_year_05192025_v2"
2022 = "transmittalsheet2022_one_year_05012024"
2022 = "transmittalsheet2022_three_year_06012026"
2021 = "transmittalsheet2021_three_year_05192025_v2"
2020 = "transmittalsheet2020_three_year_05012024"
2019 = "transmittalsheet2019_three_year_04122023"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ object InstitutionTsRepo {
private val filerCountConfig: Config = ConfigFactory.load().getConfig("counts")

private val defaultInstitution = filerCountConfig.getString("defaultInstitution")
private val staticTS2025 = filerCountConfig.getString("transmittalSheet.2025")
private val staticTS2024 = filerCountConfig.getString("transmittalSheet.2024")
private val staticTS2023 = filerCountConfig.getString("transmittalSheet.2023")
private val staticTS2022 = filerCountConfig.getString("transmittalSheet.2022")
Expand All @@ -30,7 +31,8 @@ object InstitutionTsRepo {
case 2022 => staticTS2022
case 2023 => staticTS2023
case 2024 => staticTS2024
case _ => staticTS2024
case 2025 => staticTS2025
case _ => staticTS2025
}
}
}
Expand Down
Loading