Merge pull request #4002 from nhsuk/academic-year-preparation-start-date

Academic year preparation start date

Author: thomasleese

app/lib/academic_year.rb

@@ -11,6 +11,17 @@ def current = Date.current.academic_year
     # when changing the date in tests).
     def first = [2024, current].min
 
-    def last = current
+    def last = preparation? ? current + 1 : current
+
+    def preparation? = Date.current >= preparation_start_date
+
+    private
+
+    def preparation_start_date
+      start_date = (current + 1).to_academic_year_date_range.first
+      days_of_preparation =
+        Settings.number_of_preparation_days_before_academic_year_starts.to_i
+      start_date - days_of_preparation.days
+    end
   end
 end

config/settings.yml

@@ -5,6 +5,9 @@ allow_dev_phone_numbers: false
 disallow_database_seeding: true
 web_concurrency: 2
 
+# Preparation normally starts on the 1st August.
+number_of_preparation_days_before_academic_year_starts: 31
+
 # NHS Care Identity Service OIDC integration configuration, used by Omniauth via
 # Devise.
 cis2:

spec/lib/academic_year_spec.rb

@@ -4,13 +4,25 @@
   describe "#all" do
     subject { travel_to(today) { described_class.all } }
 
-    context "in 2024" do
+    context "first day of 2024" do
       let(:today) { Date.new(2024, 9, 1) }
 
       it { should eq([2024]) }
     end
 
-    context "in 2025" do
+    context "last day of only 2024" do
+      let(:today) { Date.new(2025, 7, 31) }
+
+      it { should eq([2024]) }
+    end
+
+    context "preparing for 2025" do
+      let(:today) { Date.new(2025, 8, 1) }
+
+      it { should eq([2024, 2025]) }
+    end
+
+    context "first day of 2025" do
       let(:today) { Date.new(2025, 9, 1) }
 
       it { should eq([2024, 2025]) }
@@ -20,13 +32,13 @@
   describe "#current" do
     subject { travel_to(today) { described_class.current } }
 
-    context "in 2024" do
+    context "first day of 2024" do
       let(:today) { Date.new(2024, 9, 1) }
 
       it { should eq(2024) }
     end
 
-    context "in 2025" do
+    context "first day of 2025" do
       let(:today) { Date.new(2025, 9, 1) }
 
       it { should eq(2025) }
@@ -36,19 +48,19 @@
   describe "#first" do
     subject { travel_to(today) { described_class.first } }
 
-    context "in 2023" do
+    context "first day of 2023" do
       let(:today) { Date.new(2023, 9, 1) }
 
       it { should eq(2023) }
     end
 
-    context "in 2024" do
+    context "first day of 2024" do
       let(:today) { Date.new(2024, 9, 1) }
 
       it { should eq(2024) }
     end
 
-    context "in 2025" do
+    context "first day of 2025" do
       let(:today) { Date.new(2025, 9, 1) }
 
       it { should eq(2024) }
@@ -58,16 +70,56 @@
   describe "#last" do
     subject { travel_to(today) { described_class.last } }
 
-    context "in 2024" do
+    context "first day of 2024" do
       let(:today) { Date.new(2024, 9, 1) }
 
       it { should eq(2024) }
     end
 
-    context "in 2025" do
+    context "last day of only 2024" do
+      let(:today) { Date.new(2025, 7, 31) }
+
+      it { should eq(2024) }
+    end
+
+    context "preparing for 2025" do
+      let(:today) { Date.new(2025, 8, 1) }
+
+      it { should eq(2025) }
+    end
+
+    context "first day of 2025" do
       let(:today) { Date.new(2025, 9, 1) }
 
       it { should eq(2025) }
     end
   end
+
+  describe "#preparation?" do
+    subject { travel_to(today) { described_class.preparation? } }
+
+    context "first day of 2024" do
+      let(:today) { Date.new(2024, 9, 1) }
+
+      it { should be(false) }
+    end
+
+    context "last day of only 2024" do
+      let(:today) { Date.new(2025, 7, 31) }
+
+      it { should be(false) }
+    end
+
+    context "preparing for 2025" do
+      let(:today) { Date.new(2025, 8, 1) }
+
+      it { should be(true) }
+    end
+
+    context "first day of 2025" do
+      let(:today) { Date.new(2025, 9, 1) }
+
+      it { should be(false) }
+    end
+  end
 end

terraform/app/variables.tf

@@ -164,9 +164,10 @@ variable "app_version" {
 locals {
   is_production = var.environment == "production"
   parameter_store_variables = tomap({
-    MAVIS__PDS__ENQUEUE_BULK_UPDATES = var.enable_pds_enqueue_bulk_updates ? "true" : "false"
-    MAVIS__PDS__WAIT_BETWEEN_JOBS    = 0.5
-    GOOD_JOB_MAX_THREADS             = 5
+    MAVIS__PDS__ENQUEUE_BULK_UPDATES                              = var.enable_pds_enqueue_bulk_updates ? "true" : "false"
+    MAVIS__PDS__WAIT_BETWEEN_JOBS                                 = 0.5
+    MAVIS__NUMBER_OF_PREPARATION_DAYS_BEFORE_ACADEMIC_YEAR_STARTS = 31
+    GOOD_JOB_MAX_THREADS                                          = 5
   })
   parameter_store_config_list = [for key, value in local.parameter_store_variables : {
     name      = key