From 409a24b3336cd92c4e8ad13143146aa88fb40c0d Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Wed, 30 Nov 2022 11:46:08 +0000
Subject: [PATCH] Cldc 1609 schemes and location validations (#1022)

* Add base errors for start date

* Add validation to location

* add validation to scheme id

* update error messages

* wip

* return dates for errors

* choose newest reactivation date

* Add validation to scheme_id

* Fix validations in tests

* add diferent error message

* fix some edge dates and add activating_soon schemes error

* fix error message

* move status_during_startdate into validations files

* rebase

* refactor

* rename method

* remove reverse and update ordering

* Extract scheme validation method

* Refactor validations

* Refactor status validations
---
 app/models/location.rb                        |  20 +-
 app/models/scheme.rb                          |  19 +-
 app/models/validations/date_validations.rb    |   5 +
 app/models/validations/setup_validations.rb   |  11 +
 app/models/validations/shared_validations.rb  |  35 ++++
 config/locales/en.yml                         |   8 +
 ...nswers_summary_list_card_component_spec.rb |   2 +-
 spec/factories/lettings_log.rb                |   4 +-
 spec/factories/location.rb                    |   2 +-
 spec/factories/scheme.rb                      |   2 +-
 spec/features/form/check_answers_page_spec.rb |   3 +-
 spec/features/form/validations_spec.rb        |   1 +
 .../fixtures/files/lettings_logs_download.csv |   2 +-
 .../lettings_logs_download_non_support.csv    |   2 +-
 spec/helpers/schemes_helper_spec.rb           |   2 +-
 spec/jobs/email_csv_job_spec.rb               |   3 +-
 spec/models/lettings_log_spec.rb              |   4 +-
 .../validations/date_validations_spec.rb      | 147 +++++++++++++
 .../validations/setup_validations_spec.rb     | 194 ++++++++++++++++++
 spec/requests/form_controller_spec.rb         |   1 +
 spec/requests/locations_controller_spec.rb    |  10 +-
 spec/requests/schemes_controller_spec.rb      |   2 +-
 .../lettings_log_export_service_spec.rb       |   8 +-
 .../lettings_logs_import_service_spec.rb      |   6 +-
 24 files changed, 454 insertions(+), 39 deletions(-)

diff --git a/app/models/location.rb b/app/models/location.rb
index 4fa161e0b..5ba6bf3e4 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -375,17 +375,23 @@ class Location < ApplicationRecord
     FormHandler.instance.collection_start_date(created_at)
   end
 
-  def status
-    open_deactivation = location_deactivation_periods.deactivations_without_reactivation.first
-    recent_deactivation = location_deactivation_periods.order("created_at").last
+  def open_deactivation
+    location_deactivation_periods.deactivations_without_reactivation.first
+  end
+
+  def recent_deactivation
+    location_deactivation_periods.order("created_at").last
+  end
 
-    return :deactivated if open_deactivation&.deactivation_date.present? && Time.zone.now >= open_deactivation.deactivation_date
-    return :deactivating_soon if open_deactivation&.deactivation_date.present? && Time.zone.now < open_deactivation.deactivation_date
-    return :reactivating_soon if recent_deactivation&.reactivation_date.present? && Time.zone.now < recent_deactivation.reactivation_date
-    return :activating_soon if startdate.present? && Time.zone.now < startdate
+  def status(date = Time.zone.now)
+    return :deactivated if open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date
+    return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date
+    return :reactivating_soon if recent_deactivation&.reactivation_date.present? && date < recent_deactivation.reactivation_date
+    return :activating_soon if startdate.present? && date < startdate
 
     :active
   end
+  alias_method :status_at, :status
 
   def active?
     status == :active
diff --git a/app/models/scheme.rb b/app/models/scheme.rb
index 73aecd6ac..bc243d449 100644
--- a/app/models/scheme.rb
+++ b/app/models/scheme.rb
@@ -213,18 +213,23 @@ class Scheme < ApplicationRecord
     FormHandler.instance.collection_start_date(created_at)
   end
 
-  def status
-    return :incomplete unless confirmed
+  def open_deactivation
+    scheme_deactivation_periods.deactivations_without_reactivation.first
+  end
 
-    open_deactivation = scheme_deactivation_periods.deactivations_without_reactivation.first
-    recent_deactivation = scheme_deactivation_periods.order("created_at").last
+  def recent_deactivation
+    scheme_deactivation_periods.order("created_at").last
+  end
 
-    return :deactivated if open_deactivation&.deactivation_date.present? && Time.zone.now >= open_deactivation.deactivation_date
-    return :deactivating_soon if open_deactivation&.deactivation_date.present? && Time.zone.now < open_deactivation.deactivation_date
-    return :reactivating_soon if recent_deactivation&.reactivation_date.present? && Time.zone.now < recent_deactivation.reactivation_date
+  def status(date = Time.zone.now)
+    return :incomplete unless confirmed
+    return :deactivated if open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date
+    return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date
+    return :reactivating_soon if recent_deactivation&.reactivation_date.present? && date < recent_deactivation.reactivation_date
 
     :active
   end
+  alias_method :status_at, :status
 
   def active?
     status == :active
diff --git a/app/models/validations/date_validations.rb b/app/models/validations/date_validations.rb
index 0353abd26..ceec8ed9a 100644
--- a/app/models/validations/date_validations.rb
+++ b/app/models/validations/date_validations.rb
@@ -1,4 +1,6 @@
 module Validations::DateValidations
+  include Validations::SharedValidations
+
   def validate_property_major_repairs(record)
     date_valid?("mrcdate", record)
     if record["startdate"].present? && record["mrcdate"].present? && record["startdate"] < record["mrcdate"]
@@ -59,6 +61,9 @@ module Validations::DateValidations
     if record["mrcdate"].present? && record.startdate < record["mrcdate"]
       record.errors.add :startdate, I18n.t("validations.setup.startdate.after_major_repair_date")
     end
+
+    location_during_startdate_validation(record, :startdate)
+    scheme_during_startdate_validation(record, :startdate)
   end
 
 private
diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb
index 44770c947..c1bdc3a71 100644
--- a/app/models/validations/setup_validations.rb
+++ b/app/models/validations/setup_validations.rb
@@ -1,10 +1,21 @@
 module Validations::SetupValidations
+  include Validations::SharedValidations
+
   def validate_irproduct_other(record)
     if intermediate_product_rent_type?(record) && record.irproduct_other.blank?
       record.errors.add :irproduct_other, I18n.t("validations.setup.intermediate_rent_product_name.blank")
     end
   end
 
+  def validate_location(record)
+    location_during_startdate_validation(record, :location_id)
+  end
+
+  def validate_scheme(record)
+    location_during_startdate_validation(record, :scheme_id)
+    scheme_during_startdate_validation(record, :scheme_id)
+  end
+
 private
 
   def intermediate_product_rent_type?(record)
diff --git a/app/models/validations/shared_validations.rb b/app/models/validations/shared_validations.rb
index 9b4f8a3ff..2694fd743 100644
--- a/app/models/validations/shared_validations.rb
+++ b/app/models/validations/shared_validations.rb
@@ -33,4 +33,39 @@ module Validations::SharedValidations
       end
     end
   end
+
+  def location_during_startdate_validation(record, field)
+    location_inactive_status = inactive_status(record.startdate, record.location)
+
+    if location_inactive_status.present?
+      date, scope, deactivation_date = location_inactive_status.values_at(:date, :scope, :deactivation_date)
+      record.errors.add field, I18n.t("validations.setup.startdate.location.#{scope}", postcode: record.location.postcode, date:, deactivation_date:)
+    end
+  end
+
+  def scheme_during_startdate_validation(record, field)
+    scheme_inactive_status = inactive_status(record.startdate, record.scheme)
+    if scheme_inactive_status.present?
+      date, scope, deactivation_date = scheme_inactive_status.values_at(:date, :scope, :deactivation_date)
+      record.errors.add field, I18n.t("validations.setup.startdate.scheme.#{scope}", name: record.scheme.service_name, date:, deactivation_date:)
+    end
+  end
+
+  def inactive_status(date, resource)
+    return if date.blank? || resource.blank?
+
+    status = resource.status_at(date)
+    return unless %i[reactivating_soon activating_soon deactivated].include?(status)
+
+    closest_reactivation = resource.recent_deactivation
+    open_deactivation = resource.open_deactivation
+
+    date = case status
+           when :reactivating_soon then closest_reactivation.reactivation_date
+           when :activating_soon then resource&.available_from
+           when :deactivated then open_deactivation.deactivation_date
+           end
+
+    { scope: status, date: date&.to_formatted_s(:govuk_date), deactivation_date: closest_reactivation&.deactivation_date&.to_formatted_s(:govuk_date) }
+  end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5a8843e46..43e03c814 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -120,6 +120,14 @@ en:
         before_scheme_end_date: "The tenancy start date must be before the end date for this supported housing scheme"
         after_void_date: "Enter a tenancy start date that is after the void date"
         after_major_repair_date: "Enter a tenancy start date that is after the major repair date"
+        location:
+          deactivated: "The location %{postcode} was deactivated on %{date} and was not available on the day you entered."
+          reactivating_soon: "The location %{postcode} was deactivated on %{deactivation_date} and is not available on the date you entered. It reactivates on %{date}"
+          activating_soon: "The location %{postcode} is not available until %{date}. Enter a tenancy start date after %{date}"
+        scheme:
+          deactivated: "%{name} was deactivated on %{date} and was not available on the day you entered"
+          reactivating_soon: "%{name} was deactivated on %{deactivation_date} and is not available on the date you entered. It reactivates on %{date}"
+          activating_soon: "%{name} is not available until %{date}. Enter a tenancy start date after %{date}"
 
     property:
       mrcdate:
diff --git a/spec/components/check_answers_summary_list_card_component_spec.rb b/spec/components/check_answers_summary_list_card_component_spec.rb
index 6273da69d..6e63c90cd 100644
--- a/spec/components/check_answers_summary_list_card_component_spec.rb
+++ b/spec/components/check_answers_summary_list_card_component_spec.rb
@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe CheckAnswersSummaryListCardComponent, type: :component do
   context "when given a set of questions" do
     let(:user) { FactoryBot.build(:user) }
-    let(:log) { FactoryBot.build(:lettings_log, :completed, age2: 99) }
+    let(:log) { FactoryBot.build(:lettings_log, :completed, age2: 99, startdate: Time.zone.local(2021, 5, 1)) }
     let(:subsection_id) { "household_characteristics" }
     let(:subsection) { log.form.get_subsection(subsection_id) }
     let(:questions) { subsection.applicable_questions(log) }
diff --git a/spec/factories/lettings_log.rb b/spec/factories/lettings_log.rb
index d337bc592..217e8a605 100644
--- a/spec/factories/lettings_log.rb
+++ b/spec/factories/lettings_log.rb
@@ -60,7 +60,7 @@ FactoryBot.define do
       illness { 1 }
       preg_occ { 2 }
       startertenancy { 1 }
-      tenancylength { 5 }
+      tenancylength { nil }
       tenancy { 1 }
       ppostcode_full { Faker::Address.postcode }
       rsnvac { 6 }
@@ -134,7 +134,7 @@ FactoryBot.define do
       property_relet { 0 }
       mrcdate { Time.zone.local(2020, 5, 5, 10, 36, 49) }
       incref { 0 }
-      startdate { Time.utc(2022, 2, 2, 10, 36, 49) }
+      startdate { Time.zone.today }
       armedforces { 1 }
       builtype { 1 }
       unitletas { 2 }
diff --git a/spec/factories/location.rb b/spec/factories/location.rb
index 3359f64cd..870140cd5 100644
--- a/spec/factories/location.rb
+++ b/spec/factories/location.rb
@@ -7,7 +7,7 @@ FactoryBot.define do
     mobility_type { %w[A M N W X].sample }
     location_code { "E09000033" }
     location_admin_district { "Westminster" }
-    startdate { Faker::Date.between(from: 6.months.ago, to: Time.zone.today) }
+    startdate { nil }
     confirmed { true }
     scheme
     trait :export do
diff --git a/spec/factories/scheme.rb b/spec/factories/scheme.rb
index 4a85f2036..031d9b8c1 100644
--- a/spec/factories/scheme.rb
+++ b/spec/factories/scheme.rb
@@ -12,7 +12,7 @@ FactoryBot.define do
     owning_organisation { FactoryBot.create(:organisation) }
     managing_organisation { FactoryBot.create(:organisation) }
     confirmed { true }
-    created_at { Time.zone.now }
+    created_at { Time.zone.local(2021, 4, 1) }
     trait :export do
       sensitive { 1 }
       registered_under_care_act { 1 }
diff --git a/spec/features/form/check_answers_page_spec.rb b/spec/features/form/check_answers_page_spec.rb
index 03d237dd2..5f4665725 100644
--- a/spec/features/form/check_answers_page_spec.rb
+++ b/spec/features/form/check_answers_page_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe "Form Check Answers Page" do
   let(:subsection) { "household-characteristics" }
   let(:conditional_subsection) { "conditional-question" }
   let(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) }
-  let(:location) { FactoryBot.create(:location, scheme:, mobility_type: "N") }
+  let(:location) { FactoryBot.create(:location, scheme:, mobility_type: "N", startdate: Time.zone.local(2021, 4, 1)) }
 
   let(:lettings_log) do
     FactoryBot.create(
@@ -36,6 +36,7 @@ RSpec.describe "Form Check Answers Page" do
       :completed,
       owning_organisation: user.organisation,
       managing_organisation: user.organisation,
+      startdate: Time.zone.local(2021, 5, 1),
     )
   end
   let(:id) { lettings_log.id }
diff --git a/spec/features/form/validations_spec.rb b/spec/features/form/validations_spec.rb
index 54d4f1a48..0790096e2 100644
--- a/spec/features/form/validations_spec.rb
+++ b/spec/features/form/validations_spec.rb
@@ -28,6 +28,7 @@ RSpec.describe "validations" do
       managing_organisation: user.organisation,
       status: 1,
       declaration: nil,
+      startdate: Time.zone.local(2021, 5, 1),
     )
   end
   let(:id) { lettings_log.id }
diff --git a/spec/fixtures/files/lettings_logs_download.csv b/spec/fixtures/files/lettings_logs_download.csv
index f16b5f8ad..18c679926 100644
--- a/spec/fixtures/files/lettings_logs_download.csv
+++ b/spec/fixtures/files/lettings_logs_download.csv
@@ -1,2 +1,2 @@
 id,status,created_at,updated_at,created_by_name,is_dpo,owning_organisation_name,managing_organisation_name,collection_start_year,needstype,renewal,startdate,rent_type_detail,irproduct_other,tenancycode,propcode,age1,sex1,ecstat1,hhmemb,relat2,age2,sex2,retirement_value_check,ecstat2,armedforces,leftreg,illness,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_h,is_previous_la_inferred,prevloc_label,prevloc,illness_type_1,illness_type_2,is_la_inferred,la_label,la,postcode_known,postcode_full,previous_la_known,wchair,preg_occ,cbl,earnings,incfreq,net_income_value_check,benefits,hb,period,brent,scharge,pscharge,supcharg,tcharge,offered,layear,ppostcode_full,mrcdate,declaration,ethnic,national,prevten,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,reservist,startertenancy,tenancylength,tenancy,rsnvac,unittype_gn,beds,waityear,reasonpref,chr,cap,reasonother,housingneeds_f,housingneeds_g,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,property_owner_organisation,property_manager_organisation,purchaser_code,reason,majorrepairs,hbrentshortfall,property_relet,incref,first_time_property_let_as_social_housing,unitletas,builtype,voiddate,renttype,lettype,totchild,totelder,totadult,net_income_known,nocharge,is_carehome,household_charge,referral,tshortfall,chcharge,ppcodenk,age1_known,age2_known,age3_known,age4_known,age5_known,age6_known,age7_known,age8_known,ethnic_group,letting_allocation_unknown,details_known_2,details_known_3,details_known_4,details_known_5,details_known_6,details_known_7,details_known_8,has_benefits,wrent,wscharge,wpschrge,wsupchrg,wtcharge,wtshortfall,refused,housingneeds,wchchrg,newprop,relat3,relat4,relat5,relat6,relat7,relat8,rent_value_check,old_form_id,lar,irproduct,old_id,joint,illness_type_0,tshortfall_known,sheltered,pregnancy_value_check,hhtype,new_old,vacdays,major_repairs_date_value_check,void_date_value_check,housingneeds_type,housingneeds_other,unittype_sh,scheme_code,scheme_service_name,scheme_sensitive,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_managing_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate
-{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,No,DLUHC,DLUHC,2021,Supported housing,,2 October 2021,London Affordable Rent,,,,,,,,,,,,,,,,,,,,No,,,,,No,Westminster,E09000033,,SE1 1TE,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,8,0,0,0,,0,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,0,,,,,,,,,,,,,,,,,,,,9,1,,,,,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},Missing,No,DLUHC,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2022-06-05 01:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,Bungalow,Fitted with equipment and adaptations,Westminster,{location_startdate}
+{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,No,DLUHC,DLUHC,2021,Supported housing,,2 October 2021,London Affordable Rent,,,,,,,,,,,,,,,,,,,,No,,,,,No,Westminster,E09000033,,SE1 1TE,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,8,0,0,0,,0,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,,0,,,,,,,,,,,,,,,,,,,,9,1,,,,,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},Missing,No,DLUHC,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,Bungalow,Fitted with equipment and adaptations,Westminster,{location_startdate}
diff --git a/spec/fixtures/files/lettings_logs_download_non_support.csv b/spec/fixtures/files/lettings_logs_download_non_support.csv
index ae0beeee0..0687c536e 100644
--- a/spec/fixtures/files/lettings_logs_download_non_support.csv
+++ b/spec/fixtures/files/lettings_logs_download_non_support.csv
@@ -1,2 +1,2 @@
 id,status,created_at,updated_at,created_by_name,is_dpo,owning_organisation_name,managing_organisation_name,collection_start_year,renewal,startdate,irproduct_other,tenancycode,propcode,age1,sex1,ecstat1,relat2,age2,sex2,ecstat2,armedforces,leftreg,illness,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_h,prevloc_label,illness_type_1,illness_type_2,la_label,postcode_full,wchair,preg_occ,cbl,earnings,incfreq,benefits,hb,period,brent,scharge,pscharge,supcharg,tcharge,offered,layear,ppostcode_full,mrcdate,declaration,ethnic,national,prevten,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,reservist,startertenancy,tenancylength,tenancy,rsnvac,unittype_gn,beds,waityear,reasonpref,chr,cap,reasonother,housingneeds_f,housingneeds_g,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,property_owner_organisation,property_manager_organisation,purchaser_code,reason,majorrepairs,hbrentshortfall,property_relet,incref,unitletas,builtype,voiddate,lettype,nocharge,household_charge,referral,tshortfall,chcharge,ppcodenk,ethnic_group,has_benefits,refused,housingneeds,wchchrg,newprop,relat3,relat4,relat5,relat6,relat7,relat8,lar,irproduct,joint,illness_type_0,sheltered,major_repairs_date_value_check,void_date_value_check,housingneeds_type,housingneeds_other,unittype_sh,scheme_code,scheme_service_name,scheme_sensitive,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_managing_organisation_name,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,location_code,location_postcode,location_name,location_units,location_type_of_unit,location_mobility_type,location_admin_district,location_startdate
-{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,No,DLUHC,DLUHC,2021,,2 October 2021,,,,,,,,,,,,,,,,,,,,,Westminster,SE1 1TE,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,0,,,,,,,0,0,,,,,,,,,,,,,,,,,,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},Missing,No,DLUHC,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2022-06-05 01:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,Bungalow,Fitted with equipment and adaptations,Westminster,{location_startdate}
+{id},in_progress,2022-02-08 16:52:15 +0000,2022-02-08 16:52:15 +0000,Danny Rojas,No,DLUHC,DLUHC,2021,,2 October 2021,,,,,,,,,,,,,,,,,,,,,Westminster,SE1 1TE,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,0,,,,,,,0,0,,,,,,,,,,,,,,,,,,,6,{scheme_code},{scheme_service_name},{scheme_sensitive},Missing,No,DLUHC,DLUHC,{scheme_primary_client_group},,{scheme_secondary_client_group},{scheme_support_type},{scheme_intended_stay},2021-04-01 00:00:00 +0100,{location_code},SE1 1TE,Downing Street,20,Bungalow,Fitted with equipment and adaptations,Westminster,{location_startdate}
diff --git a/spec/helpers/schemes_helper_spec.rb b/spec/helpers/schemes_helper_spec.rb
index 96f472457..b1e9f9c96 100644
--- a/spec/helpers/schemes_helper_spec.rb
+++ b/spec/helpers/schemes_helper_spec.rb
@@ -2,7 +2,7 @@ require "rails_helper"
 
 RSpec.describe SchemesHelper do
   describe "Active periods" do
-    let(:scheme) { FactoryBot.create(:scheme) }
+    let(:scheme) { FactoryBot.create(:scheme, created_at: Time.zone.today) }
 
     before do
       Timecop.freeze(2022, 10, 10)
diff --git a/spec/jobs/email_csv_job_spec.rb b/spec/jobs/email_csv_job_spec.rb
index aa27c421b..f4939b855 100644
--- a/spec/jobs/email_csv_job_spec.rb
+++ b/spec/jobs/email_csv_job_spec.rb
@@ -33,7 +33,8 @@ describe EmailCsvJob do
                         :completed,
                         owning_organisation: organisation,
                         managing_organisation: organisation,
-                        created_by: user)
+                        created_by: user,
+                        startdate: Time.zone.local(2021, 5, 1))
 
       allow(Storage::S3Service).to receive(:new).and_return(storage_service)
       allow(storage_service).to receive(:write_file)
diff --git a/spec/models/lettings_log_spec.rb b/spec/models/lettings_log_spec.rb
index 45a24b964..15936b767 100644
--- a/spec/models/lettings_log_spec.rb
+++ b/spec/models/lettings_log_spec.rb
@@ -1672,7 +1672,7 @@ RSpec.describe LettingsLog do
         let(:scheme) { FactoryBot.create(:scheme) }
         let!(:location) { FactoryBot.create(:location, scheme:) }
 
-        before { lettings_log.update!(scheme:) }
+        before { lettings_log.update!(startdate: Time.zone.local(2022, 4, 2), scheme:) }
 
         it "derives the scheme location" do
           record_from_db = ActiveRecord::Base.connection.execute("select location_id from lettings_logs where id=#{lettings_log.id}").to_a[0]
@@ -2375,7 +2375,7 @@ RSpec.describe LettingsLog do
 
   describe "csv download" do
     let(:scheme) { FactoryBot.create(:scheme) }
-    let(:location) { FactoryBot.create(:location, :export, scheme:, type_of_unit: 6, postcode: "SE11TE") }
+    let(:location) { FactoryBot.create(:location, :export, scheme:, type_of_unit: 6, postcode: "SE11TE", startdate: Time.zone.local(2021, 10, 1)) }
     let(:user) { FactoryBot.create(:user, organisation: location.scheme.owning_organisation) }
     let(:expected_content) { csv_export_file.read }
 
diff --git a/spec/models/validations/date_validations_spec.rb b/spec/models/validations/date_validations_spec.rb
index 0b20ab07a..87351b9dd 100644
--- a/spec/models/validations/date_validations_spec.rb
+++ b/spec/models/validations/date_validations_spec.rb
@@ -83,6 +83,153 @@ RSpec.describe Validations::DateValidations do
       date_validator.validate_startdate(record)
       expect(record.errors["startdate"]).to be_empty
     end
+
+    context "with a deactivated location" do
+      let(:scheme) { create(:scheme) }
+      let(:location) { create(:location, scheme:, startdate: nil) }
+
+      before do
+        create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), location:)
+        location.reload
+      end
+
+      it "produces error when tenancy start date is during deactivated location period" do
+        record.startdate = Time.zone.local(2022, 7, 5)
+        record.location = location
+        date_validator.validate_startdate(record)
+        expect(record.errors["startdate"])
+        .to include(match I18n.t("validations.setup.startdate.location.deactivated", postcode: location.postcode, date: "4 June 2022"))
+      end
+
+      it "produces no error when tenancy start date is during an active location period" do
+        record.startdate = Time.zone.local(2022, 6, 1)
+        record.location = location
+        date_validator.validate_startdate(record)
+        expect(record.errors["startdate"]).to be_empty
+      end
+    end
+
+    context "with a location that is reactivating soon" do
+      let(:scheme) { create(:scheme) }
+      let(:location) { create(:location, scheme:, startdate: nil) }
+
+      before do
+        create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), reactivation_date: Time.zone.local(2022, 8, 4), location:)
+        location.reload
+      end
+
+      it "produces error when tenancy start date is during deactivated location period" do
+        record.startdate = Time.zone.local(2022, 7, 5)
+        record.location = location
+        date_validator.validate_startdate(record)
+        expect(record.errors["startdate"])
+        .to include(match I18n.t("validations.setup.startdate.location.reactivating_soon", postcode: location.postcode, date: "4 August 2022", deactivation_date: "4 June 2022"))
+      end
+
+      it "produces no error when tenancy start date is during an active location period" do
+        record.startdate = Time.zone.local(2022, 9, 1)
+        record.location = location
+        date_validator.validate_startdate(record)
+        expect(record.errors["startdate"]).to be_empty
+      end
+    end
+
+    context "with a location that has many reactivations soon" do
+      let(:scheme) { create(:scheme) }
+      let(:location) { create(:location, scheme:, startdate: nil) }
+
+      before do
+        create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), reactivation_date: Time.zone.local(2022, 8, 4), location:)
+        create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 2), reactivation_date: Time.zone.local(2022, 8, 3), location:)
+        create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 1), reactivation_date: Time.zone.local(2022, 9, 4), location:)
+        location.reload
+      end
+
+      it "produces error when tenancy start date is during deactivated location period" do
+        record.startdate = Time.zone.local(2022, 7, 5)
+        record.location = location
+        date_validator.validate_startdate(record)
+        expect(record.errors["startdate"])
+        .to include(match I18n.t("validations.setup.startdate.location.reactivating_soon", postcode: location.postcode, date: "4 September 2022", deactivation_date: "1 June 2022"))
+      end
+
+      it "produces no error when tenancy start date is during an active location period" do
+        record.startdate = Time.zone.local(2022, 10, 1)
+        record.location = location
+        date_validator.validate_startdate(record)
+        expect(record.errors["startdate"]).to be_empty
+      end
+    end
+
+    context "with a location with no deactivation periods" do
+      let(:scheme) { create(:scheme) }
+      let(:location) { create(:location, scheme:, startdate: Time.zone.local(2022, 9, 15)) }
+
+      it "produces no error" do
+        record.startdate = Time.zone.local(2022, 10, 15)
+        record.location = location
+        date_validator.validate_startdate(record)
+        expect(record.errors["startdate"]).to be_empty
+      end
+
+      it "produces an error when the date is before available_from date" do
+        record.startdate = Time.zone.local(2022, 8, 15)
+        record.location = location
+        date_validator.validate_startdate(record)
+        expect(record.errors["startdate"])
+        .to include(match I18n.t("validations.setup.startdate.location.activating_soon", postcode: location.postcode, date: "15 September 2022"))
+      end
+    end
+
+    context "with a scheme that is reactivating soon" do
+      let(:scheme) { create(:scheme) }
+
+      before do
+        create(:scheme_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), reactivation_date: Time.zone.local(2022, 8, 4), scheme:)
+        scheme.reload
+      end
+
+      it "produces error when tenancy start date is during deactivated scheme period" do
+        record.startdate = Time.zone.local(2022, 7, 5)
+        record.scheme = scheme
+        date_validator.validate_startdate(record)
+        expect(record.errors["startdate"])
+        .to include(match I18n.t("validations.setup.startdate.scheme.reactivating_soon", name: scheme.service_name, date: "4 August 2022", deactivation_date: "4 June 2022"))
+      end
+
+      it "produces no error when tenancy start date is during an active scheme period" do
+        record.startdate = Time.zone.local(2022, 9, 1)
+        record.scheme = scheme
+        date_validator.validate_startdate(record)
+        expect(record.errors["startdate"]).to be_empty
+      end
+    end
+
+    context "with a scheme that has many reactivations soon" do
+      let(:scheme) { create(:scheme) }
+
+      before do
+        create(:scheme_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), reactivation_date: Time.zone.local(2022, 8, 4), scheme:)
+        create(:scheme_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 2), reactivation_date: Time.zone.local(2022, 8, 3), scheme:)
+        create(:scheme_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 1), reactivation_date: Time.zone.local(2022, 9, 4), scheme:)
+        scheme.reload
+      end
+
+      it "produces error when tenancy start date is during deactivated scheme period" do
+        record.startdate = Time.zone.local(2022, 7, 5)
+        record.scheme = scheme
+        date_validator.validate_startdate(record)
+        expect(record.errors["startdate"])
+        .to include(match I18n.t("validations.setup.startdate.scheme.reactivating_soon", name: scheme.service_name, date: "4 September 2022", deactivation_date: "1 June 2022"))
+      end
+
+      it "produces no error when tenancy start date is during an active scheme period" do
+        record.startdate = Time.zone.local(2022, 10, 1)
+        record.scheme = scheme
+        date_validator.validate_startdate(record)
+        expect(record.errors["startdate"]).to be_empty
+      end
+    end
   end
 
   describe "major repairs date" do
diff --git a/spec/models/validations/setup_validations_spec.rb b/spec/models/validations/setup_validations_spec.rb
index 378aef904..fa95757c4 100644
--- a/spec/models/validations/setup_validations_spec.rb
+++ b/spec/models/validations/setup_validations_spec.rb
@@ -30,4 +30,198 @@ RSpec.describe Validations::SetupValidations do
       expect(record.errors["irproduct_other"]).to be_empty
     end
   end
+
+  describe "#validate_scheme" do
+    context "with a deactivated location" do
+      let(:scheme) { create(:scheme) }
+      let(:location) { create(:location, scheme:, startdate: nil) }
+
+      before do
+        create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), location:)
+        location.reload
+      end
+
+      it "produces error when tenancy start date is during deactivated location period" do
+        record.startdate = Time.zone.local(2022, 7, 5)
+        record.location = location
+        setup_validator.validate_scheme(record)
+        expect(record.errors["scheme_id"])
+        .to include(match I18n.t("validations.setup.startdate.location.deactivated", postcode: location.postcode, date: "4 June 2022"))
+      end
+
+      it "produces no error when tenancy start date is during an active location period" do
+        record.startdate = Time.zone.local(2022, 6, 1)
+        record.location = location
+        setup_validator.validate_scheme(record)
+        expect(record.errors["scheme_id"]).to be_empty
+      end
+    end
+
+    context "with a location that is reactivating soon" do
+      let(:scheme) { create(:scheme) }
+      let(:location) { create(:location, scheme:, startdate: nil) }
+
+      before do
+        create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), reactivation_date: Time.zone.local(2022, 8, 4), location:)
+        location.reload
+      end
+
+      it "produces error when tenancy start date is during deactivated location period" do
+        record.startdate = Time.zone.local(2022, 7, 5)
+        record.location = location
+        setup_validator.validate_scheme(record)
+        expect(record.errors["scheme_id"])
+        .to include(match I18n.t("validations.setup.startdate.location.reactivating_soon", postcode: location.postcode, date: "4 August 2022", deactivation_date: "4 June 2022"))
+      end
+
+      it "produces no error when tenancy start date is during an active location period" do
+        record.startdate = Time.zone.local(2022, 9, 1)
+        record.location = location
+        setup_validator.validate_scheme(record)
+        expect(record.errors["scheme_id"]).to be_empty
+      end
+    end
+
+    context "with a location with no deactivation periods" do
+      let(:scheme) { create(:scheme, created_at: Time.zone.local(2022, 10, 3)) }
+      let(:location) { create(:location, scheme:, startdate: Time.zone.local(2022, 9, 15)) }
+
+      it "produces no error" do
+        record.startdate = Time.zone.local(2022, 10, 15)
+        record.location = location
+        setup_validator.validate_scheme(record)
+        expect(record.errors["scheme_id"]).to be_empty
+      end
+
+      it "produces an error when the date is before available_from date" do
+        record.startdate = Time.zone.local(2022, 8, 15)
+        record.location = location
+        setup_validator.validate_scheme(record)
+        expect(record.errors["scheme_id"])
+        .to include(match I18n.t("validations.setup.startdate.location.activating_soon", postcode: location.postcode, date: "15 September 2022"))
+      end
+    end
+
+    context "with a scheme that is reactivating soon" do
+      let(:scheme) { create(:scheme, created_at: Time.zone.local(2022, 4, 1)) }
+
+      before do
+        create(:scheme_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), reactivation_date: Time.zone.local(2022, 8, 4), scheme:)
+        scheme.reload
+      end
+
+      it "produces error when tenancy start date is during deactivated scheme period" do
+        record.startdate = Time.zone.local(2022, 7, 5)
+        record.scheme = scheme
+        setup_validator.validate_scheme(record)
+        expect(record.errors["scheme_id"])
+        .to include(match I18n.t("validations.setup.startdate.scheme.reactivating_soon", name: scheme.service_name, date: "4 August 2022", deactivation_date: "4 June 2022"))
+      end
+
+      it "produces no error when tenancy start date is during an active scheme period" do
+        record.startdate = Time.zone.local(2022, 9, 1)
+        record.scheme = scheme
+        setup_validator.validate_scheme(record)
+        expect(record.errors["scheme_id"]).to be_empty
+      end
+    end
+
+    context "with a scheme that has many reactivations soon" do
+      let(:scheme) { create(:scheme, created_at: Time.zone.local(2022, 4, 1)) }
+
+      before do
+        create(:scheme_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), reactivation_date: Time.zone.local(2022, 8, 4), scheme:)
+        create(:scheme_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 2), reactivation_date: Time.zone.local(2022, 8, 3), scheme:)
+        create(:scheme_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 1), reactivation_date: Time.zone.local(2022, 9, 4), scheme:)
+        scheme.reload
+      end
+
+      it "produces error when tenancy start date is during deactivated scheme period" do
+        record.startdate = Time.zone.local(2022, 7, 5)
+        record.scheme = scheme
+        setup_validator.validate_scheme(record)
+        expect(record.errors["scheme_id"])
+        .to include(match I18n.t("validations.setup.startdate.scheme.reactivating_soon", name: scheme.service_name, date: "4 September 2022", deactivation_date: "1 June 2022"))
+      end
+
+      it "produces no error when tenancy start date is during an active scheme period" do
+        record.startdate = Time.zone.local(2022, 10, 1)
+        record.scheme = scheme
+        setup_validator.validate_scheme(record)
+        expect(record.errors["scheme_id"]).to be_empty
+      end
+    end
+  end
+
+  describe "#validate_location" do
+    context "with a deactivated location" do
+      let(:scheme) { create(:scheme) }
+      let(:location) { create(:location, scheme:, startdate: nil) }
+
+      before do
+        create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), location:)
+        location.reload
+      end
+
+      it "produces error when tenancy start date is during deactivated location period" do
+        record.startdate = Time.zone.local(2022, 7, 5)
+        record.location = location
+        setup_validator.validate_location(record)
+        expect(record.errors["location_id"])
+        .to include(match I18n.t("validations.setup.startdate.location.deactivated", postcode: location.postcode, date: "4 June 2022"))
+      end
+
+      it "produces no error when tenancy start date is during an active location period" do
+        record.startdate = Time.zone.local(2022, 6, 1)
+        record.location = location
+        setup_validator.validate_location(record)
+        expect(record.errors["location_id"]).to be_empty
+      end
+    end
+
+    context "with a location that is reactivating soon" do
+      let(:scheme) { create(:scheme) }
+      let(:location) { create(:location, scheme:, startdate: nil) }
+
+      before do
+        create(:location_deactivation_period, deactivation_date: Time.zone.local(2022, 6, 4), reactivation_date: Time.zone.local(2022, 8, 4), location:)
+        location.reload
+      end
+
+      it "produces error when tenancy start date is during deactivated location period" do
+        record.startdate = Time.zone.local(2022, 7, 5)
+        record.location = location
+        setup_validator.validate_location(record)
+        expect(record.errors["location_id"])
+        .to include(match I18n.t("validations.setup.startdate.location.reactivating_soon", postcode: location.postcode, date: "4 August 2022", deactivation_date: "4 June 2022"))
+      end
+
+      it "produces no error when tenancy start date is during an active location period" do
+        record.startdate = Time.zone.local(2022, 9, 1)
+        record.location = location
+        setup_validator.validate_location(record)
+        expect(record.errors["location_id"]).to be_empty
+      end
+    end
+
+    context "with a location with no deactivation periods" do
+      let(:scheme) { create(:scheme) }
+      let(:location) { create(:location, scheme:, startdate: Time.zone.local(2022, 9, 15)) }
+
+      it "produces no error" do
+        record.startdate = Time.zone.local(2022, 10, 15)
+        record.location = location
+        setup_validator.validate_location(record)
+        expect(record.errors["location_id"]).to be_empty
+      end
+
+      it "produces an error when the date is before available_from date" do
+        record.startdate = Time.zone.local(2022, 8, 15)
+        record.location = location
+        setup_validator.validate_location(record)
+        expect(record.errors["location_id"])
+        .to include(match I18n.t("validations.setup.startdate.location.activating_soon", postcode: location.postcode, date: "15 September 2022"))
+      end
+    end
+  end
 end
diff --git a/spec/requests/form_controller_spec.rb b/spec/requests/form_controller_spec.rb
index 1bb73f399..a7f374f27 100644
--- a/spec/requests/form_controller_spec.rb
+++ b/spec/requests/form_controller_spec.rb
@@ -28,6 +28,7 @@ RSpec.describe FormController, type: :request do
       :completed,
       owning_organisation: organisation,
       managing_organisation: organisation,
+      startdate: Time.zone.local(2021, 5, 1),
     )
   end
   let(:headers) { { "Accept" => "text/html" } }
diff --git a/spec/requests/locations_controller_spec.rb b/spec/requests/locations_controller_spec.rb
index b1cffd3bf..1c3c47219 100644
--- a/spec/requests/locations_controller_spec.rb
+++ b/spec/requests/locations_controller_spec.rb
@@ -847,7 +847,7 @@ RSpec.describe LocationsController, type: :request do
     context "when signed in as a data coordinator user" do
       let(:user) { FactoryBot.create(:user, :data_coordinator) }
       let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) }
-      let!(:locations) { FactoryBot.create_list(:location, 3, scheme:) }
+      let!(:locations) { FactoryBot.create_list(:location, 3, scheme:, startdate: Time.zone.local(2022, 4, 1)) }
 
       before do
         sign_in user
@@ -858,7 +858,7 @@ RSpec.describe LocationsController, type: :request do
         let!(:another_scheme) { FactoryBot.create(:scheme) }
 
         before do
-          FactoryBot.create(:location, scheme:)
+          FactoryBot.create(:location, scheme:, startdate: Time.zone.local(2022, 4, 1))
         end
 
         it "returns 404 not found" do
@@ -874,7 +874,7 @@ RSpec.describe LocationsController, type: :request do
           expect(page).to have_content(location.type_of_unit)
           expect(page).to have_content(location.mobility_type)
           expect(page).to have_content(location.location_admin_district)
-          expect(page).to have_content(location.startdate&.to_formatted_s(:govuk_date))
+          expect(page).to have_content(location.startdate.to_formatted_s(:govuk_date))
         end
       end
 
@@ -964,7 +964,7 @@ RSpec.describe LocationsController, type: :request do
     context "when signed in as a support user" do
       let(:user) { FactoryBot.create(:user, :support) }
       let!(:scheme) { FactoryBot.create(:scheme) }
-      let!(:locations) { FactoryBot.create_list(:location, 3, scheme:) }
+      let!(:locations) { FactoryBot.create_list(:location, 3, scheme:, startdate: Time.zone.local(2022, 4, 1)) }
 
       before do
         allow(user).to receive(:need_two_factor_authentication?).and_return(false)
@@ -977,7 +977,7 @@ RSpec.describe LocationsController, type: :request do
           expect(page).to have_content(location.id)
           expect(page).to have_content(location.postcode)
           expect(page).to have_content(location.type_of_unit)
-          expect(page).to have_content(location.startdate&.to_formatted_s(:govuk_date))
+          expect(page).to have_content(location.startdate.to_formatted_s(:govuk_date))
         end
       end
 
diff --git a/spec/requests/schemes_controller_spec.rb b/spec/requests/schemes_controller_spec.rb
index 4de927f8f..0769e15c6 100644
--- a/spec/requests/schemes_controller_spec.rb
+++ b/spec/requests/schemes_controller_spec.rb
@@ -1767,7 +1767,7 @@ RSpec.describe SchemesController, type: :request do
 
     context "when signed in as a data coordinator" do
       let(:user) { FactoryBot.create(:user, :data_coordinator) }
-      let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) }
+      let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation, created_at: Time.zone.today) }
       let!(:location) { FactoryBot.create(:location, scheme:) }
       let(:deactivation_date) { Time.utc(2022, 10, 10) }
       let!(:lettings_log) { FactoryBot.create(:lettings_log, :sh, location:, scheme:, startdate:, owning_organisation: user.organisation) }
diff --git a/spec/services/exports/lettings_log_export_service_spec.rb b/spec/services/exports/lettings_log_export_service_spec.rb
index 044fe6c93..71ad30400 100644
--- a/spec/services/exports/lettings_log_export_service_spec.rb
+++ b/spec/services/exports/lettings_log_export_service_spec.rb
@@ -59,7 +59,7 @@ RSpec.describe Exports::LettingsLogExportService do
     end
 
     context "and one lettings log is available for export" do
-      let!(:lettings_log) { FactoryBot.create(:lettings_log, :completed, propcode: "123", ppostcode_full: "SE2 6RT", postcode_full: "NW1 5TY", tenancycode: "BZ737") }
+      let!(:lettings_log) { FactoryBot.create(:lettings_log, :completed, propcode: "123", ppostcode_full: "SE2 6RT", postcode_full: "NW1 5TY", tenancycode: "BZ737", startdate: Time.utc(2022, 2, 2, 10, 36, 49), tenancylength: 5) }
 
       it "generates a ZIP export file with the expected filename" do
         expect(storage_service).to receive(:write_file).with(expected_zip_filename, any_args)
@@ -237,7 +237,7 @@ RSpec.describe Exports::LettingsLogExportService do
     let(:csv_export_file) { File.open("spec/fixtures/exports/general_needs_log.csv", "r:UTF-8") }
     let(:expected_csv_filename) { "export_2022_05_01.csv" }
 
-    let(:lettings_log) { FactoryBot.create(:lettings_log, :completed, propcode: "123", ppostcode_full: "SE2 6RT", postcode_full: "NW1 5TY", tenancycode: "BZ737") }
+    let(:lettings_log) { FactoryBot.create(:lettings_log, :completed, propcode: "123", ppostcode_full: "SE2 6RT", postcode_full: "NW1 5TY", tenancycode: "BZ737", startdate: Time.utc(2022, 2, 2, 10, 36, 49), tenancylength: 5) }
 
     it "generates an CSV export file with the expected content" do
       expected_content = replace_entity_ids(lettings_log, csv_export_file.read)
@@ -254,9 +254,9 @@ RSpec.describe Exports::LettingsLogExportService do
     let(:organisation) { FactoryBot.create(:organisation, provider_type: "LA") }
     let(:user) { FactoryBot.create(:user, organisation:) }
     let(:scheme) { FactoryBot.create(:scheme, :export, owning_organisation: organisation) }
-    let(:location) { FactoryBot.create(:location, :export, scheme:) }
+    let(:location) { FactoryBot.create(:location, :export, scheme:, startdate: Time.zone.local(2021, 4, 1)) }
 
-    let(:lettings_log) { FactoryBot.create(:lettings_log, :completed, :export, :sh, scheme:, location:, created_by: user, owning_organisation: organisation) }
+    let(:lettings_log) { FactoryBot.create(:lettings_log, :completed, :export, :sh, scheme:, location:, created_by: user, owning_organisation: organisation, startdate: Time.utc(2022, 2, 2, 10, 36, 49)) }
 
     it "generates an XML export file with the expected content" do
       expected_content = replace_entity_ids(lettings_log, export_file.read)
diff --git a/spec/services/imports/lettings_logs_import_service_spec.rb b/spec/services/imports/lettings_logs_import_service_spec.rb
index 453ee7e30..acb9d9dd4 100644
--- a/spec/services/imports/lettings_logs_import_service_spec.rb
+++ b/spec/services/imports/lettings_logs_import_service_spec.rb
@@ -30,9 +30,9 @@ RSpec.describe Imports::LettingsLogsImportService do
     FactoryBot.create(:user, old_user_id: "e29c492473446dca4d50224f2bb7cf965a261d6f", organisation:)
 
     # Location setup
-    FactoryBot.create(:location, old_visible_id: "10", postcode: "LS166FT", scheme_id: scheme1.id, mobility_type: "W")
-    FactoryBot.create(:location, scheme_id: scheme1.id)
-    FactoryBot.create(:location, old_visible_id: "10", postcode: "LS166FT", scheme_id: scheme2.id, mobility_type: "W")
+    FactoryBot.create(:location, old_visible_id: "10", postcode: "LS166FT", scheme_id: scheme1.id, mobility_type: "W", startdate: Time.zone.local(2021, 4, 1))
+    FactoryBot.create(:location, scheme_id: scheme1.id, startdate: Time.zone.local(2021, 4, 1))
+    FactoryBot.create(:location, old_visible_id: "10", postcode: "LS166FT", scheme_id: scheme2.id, mobility_type: "W", startdate: Time.zone.local(2021, 4, 1))
 
     # Stub the form handler to use the real form
     allow(FormHandler.instance).to receive(:get_form).with("previous_lettings").and_return(real_2021_2022_form)