diff --git a/hmda-data-publisher/src/main/resources/application.conf b/hmda-data-publisher/src/main/resources/application.conf index 04132261e3..d3f23b9874 100644 --- a/hmda-data-publisher/src/main/resources/application.conf +++ b/hmda-data-publisher/src/main/resources/application.conf @@ -65,12 +65,6 @@ akka { years = "2020,2021" years = ${?TS_SCHEDULE_YEARS} } - SpecificTsSchedule { - expression = "0 0 0 23 4 ? 2079" - expression = ${?TS_SCHEDULE_CRON} - years = "2020,2021" - years = ${?TS_SCHEDULE_YEARS} - } SpecificTsSchedule { expression = "0 0 0 23 4 ? 2079" expression = ${?SPECIFIC_TS_SCHEDULE_CRON} diff --git a/hmda-data-publisher/src/test/scala/hmda/publisher/helper/DateGeneratorSpec.scala b/hmda-data-publisher/src/test/scala/hmda/publisher/helper/DateGeneratorSpec.scala deleted file mode 100644 index 7f7206c168..0000000000 --- a/hmda-data-publisher/src/test/scala/hmda/publisher/helper/DateGeneratorSpec.scala +++ /dev/null @@ -1,18 +0,0 @@ -package hmda.publisher.helper - -import org.scalatest.{Matchers, WordSpec} - -class DateGeneratorSpec extends WordSpec with Matchers { - val generator = DateGenerator - "date generator" should { - - "return correct current date" in { - assert(generator.currentDate == "2024-06-19-") - } - - "return correct current quarterly date" in { - assert(generator.currentQuarterlyDate == "2024-06-19_") - } - } - -} \ No newline at end of file diff --git a/kubernetes/hmda-data-publisher/templates/dynamic-schedule-config.yaml b/kubernetes/hmda-data-publisher/templates/dynamic-schedule-config.yaml index 5559080bad..ed8d64e5b0 100644 --- a/kubernetes/hmda-data-publisher/templates/dynamic-schedule-config.yaml +++ b/kubernetes/hmda-data-publisher/templates/dynamic-schedule-config.yaml @@ -9,26 +9,26 @@ metadata: data: COMBINED_MLAR_PUBLIC_SCHEDULE_CRON: 0 00 16 ? * SUN * - COMBINED_MLAR_PUBLIC_SCHEDULE_YEARS: "2022" - LAR_LOAN_LIMIT_SCHEDULE_CRON: 0 10 4 ? * MON * - LAR_LOAN_LIMIT_SCHEDULE_YEARS: 2020,2021,2022,2023 + COMBINED_MLAR_PUBLIC_SCHEDULE_YEARS: 2022,2023 + LAR_LOAN_LIMIT_SCHEDULE_CRON: 0 10 5 ? * MON * + LAR_LOAN_LIMIT_SCHEDULE_YEARS: 2021,2022,2023 LAR_PUBLIC_SCHEDULE_CRON: 0 00 10 ? * SUN * - LAR_PUBLIC_SCHEDULE_YEARS: 2020,2021,2022 - LAR_QUARTERLY_SCHEDULE_CRON: 0 30 3 * * ? - LAR_QUARTERLY_SCHEDULE_YEARS: "2023" + LAR_PUBLIC_SCHEDULE_YEARS: 2021,2022,2023 + LAR_QUARTERLY_SCHEDULE_CRON: 0 30 5 * * ? + LAR_QUARTERLY_SCHEDULE_YEARS: "2024" LAR_SCHEDULE_CRON: 0 00 14 ? * SUN * - LAR_SCHEDULE_YEARS: 2020,2021,2022 - PANEL_SCHEDULE_CRON: 0 15 05 * * ? - PANEL_SCHEDULE_YEARS: 2020,2021,2022 - SPECIFIC_LAR_SCHEDULE_CRON: 0 30 1 * * ? + LAR_SCHEDULE_YEARS: 2021,2022,2023 + PANEL_SCHEDULE_CRON: 0 10 8 ? * SUN * + PANEL_SCHEDULE_YEARS: 2021,2022,2023 + SPECIFIC_LAR_SCHEDULE_CRON: 0 0 0 23 4 ? 2079 SPECIFIC_LAR_SCHEDULE_YEARS: "2023" - SPECIFIC_PANEL_SCHEDULE_CRON: 0 20 1 * * ? + SPECIFIC_PANEL_SCHEDULE_CRON: 0 0 0 23 4 ? 2079 SPECIFIC_PANEL_SCHEDULE_YEARS: "2023" - SPECIFIC_TS_SCHEDULE_CRON: 0 10 1 * * ? + SPECIFIC_TS_SCHEDULE_CRON: 0 0 0 23 4 ? 2079 SPECIFIC_TS_SCHEDULE_YEARS: "2023" TS_PUBLIC_SCHEDULE_CRON: 0 00 8 ? * SUN * - TS_PUBLIC_SCHEDULE_YEARS: 2020,2021,2022 - TS_QUARTERLY_SCHEDULE_CRON: 0 00 3 * * ? - TS_QUARTERLY_SCHEDULE_YEARS: "2023" + TS_PUBLIC_SCHEDULE_YEARS: 2021,2022,2023 + TS_QUARTERLY_SCHEDULE_CRON: 0 20 5 * * ? + TS_QUARTERLY_SCHEDULE_YEARS: "2024" TS_SCHEDULE_CRON: 0 00 7 ? * SUN * - TS_SCHEDULE_YEARS: 2020,2021,2022 + TS_SCHEDULE_YEARS: 2021,2022,2023