CLDC-2459 Update end date for new logs creation (#1716)

* Renme end_date to new_logs_end_date

* Display change buttons in CYA if the collection is still open for editing

* Allow navigating to question if the collection is still open for editing

* Allow logs to be edited if the date is before edit end date

* Update sales validation to allow editing existing logs

* update tests

* Update edit_end_date

* Update some test wording

* Update new logs end date

* tests

app/controllers/form_controller.rb

@@ -208,7 +208,7 @@ private
   def check_collection_period
     return unless @log
 
-    redirect_to lettings_log_path(@log) unless @log.collection_period_open?
+    redirect_to lettings_log_path(@log) unless @log.collection_period_open_for_editing?
   end
 
   CONFIRMATION_PAGE_IDS = %w[uprn_confirmation].freeze

app/models/form.rb

@@ -1,16 +1,12 @@
 class Form
   attr_reader :form_definition, :sections, :subsections, :pages, :questions,
-              :start_date, :end_date, :submission_deadline, :type, :name, :setup_definition,
+              :start_date, :new_logs_end_date, :submission_deadline, :type, :name, :setup_definition,
               :setup_sections, :form_sections, :unresolved_log_redirect_page_id, :edit_end_date
 
   def initialize(form_path, start_year = "", sections_in_form = [], type = "lettings")
     if sales_or_start_year_after_2022?(type, start_year)
       @start_date = Time.zone.local(start_year, 4, 1)
-      @end_date = if start_year && start_year.to_i > 2022
+      @new_logs_end_date = Time.zone.local(start_year + 1, 12, 31)  # this is to be manually updated each year when we want to stop users from creating new logs
-                    Time.zone.local(start_year + 1, 6, 9)
-                  else
-                    Time.zone.local(start_year + 1, 8, 7)
-                  end
       @submission_deadline = if start_year && start_year.to_i > 2022
                                Time.zone.local(start_year + 1, 6, 7)
                              else
@@ -26,10 +22,11 @@ class Form
       @form_definition = {
         "form_type" => type,
         "start_date" => start_date,
-        "end_date" => end_date,
+        "end_date" => new_logs_end_date,
         "sections" => sections,
       }
       @unresolved_log_redirect_page_id = "tenancy_start_date" if type == "lettings"
+      @edit_end_date = Time.zone.local(start_year + 1, 12, 31) # this is to be manually updated each year when we want to stop users from editing logs
     else
       raise "No form definition file exists for given year".freeze unless File.exist?(form_path)
 
@@ -42,12 +39,12 @@ class Form
       @pages = subsections.flat_map(&:pages)
       @questions = pages.flat_map(&:questions)
       @start_date = Time.iso8601(form_definition["start_date"])
-      @end_date = Time.iso8601(form_definition["end_date"])
+      @new_logs_end_date = Time.zone.local(@start_date.year + 1, 12, 31)
-      @submission_deadline = Time.zone.local(2023, 6, 9)
+      @submission_deadline = Time.zone.local(@start_date.year + 1, 6, 9)
+      @edit_end_date = Time.zone.local(@start_date.year + 1, 12, 31)
       @unresolved_log_redirect_page_id = form_definition["unresolved_log_redirect_page_id"]
     end
-    @edit_end_date = @end_date
+    @name = "#{start_date.year}_#{new_logs_end_date.year}_#{type}"
-    @name = "#{start_date.year}_#{end_date.year}_#{type}"
   end
 
   def get_subsection(id)
@@ -304,7 +301,7 @@ class Form
   end
 
   def valid_start_date_for_form?(start_date)
-    start_date >= self.start_date && start_date <= end_date
+    start_date >= self.start_date && start_date <= new_logs_end_date
   end
 
   def sales_or_start_year_after_2022?(type, start_year)

app/models/form_handler.rb

@@ -109,12 +109,22 @@ class FormHandler
 
   def lettings_in_crossover_period?(now: Time.zone.now)
     forms = lettings_forms.values
-    forms.count { |form| now.between?(form.start_date, form.end_date) } > 1
+    forms.count { |form| now.between?(form.start_date, form.new_logs_end_date) } > 1
+  end
+
+  def lettings_in_edit_crossover_period?(now: Time.zone.now)
+    forms = lettings_forms.values
+    forms.count { |form| now.between?(form.start_date, form.edit_end_date) } > 1
   end
 
   def sales_in_crossover_period?(now: Time.zone.now)
     forms = sales_forms.values
-    forms.count { |form| now.between?(form.start_date, form.end_date) } > 1
+    forms.count { |form| now.between?(form.start_date, form.new_logs_end_date) } > 1
+  end
+
+  def sales_in_edit_crossover_period?(now: Time.zone.now)
+    forms = sales_forms.values
+    forms.count { |form| now.between?(form.start_date, form.edit_end_date) } > 1
   end
 
   def use_fake_forms!(fake_forms = nil)

app/models/log.rb

@@ -94,7 +94,13 @@ class Log < ApplicationRecord
   def collection_period_open?
     return false if older_than_previous_collection_year?
 
-    form.end_date > Time.zone.today
+    form.new_logs_end_date > Time.zone.today
+  end
+
+  def collection_period_open_for_editing?
+    return false if older_than_previous_collection_year?
+
+    form.edit_end_date > Time.zone.today
   end
 
   def blank_invalid_non_setup_fields!

app/models/validations/sales/setup_validations.rb

@@ -5,7 +5,13 @@ module Validations::Sales::SetupValidations
   def validate_saledate_collection_year(record)
     return unless record.saledate && date_valid?("saledate", record) && FeatureToggle.saledate_collection_window_validation_enabled?
 
-    unless record.saledate.between?(active_collection_start_date, current_collection_end_date)
+    first_collection_start_date = if record.saledate_was.present?
+                                    editable_collection_start_date
+                                  else
+                                    active_collection_start_date
+                                  end
+
+    unless record.saledate.between?(first_collection_start_date, current_collection_end_date)
       record.errors.add :saledate, saledate_validation_error_message
     end
   end
@@ -28,6 +34,14 @@ private
     end
   end
 
+  def editable_collection_start_date
+    if FormHandler.instance.sales_in_edit_crossover_period?
+      previous_collection_start_date
+    else
+      current_collection_start_date
+    end
+  end
+
   def saledate_validation_error_message
     current_end_year_long = current_collection_end_date.strftime("#{current_collection_end_date.day.ordinalize} %B %Y")
 

app/models/validations/setup_validations.rb

@@ -5,7 +5,13 @@ module Validations::SetupValidations
   def validate_startdate_setup(record)
     return unless record.startdate && date_valid?("startdate", record)
 
-    unless record.startdate.between?(active_collection_start_date, current_collection_end_date)
+    first_collection_start_date = if record.startdate_was.present?
+                                    editable_collection_start_date
+                                  else
+                                    active_collection_start_date
+                                  end
+
+    unless record.startdate.between?(first_collection_start_date, current_collection_end_date)
       record.errors.add :startdate, startdate_validation_error_message
     end
   end
@@ -60,6 +66,14 @@ private
     end
   end
 
+  def editable_collection_start_date
+    if FormHandler.instance.lettings_in_edit_crossover_period?
+      previous_collection_start_date
+    else
+      current_collection_start_date
+    end
+  end
+
   def startdate_validation_error_message
     current_end_year_long = current_collection_end_date.strftime("#{current_collection_end_date.day.ordinalize} %B %Y")
 

app/services/bulk_upload/lettings/year2022/csv_parser.rb

@@ -63,7 +63,7 @@ class BulkUpload::Lettings::Year2022::CsvParser
   end
 
   def wrong_template_for_year?
-    !(first_record_start_date >= form.start_date && first_record_start_date <= form.end_date)
+    !(first_record_start_date >= form.start_date && first_record_start_date <= form.new_logs_end_date)
   end
 
 private

app/services/bulk_upload/sales/year2022/csv_parser.rb

@@ -45,7 +45,7 @@ class BulkUpload::Sales::Year2022::CsvParser
   end
 
   def wrong_template_for_year?
-    !(first_record_sale_date >= form.start_date && first_record_sale_date <= form.end_date)
+    !(first_record_sale_date >= form.start_date && first_record_sale_date <= form.new_logs_end_date)
   end
 
 private

app/views/form/_check_answers_summary_list.html.erb

@@ -25,7 +25,7 @@
         <% end %>
       <% end %>
 
-      <% if @log.collection_period_open? %>
+      <% if @log.collection_period_open_for_editing? %>
         <% row.action(
           text: question.action_text(@log),
           href: action_href(@log, question.page.id, referrer),

docs/adr/adr-019-form-end-dates.md

@@ -13,5 +13,5 @@ Also, if incorrect data is found during QA process, data providers might be aske
 
 To accommodate the different end dates, we will now store 3 different dates on the form definition:
 - Submission deadline (submission_deadline) - this is the date displayed at the top of a completed log in lettings and sales - "You can review and make changes to this log until 9 June 2024.". Nothing happens on this date
-- New logs end date (end_date) - no new logs for that collection year can be submitted, but logs can be edited
+- New logs end date (new_logs_end_date) - no new logs for that collection year can be submitted, but logs can be edited
 - Edit and delete logs end date (edit_end_date) - logs can no longer be edited or deleted. Completed logs can still be viewed. Materials / references to the collection year are removed.

spec/features/bulk_upload_lettings_logs_spec.rb

@@ -83,7 +83,7 @@ RSpec.describe "Bulk upload lettings log" do
 
   context "when not it crossover period" do
     it "shows journey with year option" do
-      Timecop.freeze(2023, 10, 1) do
+      Timecop.freeze(2024, 1, 1) do
         visit("/lettings-logs")
         expect(page).to have_link("Upload lettings logs in bulk")
         click_link("Upload lettings logs in bulk")
@@ -98,7 +98,7 @@ RSpec.describe "Bulk upload lettings log" do
 
   context "when the collection year isn't 22/23" do
     it "shows journey without the needstype" do
-      Timecop.freeze(2023, 10, 1) do
+      Timecop.freeze(2024, 1, 1) do
         visit("/lettings-logs")
         expect(page).to have_link("Upload lettings logs in bulk")
         click_link("Upload lettings logs in bulk")

spec/features/form/accessible_autocomplete_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe "Accessible Autocomplete" do
   end
 
   before do
-    allow(lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
     sign_in user
   end
 

spec/features/form/check_answers_page_lettings_logs_spec.rb

@@ -51,8 +51,8 @@ RSpec.describe "Lettings Log Check Answers Page" do
   let(:fake_2021_2022_form) { Form.new("spec/fixtures/forms/2021_2022.json") }
 
   before do
-    allow(lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
-    allow(fake_2021_2022_form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(fake_2021_2022_form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
     sign_in user
     allow(FormHandler.instance).to receive(:current_lettings_form).and_return(fake_2021_2022_form)
   end

spec/features/form/checkboxes_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe "Checkboxes" do
   end
 
   before do
-    allow(lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
     RequestHelper.stub_http_requests
     sign_in user
   end

spec/features/form/conditional_questions_spec.rb

@@ -33,8 +33,8 @@ RSpec.describe "Form Conditional Questions" do
 
   before do
     sign_in user
-    allow(sales_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(sales_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
-    allow(lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
     allow(FormHandler.instance).to receive(:current_lettings_form).and_return(fake_2021_2022_form)
   end
 

spec/features/form/form_navigation_spec.rb

@@ -44,8 +44,8 @@ RSpec.describe "Form Navigation" do
   let(:fake_2021_2022_form) { Form.new("spec/fixtures/forms/2021_2022.json") }
 
   before do
-    allow(lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
-    allow(fake_2021_2022_form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(fake_2021_2022_form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
     sign_in user
     allow(FormHandler.instance).to receive(:current_lettings_form).and_return(fake_2021_2022_form)
   end

spec/features/form/page_routing_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe "Form Page Routing" do
   let(:validator) { lettings_log._validators[nil].first }
 
   before do
-    allow(lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
     sign_in user
   end
 

spec/features/form/progressive_total_field_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe "Accessible Autocomplete" do
   end
 
   before do
-    allow(lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
     sign_in user
   end
 

spec/features/form/saving_data_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe "Form Saving Data" do
   end
 
   before do
-    allow(lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
     sign_in user
   end
 

spec/features/form/tasklist_page_spec.rb

@@ -54,7 +54,7 @@ RSpec.describe "Task List" do
   before do
     Timecop.freeze(Time.zone.local(2021, 5, 1))
     setup_completed_log.update!(startdate: Time.zone.local(2021, 5, 1))
-    allow(lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
     sign_in user
   end
 

spec/features/form/validations_spec.rb

@@ -42,8 +42,8 @@ RSpec.describe "validations" do
   let(:id) { lettings_log.id }
 
   before do
-    allow(fake_2021_2022_form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(fake_2021_2022_form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
-    allow(lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
     sign_in user
     allow(FormHandler.instance).to receive(:current_lettings_form).and_return(fake_2021_2022_form)
   end

spec/helpers/locations_helper_spec.rb

@@ -51,7 +51,7 @@ RSpec.describe LocationsHelper do
     let(:location) { FactoryBot.create(:location, startdate: nil) }
 
     before do
-      Timecop.freeze(2022, 10, 10)
+      Timecop.freeze(2023, 10, 10)
     end
 
     after do
@@ -201,7 +201,7 @@ RSpec.describe LocationsHelper do
     context "when viewing availability" do
       context "with no deactivations" do
         it "displays current collection start date as availability date if created_at is later than collection start date" do
-          location.update!(startdate: nil, created_at: Time.zone.local(2023, 8, 16))
+          location.update!(startdate: nil, created_at: Time.zone.local(2024, 1, 16))
           availability_attribute = display_location_attributes(location).find { |x| x[:name] == "Availability" }[:value]
 
           expect(availability_attribute).to eq("Active from 1 April 2023")

spec/helpers/schemes_helper_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe SchemesHelper do
     let(:scheme) { FactoryBot.create(:scheme, created_at: Time.zone.today) }
 
     before do
-      Timecop.freeze(2022, 10, 10)
+      Timecop.freeze(2023, 1, 10)
     end
 
     after do

spec/models/form_spec.rb

@@ -371,7 +371,9 @@ RSpec.describe Form, type: :model do
       expect(form.questions.count).to eq(13)
       expect(form.questions.first.id).to eq("owning_organisation_id")
       expect(form.start_date).to eq(Time.zone.parse("2022-04-01"))
-      expect(form.end_date).to eq(Time.zone.parse("2023-08-07"))
+      expect(form.new_logs_end_date).to eq(Time.zone.parse("2023-12-31"))
+      expect(form.edit_end_date).to eq(Time.zone.parse("2023-12-31"))
+      expect(form.submission_deadline).to eq(Time.zone.parse("2023-06-09"))
       expect(form.unresolved_log_redirect_page_id).to eq(nil)
     end
 

spec/models/lettings_log_spec.rb

@@ -3040,7 +3040,7 @@ RSpec.describe LettingsLog do
       let(:startdate) { nil }
 
       before do
-        allow(log).to receive_message_chain(:form, :end_date).and_return(Time.zone.now + 1.day)
+        allow(log).to receive_message_chain(:form, :new_logs_end_date).and_return(Time.zone.now + 1.day)
       end
 
       it "returns true" do
@@ -3052,7 +3052,7 @@ RSpec.describe LettingsLog do
       let(:startdate) { Time.zone.local(2020, 4, 1) }
 
       before do
-        allow(log).to receive_message_chain(:form, :end_date).and_return(Time.zone.now - 1.day)
+        allow(log).to receive_message_chain(:form, :new_logs_end_date).and_return(Time.zone.now - 1.day)
       end
 
       it "returns false" do

spec/models/sales_log_spec.rb

@@ -635,7 +635,7 @@ RSpec.describe SalesLog, type: :model do
       let(:saledate) { nil }
 
       before do
-        allow(log).to receive_message_chain(:form, :end_date).and_return(Time.zone.now + 1.day)
+        allow(log).to receive_message_chain(:form, :new_logs_end_date).and_return(Time.zone.now + 1.day)
       end
 
       it "returns true" do
@@ -647,7 +647,7 @@ RSpec.describe SalesLog, type: :model do
       let(:saledate) { Time.zone.local(2020, 4, 1) }
 
       before do
-        allow(log).to receive_message_chain(:form, :end_date).and_return(Time.zone.now - 1.day)
+        allow(log).to receive_message_chain(:form, :new_logs_end_date).and_return(Time.zone.now - 1.day)
       end
 
       it "returns false" do

spec/models/validations/sales/setup_validations_spec.rb

@@ -105,6 +105,52 @@ RSpec.describe Validations::Sales::SetupValidations do
           expect(record.errors[:saledate]).to include("Enter a date within the 23/24 or 24/25 collection years, which is between 1st April 2023 and 31st March 2025")
         end
       end
+
+      context "when current time is after the new logs end date but before edit end date for the previous period" do
+        let(:record) { build(:sales_log, saledate: Time.zone.local(2025, 4, 1)) }
+
+        before do
+          allow(Time).to receive(:now).and_return(Time.zone.local(2025, 1, 8))
+        end
+
+        it "cannot create new logs for the previous collection year" do
+          record.update!(saledate: nil)
+          record.saledate = Time.zone.local(2024, 1, 1)
+          setup_validator.validate_saledate_collection_year(record)
+          expect(record.errors["saledate"]).to include(match "Enter a date within the 24/25 collection year, which is between 1st April 2024 and 31st March 2025")
+        end
+
+        xit "can edit already created logs for the previous collection year" do
+          record.saledate = Time.zone.local(2024, 1, 2)
+          record.save!(validate: false)
+          record.saledate = Time.zone.local(2024, 1, 1)
+          setup_validator.validate_saledate_collection_year(record)
+          expect(record.errors["saledate"]).not_to include(match "Enter a date within the 24/25 collection year, which is between 1st April 2024 and 31st March 2025")
+        end
+      end
+
+      context "when after the new logs end date and after the edit end date for the previous period" do
+        let(:record) { build(:sales_log, saledate: Time.zone.local(2025, 4, 1)) }
+
+        before do
+          allow(Time).to receive(:now).and_return(Time.zone.local(2025, 1, 8))
+        end
+
+        it "cannot create new logs for the previous collection year" do
+          record.update!(saledate: nil)
+          record.saledate = Time.zone.local(2024, 1, 1)
+          setup_validator.validate_saledate_collection_year(record)
+          expect(record.errors["saledate"]).to include(match "Enter a date within the 24/25 collection year, which is between 1st April 2024 and 31st March 2025")
+        end
+
+        it "cannot edit already created logs for the previous collection year" do
+          record.saledate = Time.zone.local(2024, 1, 2)
+          record.save!(validate: false)
+          record.saledate = Time.zone.local(2024, 1, 1)
+          setup_validator.validate_saledate_collection_year(record)
+          expect(record.errors["saledate"]).to include(match "Enter a date within the 24/25 collection year, which is between 1st April 2024 and 31st March 2025")
+        end
+      end
     end
   end
 

spec/models/validations/setup_validations_spec.rb

@@ -85,6 +85,48 @@ RSpec.describe Validations::SetupValidations do
           expect(record.errors["startdate"]).to include(match "Enter a date within the 23/24 collection year, which is between 1st April 2023 and 31st March 2024")
         end
       end
+
+      context "when after the new logs end date but before edit end date for the previous period" do
+        before do
+          allow(Time).to receive(:now).and_return(Time.zone.local(2024, 1, 8))
+        end
+
+        it "cannot create new logs for the previous collection year" do
+          record.update!(startdate: nil)
+          record.startdate = Time.zone.local(2023, 1, 1)
+          setup_validator.validate_startdate_setup(record)
+          expect(record.errors["startdate"]).to include(match "Enter a date within the 23/24 collection year, which is between 1st April 2023 and 31st March 2024")
+        end
+
+        xit "can edit already created logs for the previous collection year" do
+          record.startdate = Time.zone.local(2023, 1, 2)
+          record.save!(validate: false)
+          record.startdate = Time.zone.local(2023, 1, 1)
+          setup_validator.validate_startdate_setup(record)
+          expect(record.errors["startdate"]).not_to include(match "Enter a date within the 23/24 collection year, which is between 1st April 2023 and 31st March 2024")
+        end
+      end
+
+      context "when after the new logs end date and after the edit end date for the previous period" do
+        before do
+          allow(Time).to receive(:now).and_return(Time.zone.local(2024, 1, 8))
+        end
+
+        it "cannot create new logs for the previous collection year" do
+          record.update!(startdate: nil)
+          record.startdate = Time.zone.local(2023, 1, 1)
+          setup_validator.validate_startdate_setup(record)
+          expect(record.errors["startdate"]).to include(match "Enter a date within the 23/24 collection year, which is between 1st April 2023 and 31st March 2024")
+        end
+
+        it "cannot edit already created logs for the previous collection year" do
+          record.startdate = Time.zone.local(2023, 1, 2)
+          record.save!(validate: false)
+          record.startdate = Time.zone.local(2023, 1, 1)
+          setup_validator.validate_startdate_setup(record)
+          expect(record.errors["startdate"]).to include(match "Enter a date within the 23/24 collection year, which is between 1st April 2023 and 31st March 2024")
+        end
+      end
     end
   end
 

spec/requests/form_controller_spec.rb

@@ -31,7 +31,8 @@ RSpec.describe FormController, type: :request do
   let(:fake_2021_2022_form) { Form.new("spec/fixtures/forms/2021_2022.json") }
 
   before do
-    allow(fake_2021_2022_form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+    allow(fake_2021_2022_form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
+    allow(fake_2021_2022_form).to receive(:edit_end_date).and_return(Time.zone.today + 2.months)
     allow(FormHandler.instance).to receive(:current_lettings_form).and_return(fake_2021_2022_form)
   end
 
@@ -786,7 +787,8 @@ RSpec.describe FormController, type: :request do
           before do
             completed_lettings_log.update!(ecstat1: 1, earnings: 130, hhmemb: 1) # we're not routing to that page, so it gets cleared?
             allow(completed_lettings_log).to receive(:net_income_soft_validation_triggered?).and_return(true)
-            allow(completed_lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+            allow(completed_lettings_log.form).to receive(:new_logs_end_date).and_return(Time.zone.today + 1.day)
+            allow(completed_lettings_log.form).to receive(:edit_end_date).and_return(Time.zone.today + 2.months)
             post "/lettings-logs/#{completed_lettings_log.id}/net-income-value-check", params: interrupt_params, headers: headers.merge({ "HTTP_REFERER" => referrer })
           end
 

spec/requests/lettings_logs_controller_spec.rb

@@ -937,14 +937,14 @@ RSpec.describe LettingsLogsController, type: :request do
               completed_lettings_log.reload
 
               get "/lettings-logs/#{completed_lettings_log.id}", headers:, params: {}
-              expect(completed_lettings_log.form.end_date).to eq(Time.zone.local(2023, 7, 1))
+              expect(completed_lettings_log.form.new_logs_end_date).to eq(Time.zone.local(2023, 12, 31))
               expect(completed_lettings_log.status).to eq("completed")
               expect(page).to have_link("review and make changes to this log", href: "/lettings-logs/#{completed_lettings_log.id}/review")
             end
 
             xit "displays a closed collection window message for previous collection year logs" do
               get "/lettings-logs/#{completed_lettings_log.id}", headers:, params: {}
-              expect(completed_lettings_log.form.end_date).to eq(Time.zone.local(2022, 7, 1))
+              expect(completed_lettings_log.form.new_logs_end_date).to eq(Time.zone.local(2022, 7, 1))
               expect(completed_lettings_log.status).to eq("completed")
               expect(page).to have_content("This log is from the 2021/2022 collection window, which is now closed.")
             end
@@ -1095,6 +1095,29 @@ RSpec.describe LettingsLogsController, type: :request do
         expect(page).not_to have_link("Answer")
       end
 
+      context "when the edit end date is in the future" do
+        before do
+          Timecop.freeze(2022, 7, 5)
+        end
+
+        after do
+          Timecop.return
+        end
+
+        it "allows you to change the answers for previous collection year logs" do
+          get "/lettings-logs/#{completed_lettings_log.id}/setup/check-answers", headers: { "Accept" => "text/html" }, params: {}
+          expect(page).to have_link("Change")
+
+          get "/lettings-logs/#{completed_lettings_log.id}/income-and-benefits/check-answers", headers: { "Accept" => "text/html" }, params: {}
+          expect(page).to have_link("Change")
+        end
+
+        it "lets the user navigate to questions for previous collection year logs" do
+          get "/lettings-logs/#{completed_lettings_log.id}/needs-type", headers: { "Accept" => "text/html" }, params: {}
+          expect(response).to have_http_status(:ok)
+        end
+      end
+
       it "does not let the user navigate to questions for previous collection year logs" do
         get "/lettings-logs/#{completed_lettings_log.id}/needs-type", headers: { "Accept" => "text/html" }, params: {}
         expect(response).to redirect_to("/lettings-logs/#{completed_lettings_log.id}")
@@ -1198,7 +1221,7 @@ RSpec.describe LettingsLogsController, type: :request do
       let(:headers) { { "Accept" => "text/html" } }
 
       before do
-        allow(affected_lettings_log.form).to receive(:end_date).and_return(Time.zone.today + 1.day)
+        allow(affected_lettings_log.form).to receive(:edit_end_date).and_return(Time.zone.today + 1.day)
         allow(user).to receive(:need_two_factor_authentication?).and_return(false)
         sign_in user
       end

spec/requests/locations_controller_spec.rb

@@ -1401,7 +1401,7 @@ RSpec.describe LocationsController, type: :request do
       let(:setup_locations) { nil }
 
       before do
-        Timecop.freeze(Time.utc(2022, 10, 10))
+        Timecop.freeze(Time.utc(2023, 10, 10))
         sign_in user
         add_deactivations
         setup_locations
@@ -1608,7 +1608,7 @@ RSpec.describe LocationsController, type: :request do
         end
       end
 
-      context "when the date is entered is before the beginning of current collection window" do
+      context "when the date entered is before the beginning of current collection window" do
         let(:params) { { location_deactivation_period: { deactivation_date_type: "other", "deactivation_date(3i)": "10", "deactivation_date(2i)": "4", "deactivation_date(1i)": "2020" } } }
 
         it "displays the new page with an error message" do
@@ -1656,9 +1656,9 @@ RSpec.describe LocationsController, type: :request do
       end
 
       context "when there is an earlier open deactivation" do
-        let(:deactivation_date) { Time.zone.local(2022, 10, 10) }
+        let(:deactivation_date) { Time.zone.local(2023, 10, 10) }
-        let(:params) { { location_deactivation_period: { deactivation_date_type: "other", "deactivation_date(3i)": "8", "deactivation_date(2i)": "9", "deactivation_date(1i)": "2023" } } }
+        let(:params) { { location_deactivation_period: { deactivation_date_type: "other", "deactivation_date(3i)": "8", "deactivation_date(2i)": "9", "deactivation_date(1i)": "2024" } } }
-        let(:add_deactivations) { create(:location_deactivation_period, deactivation_date: Time.zone.local(2023, 6, 5), reactivation_date: nil, location:) }
+        let(:add_deactivations) { create(:location_deactivation_period, deactivation_date: Time.zone.local(2024, 6, 5), reactivation_date: nil, location:) }
 
         it "redirects to the location page and updates the existing deactivation period" do
           follow_redirect!
@@ -1667,14 +1667,13 @@ RSpec.describe LocationsController, type: :request do
           expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success")
           location.reload
           expect(location.location_deactivation_periods.count).to eq(1)
-          expect(location.location_deactivation_periods.first.deactivation_date).to eq(Time.zone.local(2023, 9, 8))
+          expect(location.location_deactivation_periods.first.deactivation_date).to eq(Time.zone.local(2024, 9, 8))
         end
       end
 
       context "when there is a later open deactivation" do
-        let(:deactivation_date) { Time.zone.local(2022, 10, 10) }
         let(:params) { { location_deactivation_period: { deactivation_date_type: "other", "deactivation_date(3i)": "8", "deactivation_date(2i)": "9", "deactivation_date(1i)": "2022" } } }
-        let(:add_deactivations) { create(:location_deactivation_period, deactivation_date: Time.zone.local(2023, 6, 5), reactivation_date: nil, location:) }
+        let(:add_deactivations) { create(:location_deactivation_period, deactivation_date: Time.zone.local(2024, 6, 5), reactivation_date: nil, location:) }
 
         it "redirects to the confirmation page" do
           follow_redirect!
@@ -1833,7 +1832,7 @@ RSpec.describe LocationsController, type: :request do
       let(:startdate) { Time.utc(2022, 9, 11) }
 
       before do
-        Timecop.freeze(Time.utc(2022, 9, 10))
+        Timecop.freeze(Time.utc(2023, 1, 10))
         sign_in user
         create(:location_deactivation_period, deactivation_date:, location:)
         location.save!
@@ -1882,13 +1881,13 @@ RSpec.describe LocationsController, type: :request do
       end
 
       context "with other future date" do
-        let(:params) { { location_deactivation_period: { reactivation_date_type: "other", "reactivation_date(3i)": "14", "reactivation_date(2i)": "12", "reactivation_date(1i)": "2022" } } }
+        let(:params) { { location_deactivation_period: { reactivation_date_type: "other", "reactivation_date(3i)": "14", "reactivation_date(2i)": "12", "reactivation_date(1i)": "2023" } } }
 
         it "redirects to the location page and displays a success banner" do
           expect(response).to redirect_to("/schemes/#{scheme.id}/locations/#{location.id}")
           follow_redirect!
           expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success")
-          expect(page).to have_content("#{location.name} will reactivate on 14 December 2022")
+          expect(page).to have_content("#{location.name} will reactivate on 14 December 2023")
         end
       end
 

spec/requests/schemes_controller_spec.rb

@@ -1893,7 +1893,7 @@ RSpec.describe SchemesController, type: :request do
       let(:setup_schemes) { nil }
 
       before do
-        Timecop.freeze(Time.utc(2022, 10, 10))
+        Timecop.freeze(Time.utc(2023, 10, 10))
         sign_in user
         setup_schemes
         patch "/schemes/#{scheme.id}/new-deactivation", params:

spec/services/bulk_upload/lettings/year2022/csv_parser_spec.rb

@@ -190,7 +190,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::CsvParser do
 
   describe "#wrong_template_for_year?" do
     context "when 23/24 file with 23/24 data" do
-      let(:log) { build(:lettings_log, :completed, startdate: Date.new(2023, 10, 1)) }
+      let(:log) { build(:lettings_log, :completed, startdate: Date.new(2024, 1, 1)) }
 
       before do
         file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2023_csv_row)

spec/services/bulk_upload/sales/year2022/csv_parser_spec.rb

@@ -122,7 +122,7 @@ RSpec.describe BulkUpload::Sales::Year2022::CsvParser do
     let(:path) { file.path }
 
     context "when 23/24 file with 23/24 data" do
-      let(:log) { build(:sales_log, :completed, saledate: Date.new(2023, 10, 1)) }
+      let(:log) { build(:sales_log, :completed, saledate: Date.new(2024, 1, 1)) }
 
       before do
         file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2023_csv_row)