From e125a698dd5136e5fa1702295056d0b995b17fc0 Mon Sep 17 00:00:00 2001
From: SamSeed-Softwire <63662292+SamSeed-Softwire@users.noreply.github.com>
Date: Tue, 29 Nov 2022 17:02:00 +0000
Subject: [PATCH 1/8] Add troubleshooting review apps section to docs (#1041)

* docs: add troubleshooting review apps section

* docs: rename overall section title

Co-authored-by: James Rose <james@jbpr.net>

* docs: fix typos

Co-authored-by: James Rose <james@jbpr.net>

Co-authored-by: James Rose <james@jbpr.net>
---
 docs/infrastructure.md | 51 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/docs/infrastructure.md b/docs/infrastructure.md
index 63bbf2e42..81dc3f165 100644
--- a/docs/infrastructure.md
+++ b/docs/infrastructure.md
@@ -122,6 +122,57 @@ After a sucessful deployment a comment will be added to the pull request with th
 
 Once a pull request has been closed the review app infrastructure will be tore down to save on any costs. Should you wish to re-open a closed pull request the review app will be spun up again.
 
+### How to fix review app deployment failures 
+
+One reason a review app deployment might fail is that it is attempting to run migrations which conflict with data in the database. For example you might have introduced a unique constraint, but the database associated with the review app has duplicate data in it that would violate this constraint, and so the migration cannot be run. There are two main ways to remedy this:
+
+**Method 1 - Edit database via console**
+1. Log in to Cloud Foundry
+    ```bash
+    cf login -a api.london.cloud.service.gov.uk -u <your_username>
+    ```
+    * Your username should be the email address you signed up to GOVUK PaaS with.
+    * Choose the dev environment whilst logging in.
+2. If you were already logged in then Cloud Foundry, then instead just target the dev environment
+    ```bash
+    cf target -o dluhc-core -s dev
+    ```
+3. Find the name of your app
+    ```bash
+    cf apps
+    ```
+    * The app name will be in this format: `dluhc-core-review-<pull-request-number>`.
+4. Open a console for your app
+    ```bash
+    cf ssh <app-name-here> -t -c "/tmp/lifecycle/launcher /home/vcap/app 'rails console' ''"
+    ```
+5. Edit the database as appropriate, e.g. delete dodgy data and recreate correctly
+
+**Method 2 - Nuke and restart**
+
+1. Find the name of your app
+    ```bash
+    cf apps
+    ```
+    * The app name will be in this format: `dluhc-core-review-<pull-request-number>`.
+2. Delete the app
+    ```bash
+    cf delete <app-name-here>
+    ```
+3. Find the name of the matching Postgres service
+	```bash
+    cf services
+    ```
+	* The service name will be in this format: `dluhc-core-review-<pull-request-number>-postgres`.
+4. Delete the service
+	```bash
+    cf delete-service <service-name-here>
+    ```
+    * Use `cf services` or `cf service <service-name-here>` to check the operation status.
+    * There's no need to delete the Redis service.
+5. Re-run the whole review app pipeline in GitHub
+    * If it fails it's likely that the deletion from the previous step hadn't completed yet. So just wait a few minutes and re-run the pipeline again.
+
 ## Setting up Infrastructure for a new environment
 
 ### Staging

From a91c8da62ee9de5ce6be6f21b1cd02c617e78a57 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Wed, 30 Nov 2022 11:07:24 +0000
Subject: [PATCH 2/8] Update available_from methods (#1026)

* Update available_from methods

* Move collection start date logic to form handler
---
 app/models/form_handler.rb            |  5 +++
 app/models/location.rb                |  4 ++-
 app/models/scheme.rb                  |  2 +-
 spec/helpers/locations_helper_spec.rb |  4 +--
 spec/models/location_spec.rb          | 44 +++++++++++++++++++++++++++
 spec/models/scheme_spec.rb            | 34 +++++++++++++++++++++
 6 files changed, 89 insertions(+), 4 deletions(-)

diff --git a/app/models/form_handler.rb b/app/models/form_handler.rb
index 61b981436..03de5e290 100644
--- a/app/models/form_handler.rb
+++ b/app/models/form_handler.rb
@@ -49,6 +49,11 @@ class FormHandler
     today < window_end_date ? today.year - 1 : today.year
   end
 
+  def collection_start_date(date)
+    window_end_date = Time.zone.local(date.year, 4, 1)
+    date < window_end_date ? Time.zone.local(date.year - 1, 4, 1) : Time.zone.local(date.year, 4, 1)
+  end
+
   def current_collection_start_date
     Time.zone.local(current_collection_start_year, 4, 1)
   end
diff --git a/app/models/location.rb b/app/models/location.rb
index 46cb1da6c..4fa161e0b 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -370,7 +370,9 @@ class Location < ApplicationRecord
   end
 
   def available_from
-    startdate || [created_at, FormHandler.instance.current_collection_start_date].min
+    return startdate if startdate.present?
+
+    FormHandler.instance.collection_start_date(created_at)
   end
 
   def status
diff --git a/app/models/scheme.rb b/app/models/scheme.rb
index fce696bb6..73aecd6ac 100644
--- a/app/models/scheme.rb
+++ b/app/models/scheme.rb
@@ -210,7 +210,7 @@ class Scheme < ApplicationRecord
   end
 
   def available_from
-    [created_at, FormHandler.instance.current_collection_start_date].min
+    FormHandler.instance.collection_start_date(created_at)
   end
 
   def status
diff --git a/spec/helpers/locations_helper_spec.rb b/spec/helpers/locations_helper_spec.rb
index 4d9340542..c80449ce6 100644
--- a/spec/helpers/locations_helper_spec.rb
+++ b/spec/helpers/locations_helper_spec.rb
@@ -154,11 +154,11 @@ RSpec.describe LocationsHelper do
 
     context "when viewing availability" do
       context "with no deactivations" do
-        it "displays created_at as availability date if startdate is not present" do
+        it "displays previous collection start date as availability date if created_at is earlier than collection start date" do
           location.update!(startdate: nil)
           availability_attribute = display_location_attributes(location).find { |x| x[:name] == "Availability" }[:value]
 
-          expect(availability_attribute).to eq("Active from #{location.created_at.to_formatted_s(:govuk_date)}")
+          expect(availability_attribute).to eq("Active from 1 April 2021")
         end
 
         it "displays current collection start date as availability date if created_at is later than collection start date" do
diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb
index dd5d697e9..58bd3872e 100644
--- a/spec/models/location_spec.rb
+++ b/spec/models/location_spec.rb
@@ -208,4 +208,48 @@ RSpec.describe Location, type: :model do
       end
     end
   end
+
+  describe "available_from" do
+    context "when there is a startdate" do
+      let(:location) { FactoryBot.build(:location, startdate: Time.zone.local(2022, 4, 6)) }
+
+      it "returns the startdate" do
+        expect(location.available_from).to eq(Time.zone.local(2022, 4, 6))
+      end
+    end
+
+    context "when there is no start date" do
+      context "and the location was created at the start of the 2022/23 collection window" do
+        let(:location) { FactoryBot.build(:location, created_at: Time.zone.local(2022, 4, 6), startdate: nil) }
+
+        it "returns the beginning of 22/23 collection window" do
+          expect(location.available_from).to eq(Time.zone.local(2022, 4, 1))
+        end
+      end
+
+      context "and the location was created at the end of the 2022/23 collection window" do
+        let(:location) { FactoryBot.build(:location, created_at: Time.zone.local(2023, 2, 6), startdate: nil) }
+
+        it "returns the beginning of 22/23 collection window" do
+          expect(location.available_from).to eq(Time.zone.local(2022, 4, 1))
+        end
+      end
+
+      context "and the location was created at the start of the 2021/22 collection window" do
+        let(:location) { FactoryBot.build(:location, created_at: Time.zone.local(2021, 4, 6), startdate: nil) }
+
+        it "returns the beginning of 21/22 collection window" do
+          expect(location.available_from).to eq(Time.zone.local(2021, 4, 1))
+        end
+      end
+
+      context "and the location was created at the end of the 2021/22 collection window" do
+        let(:location) { FactoryBot.build(:location, created_at: Time.zone.local(2022, 2, 6), startdate: nil) }
+
+        it "returns the beginning of 21/22 collection window" do
+          expect(location.available_from).to eq(Time.zone.local(2021, 4, 1))
+        end
+      end
+    end
+  end
 end
diff --git a/spec/models/scheme_spec.rb b/spec/models/scheme_spec.rb
index 43a4112d4..d6bacb11a 100644
--- a/spec/models/scheme_spec.rb
+++ b/spec/models/scheme_spec.rb
@@ -190,4 +190,38 @@ RSpec.describe Scheme, type: :model do
       expect(all_schemes[2].status).to eq(:incomplete)
     end
   end
+
+  describe "available_from" do
+    context "when the scheme was created at the start of the 2022/23 collection window" do
+      let(:scheme) { FactoryBot.build(:scheme, created_at: Time.zone.local(2022, 4, 6)) }
+
+      it "returns the beginning of 22/23 collection window" do
+        expect(scheme.available_from).to eq(Time.zone.local(2022, 4, 1))
+      end
+    end
+
+    context "when the scheme was created at the end of the 2022/23 collection window" do
+      let(:scheme) { FactoryBot.build(:scheme, created_at: Time.zone.local(2023, 2, 6)) }
+
+      it "returns the beginning of 22/23 collection window" do
+        expect(scheme.available_from).to eq(Time.zone.local(2022, 4, 1))
+      end
+    end
+
+    context "when the scheme was created at the start of the 2021/22 collection window" do
+      let(:scheme) { FactoryBot.build(:scheme, created_at: Time.zone.local(2021, 4, 6)) }
+
+      it "returns the beginning of 21/22 collection window" do
+        expect(scheme.available_from).to eq(Time.zone.local(2021, 4, 1))
+      end
+    end
+
+    context "when the scheme was created at the end of the 2021/22 collection window" do
+      let(:scheme) { FactoryBot.build(:scheme, created_at: Time.zone.local(2022, 2, 6)) }
+
+      it "returns the beginning of 21/22 collection window" do
+        expect(scheme.available_from).to eq(Time.zone.local(2021, 4, 1))
+      end
+    end
+  end
 end

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 3/8] 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)

From a62846c2129dc4969fe9039e761afa844632c4fa Mon Sep 17 00:00:00 2001
From: SamSeed-Softwire <63662292+SamSeed-Softwire@users.noreply.github.com>
Date: Wed, 30 Nov 2022 15:31:56 +0000
Subject: [PATCH 4/8] CLDC-1666 Update locations table (#987)

* feat: remove redundant cols from locations table

* feat: add status col to locations table

* test: start adding status tag tests

* test: pick the simplest format for the tag helper tests

* feat: make the locations table (plus related content above & below) 2/3 width

* feat: add incomplete to location status method

* test: all status tag helpers

* test: update test text to match what's being tested

* test: update locations list test in locations_controller_spec.rb

* test: update locations list test in schemes feature tests

* test: that status=incomplete when mandatory info is missing

* feat: simplify logic for incomplete status

Co-authored-by: James Rose <james@jbpr.net>

* feat: hide new locations table layout behind feature flag

* feat: use route helpers to get scheme_location path

* feat: simplify "scheme_id: @scheme.id" to "@scheme"

* feat: reference location, not @location, in scheme_location_path

* feat: reorder postcode and code in locations table

* feat: change ' ' to "" in location_spec

* feat: update wording and ordering for 'view location details' page

* test: re-add tests for locations page when new layout not enabled

* test: check for mobility_type and location_admin_district in locations_controller as support user

* test: update locations helper test to match new field naming and ordering

* feat: always scale locations list by 2/3, not just when new layout used

* feat: scale the scheme details page by 2/3 to match the locations list page

* feat: only make scheme details and locations pages 2/3 scale if feature toggle on

* test: mock new locations layout feature toggle in tests

* feat: use the existing location_toggle_enabled instead of new_locations_table_layout_enabled

* refactor: don't use html inside ruby in locations index page

* refactor: use Rails routes in all places in locations index page

* style: lint

* feat: move logic from views/schemes/show into schemes_helper

* refactor: make consistent the removal of fields from SchemeHelper base_attributes

* test: improvements to tests

* test: make 'returns correct display attributes' tests sensible

* test: check scheme toggle off => no scheme status shown

* style: correct indentation in spec/helpers/schemes_helper_spec.rb

* test: that when owning = managing, "Organisation providing support" hidden

* style: lint code

* test: don't set scheme id explicitly in schemes_helper_spec

* style: reorder tag helper spec to match tag helper

* refactor: ensure display_scheme_attributes always takes user type

* test: make location incomplete status depend on location.confirmed

* test: add missing location validations for nil postcode & mobility type

Co-authored-by: James Rose <james@jbpr.net>
---
 app/helpers/locations_helper.rb            |   4 +-
 app/helpers/schemes_helper.rb              |  10 +-
 app/models/location.rb                     |   1 +
 app/views/locations/index.html.erb         | 135 ++++++++++++++-------
 app/views/schemes/show.html.erb            |  30 +++--
 spec/features/schemes_spec.rb              |  18 ++-
 spec/helpers/locations_helper_spec.rb      |   4 +-
 spec/helpers/schemes_helper_spec.rb        | 105 ++++++++++++----
 spec/helpers/tag_helper_spec.rb            |   9 ++
 spec/models/location_spec.rb               |  27 ++++-
 spec/requests/locations_controller_spec.rb |  32 ++++-
 11 files changed, 282 insertions(+), 93 deletions(-)

diff --git a/app/helpers/locations_helper.rb b/app/helpers/locations_helper.rb
index 8d56226a9..be5d3d4c0 100644
--- a/app/helpers/locations_helper.rb
+++ b/app/helpers/locations_helper.rb
@@ -26,12 +26,12 @@ module LocationsHelper
   def display_location_attributes(location)
     base_attributes = [
       { name: "Postcode", value: location.postcode },
-      { name: "Local authority", value: location.location_admin_district },
       { name: "Location name", value: location.name, edit: true },
+      { name: "Local authority", value: location.location_admin_district },
       { name: "Total number of units at this location", value: location.units },
       { name: "Common type of unit", value: location.type_of_unit },
       { name: "Mobility type", value: location.mobility_type },
-      { name: "Code", value: location.location_code },
+      { name: "Location code", value: location.location_code },
       { name: "Availability", value: location_availability(location) },
     ]
 
diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb
index 10a33cab6..3d143f8a2 100644
--- a/app/helpers/schemes_helper.rb
+++ b/app/helpers/schemes_helper.rb
@@ -1,5 +1,5 @@
 module SchemesHelper
-  def display_scheme_attributes(scheme)
+  def display_scheme_attributes(scheme, user)
     base_attributes = [
       { name: "Scheme code", value: scheme.id_to_display },
       { name: "Name", value: scheme.service_name, edit: true },
@@ -18,11 +18,15 @@ module SchemesHelper
     ]
 
     if FeatureToggle.scheme_toggle_enabled?
-      base_attributes.append({ name: "Status", value: scheme.status })
+      base_attributes.append({ name: "Status", value: status_tag(scheme.status) })
+    end
+
+    if user.data_coordinator?
+      base_attributes.delete_if { |item| item[:name] == "Housing stock owned by" }
     end
 
     if scheme.arrangement_type_same?
-      base_attributes.delete({ name: "Organisation providing support", value: scheme.managing_organisation&.name })
+      base_attributes.delete_if { |item| item[:name] == "Organisation providing support" }
     end
     base_attributes
   end
diff --git a/app/models/location.rb b/app/models/location.rb
index 5ba6bf3e4..6eededcc0 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -384,6 +384,7 @@ class Location < ApplicationRecord
   end
 
   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
diff --git a/app/views/locations/index.html.erb b/app/views/locations/index.html.erb
index 5b2cbae47..812296be8 100644
--- a/app/views/locations/index.html.erb
+++ b/app/views/locations/index.html.erb
@@ -11,57 +11,104 @@
 
 <%= render partial: "organisations/headings", locals: { main: @scheme.service_name, sub: nil } %>
 
-<%= render SubNavigationComponent.new(items: scheme_items(request.path, @scheme.id, "Locations")) %>
+<% if FeatureToggle.location_toggle_enabled? %>
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds-from-desktop">
+<% end %>
+  <%= render SubNavigationComponent.new(items: scheme_items(request.path, @scheme.id, "Locations")) %>
 
-<h2 class="govuk-visually-hidden">Locations</h2>
+  <h2 class="govuk-visually-hidden">Locations</h2>
 
-<%= render SearchComponent.new(current_user:, search_label: "Search by location name or postcode", value: @searched) %>
+  <%= render SearchComponent.new(current_user:, search_label: "Search by location name or postcode", value: @searched) %>
 
-<%= govuk_section_break(visible: true, size: "m") %>
+  <%= govuk_section_break(visible: true, size: "m") %>
+<% if FeatureToggle.location_toggle_enabled? %>
+    </div>
+  </div>
+<% end %>
 
-<%= govuk_table do |table| %>
-  <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %>
-    <%= render(SearchResultCaptionComponent.new(searched: @searched, count: @pagy.count, item_label:, total_count: @total_count, item: "locations", path: request.path)) %>
-  <% end %>
-  <%= table.head do |head| %>
-    <%= head.row do |row| %>
-      <% row.cell(header: true, text: "Code", html_attributes: {
-        scope: "col",
-      }) %>
-      <% row.cell(header: true, text: "Postcode", html_attributes: {
-        scope: "col",
-      }) %>
-      <% row.cell(header: true, text: "Units", html_attributes: {
-        scope: "col",
-      }) %>
-      <% row.cell(header: true, text: "Common unit type", html_attributes: {
-        scope: "col",
-      }) %>
-      <% row.cell(header: true, text: "Mobility type", html_attributes: {
-        scope: "col",
-      }) %>
-      <% row.cell(header: true, text: "Local authority", html_attributes: {
-        scope: "col",
-      }) %>
-      <% row.cell(header: true, text: "Available from", html_attributes: {
-        scope: "col",
-      }) %>
-    <% end %>
-  <% end %>
-  <% @locations.each do |location| %>
-    <%= table.body do |body| %>
-      <%= body.row do |row| %>
-        <% row.cell(text: location.id) %>
-        <% row.cell(text: simple_format(location_cell_postcode(location, "/schemes/#{@scheme.id}/locations/#{location.id}"), { class: "govuk-!-font-weight-bold" }, wrapper_tag: "div")) %>
-        <% row.cell(text: location.units) %>
-        <% row.cell(text: simple_format("<span>#{location.type_of_unit}</span>")) %>
-        <% row.cell(text: location.mobility_type) %>
-        <% row.cell(text: simple_format(location_cell_location_admin_district(location, "/schemes/#{@scheme.id}/locations/#{location.id}/edit-local-authority"), wrapper_tag: "div")) %>
-        <% row.cell(text: location.startdate&.to_formatted_s(:govuk_date)) %>
+<% if FeatureToggle.location_toggle_enabled? %>
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds-from-desktop">
+      <%= govuk_table do |table| %>
+        <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %>
+          <%= render(SearchResultCaptionComponent.new(searched: @searched, count: @pagy.count, item_label:, total_count: @total_count, item: "locations", path: request.path)) %>
+        <% end %>
+        <%= table.head do |head| %>
+          <%= head.row do |row| %>
+            <% row.cell(header: true, text: "Postcode", html_attributes: {
+              scope: "col",
+            }) %>
+            <% row.cell(header: true, text: "Location code", html_attributes: {
+              scope: "col",
+            }) %>
+            <% row.cell(header: true, text: "Status", html_attributes: {
+              scope: "col",
+            }) %>
+          <% end %>
         <% end %>
+        <% @locations.each do |location| %>
+          <%= table.body do |body| %>
+            <%= body.row do |row| %>
+              <% row.cell(text: simple_format(location_cell_postcode(location, scheme_location_path(@scheme, location)), { class: "govuk-!-font-weight-bold" }, wrapper_tag: "div")) %>
+              <% row.cell(text: location.id) %>
+              <% row.cell(text: status_tag(location.status)) %>
+              <% end %>
+          <% end %>
+        <% end %>
+      <% end %>
+      <%= govuk_button_link_to "Add a location", new_scheme_location_path(@scheme), secondary: true %>
+    </div>
+  </div>
+
+<% else %>
+  <%= govuk_table do |table| %>
+    <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %>
+      <%= render(SearchResultCaptionComponent.new(searched: @searched, count: @pagy.count, item_label:, total_count: @total_count, item: "locations", path: request.path)) %>
+    <% end %>
+    <%= table.head do |head| %>
+      <%= head.row do |row| %>
+        <% row.cell(header: true, text: "Code", html_attributes: {
+          scope: "col",
+        }) %>
+        <% row.cell(header: true, text: "Postcode", html_attributes: {
+          scope: "col",
+        }) %>
+        <% row.cell(header: true, text: "Units", html_attributes: {
+          scope: "col",
+        }) %>
+        <% row.cell(header: true, text: "Common unit type", html_attributes: {
+          scope: "col",
+        }) %>
+        <% row.cell(header: true, text: "Mobility type", html_attributes: {
+          scope: "col",
+        }) %>
+        <% row.cell(header: true, text: "Local authority", html_attributes: {
+          scope: "col",
+        }) %>
+        <% row.cell(header: true, text: "Available from", html_attributes: {
+          scope: "col",
+        }) %>
+      <% end %>
+    <% end %>
+    <% @locations.each do |location| %>
+      <%= table.body do |body| %>
+        <%= body.row do |row| %>
+          <% row.cell(text: location.id) %>
+          <% row.cell(text: simple_format(location_cell_postcode(location, scheme_location_path(@scheme, location)), { class: "govuk-!-font-weight-bold" }, wrapper_tag: "div")) %>
+          <% row.cell(text: location.units) %>
+          <% row.cell do %>
+            <span><%= simple_format(location.type_of_unit) %></span>
+          <% end %>
+          <% row.cell(text: location.mobility_type) %>
+          <% row.cell(text: simple_format(location_cell_location_admin_district(location, scheme_location_edit_local_authority_path(@scheme, location)), wrapper_tag: "div")) %>
+          <% row.cell(text: location.startdate&.to_formatted_s(:govuk_date)) %>
+          <% end %>
+      <% end %>
     <% end %>
   <% end %>
+  <%= govuk_button_link_to "Add a location", new_scheme_location_path(@scheme), secondary: true %>
+
 <% end %>
-<%= govuk_button_link_to "Add a location", new_scheme_location_path(scheme_id: @scheme.id), secondary: true %>
 
 <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "locations" } %>
diff --git a/app/views/schemes/show.html.erb b/app/views/schemes/show.html.erb
index e0b229af4..5d93414d0 100644
--- a/app/views/schemes/show.html.erb
+++ b/app/views/schemes/show.html.erb
@@ -10,19 +10,27 @@
 
 <%= render partial: "organisations/headings", locals: { main: @scheme.service_name, sub: nil } %>
 
-<%= render SubNavigationComponent.new(items: scheme_items(request.path, @scheme.id, "Locations")) %>
+<% if FeatureToggle.location_toggle_enabled? %>
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds-from-desktop">
+<% end %>
+      <%= render SubNavigationComponent.new(items: scheme_items(request.path, @scheme.id, "Locations")) %>
 
-<h2 class="govuk-visually-hidden">Scheme</h2>
+      <h2 class="govuk-visually-hidden">Scheme</h2>
 
-<%= govuk_summary_list do |summary_list| %>
-  <% display_scheme_attributes(@scheme).each do |attr| %>
-    <% next if current_user.data_coordinator? && attr[:name] == ("Housing stock owned by") %>
-    <%= summary_list.row do |row| %>
-      <% row.key { attr[:name].eql?("Registered under Care Standards Act 2000") ? "Registered under Care Standards Act 2000" : attr[:name].to_s.humanize } %>
-      <% row.value { attr[:name].eql?("Status") ? status_tag(attr[:value]) : details_html(attr) } %>
-      <% row.action(text: "Change", href: scheme_edit_name_path(scheme_id: @scheme.id)) if attr[:edit] %>
-    <% end %>
-  <% end %>
+      <%= govuk_summary_list do |summary_list| %>
+        <% display_scheme_attributes(@scheme, current_user).each do |attr| %>
+          <%= summary_list.row do |row| %>
+            <% row.key { attr[:name] } %>
+            <% row.value { details_html(attr) } %>
+            <% row.action(text: "Change", href: scheme_edit_name_path(scheme_id: @scheme.id)) if attr[:edit] %>
+          <% end %>
+        <% end %>
+      <% end %>
+
+<% if FeatureToggle.location_toggle_enabled? %>
+    </div>
+  </div>
 <% end %>
 
 <% if FeatureToggle.scheme_toggle_enabled? %>
diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb
index 797b718af..bee63350a 100644
--- a/spec/features/schemes_spec.rb
+++ b/spec/features/schemes_spec.rb
@@ -195,11 +195,27 @@ RSpec.describe "Schemes scheme Features" do
               expect(page).to have_link("Locations")
             end
 
-            context "when I click locations link" do
+            context "when I click locations link and the new locations layout feature toggle is enabled" do
               before do
                 click_link("Locations")
               end
 
+              it "shows details of those locations" do
+                locations.each do |location|
+                  expect(page).to have_content(location.id)
+                  expect(page).to have_content(location.postcode)
+                  expect(page).to have_content(location.name)
+                  expect(page).to have_content("Active")
+                end
+              end
+            end
+
+            context "when I click locations link and the new locations layout feature toggle is disabled" do
+              before do
+                allow(FeatureToggle).to receive(:location_toggle_enabled?).and_return(false)
+                click_link("Locations")
+              end
+
               it "shows details of those locations" do
                 locations.each do |location|
                   expect(page).to have_content(location.id)
diff --git a/spec/helpers/locations_helper_spec.rb b/spec/helpers/locations_helper_spec.rb
index c80449ce6..96db265e3 100644
--- a/spec/helpers/locations_helper_spec.rb
+++ b/spec/helpers/locations_helper_spec.rb
@@ -139,12 +139,12 @@ RSpec.describe LocationsHelper do
     it "returns correct display attributes" do
       attributes = [
         { name: "Postcode", value: location.postcode },
-        { name: "Local authority", value: location.location_admin_district },
         { name: "Location name", value: location.name, edit: true },
+        { name: "Local authority", value: location.location_admin_district },
         { name: "Total number of units at this location", value: location.units },
         { name: "Common type of unit", value: location.type_of_unit },
         { name: "Mobility type", value: location.mobility_type },
-        { name: "Code", value: location.location_code },
+        { name: "Location code", value: location.location_code },
         { name: "Availability", value: "Active from 1 April 2022" },
         { name: "Status", value: :active },
       ]
diff --git a/spec/helpers/schemes_helper_spec.rb b/spec/helpers/schemes_helper_spec.rb
index b1e9f9c96..af9f133ed 100644
--- a/spec/helpers/schemes_helper_spec.rb
+++ b/spec/helpers/schemes_helper_spec.rb
@@ -87,40 +87,97 @@ RSpec.describe SchemesHelper do
     end
   end
 
+  include TagHelper
   describe "display_scheme_attributes" do
-    let!(:scheme) { FactoryBot.create(:scheme, created_at: Time.zone.local(2022, 4, 1)) }
+    let(:owning_organisation) { FactoryBot.create(:organisation, name: "Acme LTD Owning") }
+    let(:managing_organisation) { FactoryBot.create(:organisation, name: "Acme LTD Managing") }
+    let!(:scheme) do
+      FactoryBot.create(:scheme,
+                        service_name: "Test service_name",
+                        sensitive: 0,
+                        scheme_type: 7,
+                        registered_under_care_act: 3,
+                        owning_organisation:,
+                        managing_organisation:,
+                        arrangement_type: "V",
+                        primary_client_group: "S",
+                        has_other_client_group: 1,
+                        secondary_client_group: "I",
+                        support_type: 4,
+                        intended_stay: "P",
+                        created_at: Time.zone.local(2022, 4, 1))
+    end
+    let!(:scheme_where_managing_organisation_is_owning_organisation) { FactoryBot.create(:scheme, arrangement_type: "D") }
+    let(:support_user) { FactoryBot.create(:user, :support) }
+    let(:coordinator_user) { FactoryBot.create(:user, :data_coordinator) }
+
+    it "returns correct display attributes for a support user" do
+      attributes = [
+        { name: "Scheme code", value: "S#{scheme.id}" },
+        { name: "Name", value: "Test service_name", edit: true },
+        { name: "Confidential information", value: "No", edit: true },
+        { name: "Type of scheme", value: "Housing for older people" },
+        { name: "Registered under Care Standards Act 2000", value: "Yes – registered care home providing personal care" },
+        { name: "Housing stock owned by", value: "Acme LTD Owning", edit: true },
+        { name: "Support services provided by", value: "A registered charity or voluntary organisation" },
+        { name: "Organisation providing support", value: "Acme LTD Managing" },
+        { name: "Primary client group", value: "Rough sleepers" },
+        { name: "Has another client group", value: "Yes" },
+        { name: "Secondary client group", value: "Refugees (permanent)" },
+        { name: "Level of support given", value: "High level" },
+        { name: "Intended length of stay", value: "Permanent" },
+        { name: "Availability", value: "Active from 1 April 2022" },
+        { name: "Status", value: status_tag(:active) },
+      ]
+      expect(display_scheme_attributes(scheme, support_user)).to eq(attributes)
+    end
 
-    it "returns correct display attributes" do
+    it "returns correct display attributes for a coordinator user" do
       attributes = [
-        { name: "Scheme code", value: scheme.id_to_display },
-        { name: "Name", value: scheme.service_name, edit: true },
-        { name: "Confidential information", value: scheme.sensitive, edit: true },
-        { name: "Type of scheme", value: scheme.scheme_type },
-        { name: "Registered under Care Standards Act 2000", value: scheme.registered_under_care_act },
-        { name: "Housing stock owned by", value: scheme.owning_organisation.name, edit: true },
-        { name: "Support services provided by", value: scheme.arrangement_type },
-        { name: "Primary client group", value: scheme.primary_client_group },
-        { name: "Has another client group", value: scheme.has_other_client_group },
-        { name: "Secondary client group", value: scheme.secondary_client_group },
-        { name: "Level of support given", value: scheme.support_type },
-        { name: "Intended length of stay", value: scheme.intended_stay },
+        { name: "Scheme code", value: "S#{scheme.id}" },
+        { name: "Name", value: "Test service_name", edit: true },
+        { name: "Confidential information", value: "No", edit: true },
+        { name: "Type of scheme", value: "Housing for older people" },
+        { name: "Registered under Care Standards Act 2000", value: "Yes – registered care home providing personal care" },
+        { name: "Support services provided by", value: "A registered charity or voluntary organisation" },
+        { name: "Organisation providing support", value: "Acme LTD Managing" },
+        { name: "Primary client group", value: "Rough sleepers" },
+        { name: "Has another client group", value: "Yes" },
+        { name: "Secondary client group", value: "Refugees (permanent)" },
+        { name: "Level of support given", value: "High level" },
+        { name: "Intended length of stay", value: "Permanent" },
         { name: "Availability", value: "Active from 1 April 2022" },
-        { name: "Status", value: :active },
+        { name: "Status", value: status_tag(:active) },
       ]
-      expect(display_scheme_attributes(scheme)).to eq(attributes)
+      expect(display_scheme_attributes(scheme, coordinator_user)).to eq(attributes)
+    end
+
+    context "when the scheme toggle is disabled" do
+      it "doesn't show the scheme status" do
+        allow(FeatureToggle).to receive(:scheme_toggle_enabled?).and_return(false)
+        attributes = display_scheme_attributes(scheme, support_user).find { |x| x[:name] == "Status" }
+        expect(attributes).to be_nil
+      end
+    end
+
+    context "when the managing organisation is the owning organisation" do
+      it "doesn't show the organisation providing support" do
+        attributes = display_scheme_attributes(scheme_where_managing_organisation_is_owning_organisation, support_user).find { |x| x[:name] == "Organisation providing support" }
+        expect(attributes).to be_nil
+      end
     end
 
     context "when viewing availability" do
       context "with no deactivations" do
         it "displays created_at as availability date" do
-          availability_attribute = display_scheme_attributes(scheme).find { |x| x[:name] == "Availability" }[:value]
+          availability_attribute = display_scheme_attributes(scheme, support_user).find { |x| x[:name] == "Availability" }[:value]
 
           expect(availability_attribute).to eq("Active from #{scheme.created_at.to_formatted_s(:govuk_date)}")
         end
 
         it "displays current collection start date as availability date if created_at is later than collection start date" do
           scheme.update!(created_at: Time.zone.local(2022, 4, 16))
-          availability_attribute = display_scheme_attributes(scheme).find { |x| x[:name] == "Availability" }[:value]
+          availability_attribute = display_scheme_attributes(scheme, support_user).find { |x| x[:name] == "Availability" }[:value]
 
           expect(availability_attribute).to eq("Active from 1 April 2022")
         end
@@ -135,7 +192,7 @@ RSpec.describe SchemesHelper do
           end
 
           it "displays the timeline of availability" do
-            availability_attribute = display_scheme_attributes(scheme).find { |x| x[:name] == "Availability" }[:value]
+            availability_attribute = display_scheme_attributes(scheme, support_user).find { |x| x[:name] == "Availability" }[:value]
 
             expect(availability_attribute).to eq("Active from 1 April 2022 to 9 August 2022\nDeactivated on 10 August 2022\nActive from 1 September 2022 to 14 September 2022\nDeactivated on 15 September 2022\nActive from 28 September 2022")
           end
@@ -149,7 +206,7 @@ RSpec.describe SchemesHelper do
           end
 
           it "displays the timeline of availability" do
-            availability_attribute = display_scheme_attributes(scheme).find { |x| x[:name] == "Availability" }[:value]
+            availability_attribute = display_scheme_attributes(scheme, support_user).find { |x| x[:name] == "Availability" }[:value]
 
             expect(availability_attribute).to eq("Active from 1 April 2022 to 9 August 2022\nDeactivated on 10 August 2022\nActive from 1 September 2022 to 14 September 2022\nDeactivated on 15 September 2022")
           end
@@ -165,7 +222,7 @@ RSpec.describe SchemesHelper do
           end
 
           it "displays the timeline of availability" do
-            availability_attribute = display_scheme_attributes(scheme).find { |x| x[:name] == "Availability" }[:value]
+            availability_attribute = display_scheme_attributes(scheme, support_user).find { |x| x[:name] == "Availability" }[:value]
 
             expect(availability_attribute).to eq("Active from 1 April 2022 to 14 June 2022\nDeactivated on 15 June 2022\nActive from 18 June 2022 to 23 September 2022\nDeactivated on 24 September 2022\nActive from 28 September 2022")
           end
@@ -179,7 +236,7 @@ RSpec.describe SchemesHelper do
           end
 
           it "displays the timeline of availability" do
-            availability_attribute = display_scheme_attributes(scheme).find { |x| x[:name] == "Availability" }[:value]
+            availability_attribute = display_scheme_attributes(scheme, support_user).find { |x| x[:name] == "Availability" }[:value]
 
             expect(availability_attribute).to eq("Active from 1 April 2022 to 14 June 2022\nDeactivated on 15 June 2022\nActive from 28 September 2022")
           end
@@ -196,7 +253,7 @@ RSpec.describe SchemesHelper do
           end
 
           it "displays the timeline of availability" do
-            availability_attribute = display_scheme_attributes(scheme).find { |x| x[:name] == "Availability" }[:value]
+            availability_attribute = display_scheme_attributes(scheme, support_user).find { |x| x[:name] == "Availability" }[:value]
 
             expect(availability_attribute).to eq("Active from 1 April 2022 to 14 June 2022\nDeactivated on 15 June 2022\nActive from 28 September 2022 to 23 October 2022\nDeactivated on 24 October 2022\nActive from 28 October 2022")
           end
@@ -211,7 +268,7 @@ RSpec.describe SchemesHelper do
         end
 
         it "displays the timeline of availability" do
-          availability_attribute = display_scheme_attributes(scheme).find { |x| x[:name] == "Availability" }[:value]
+          availability_attribute = display_scheme_attributes(scheme, support_user).find { |x| x[:name] == "Availability" }[:value]
 
           expect(availability_attribute).to eq("Active from 1 April 2022 to 9 October 2022\nDeactivated on 10 October 2022\nActive from 11 December 2022")
         end
diff --git a/spec/helpers/tag_helper_spec.rb b/spec/helpers/tag_helper_spec.rb
index 3f32b8502..3373737de 100644
--- a/spec/helpers/tag_helper_spec.rb
+++ b/spec/helpers/tag_helper_spec.rb
@@ -11,6 +11,15 @@ RSpec.describe TagHelper do
 
     it "returns tag with correct status text and colour and custom class" do
       expect(status_tag("not_started", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--grey app-tag--small\">Not started</strong>")
+      expect(status_tag("cannot_start_yet", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--grey app-tag--small\">Cannot start yet</strong>")
+      expect(status_tag("in_progress", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--blue app-tag--small\">In progress</strong>")
+      expect(status_tag("completed", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--green app-tag--small\">Completed</strong>")
+      expect(status_tag("active", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--green app-tag--small\">Active</strong>")
+      expect(status_tag("incomplete", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--red app-tag--small\">Incomplete</strong>")
+      expect(status_tag("deactivating_soon", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--yellow app-tag--small\">Deactivating soon</strong>")
+      expect(status_tag("activating_soon", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--blue app-tag--small\">Activating soon</strong>")
+      expect(status_tag("reactivating_soon", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--blue app-tag--small\">Reactivating soon</strong>")
+      expect(status_tag("deactivated", "app-tag--small")).to eq("<strong class=\"govuk-tag govuk-tag--grey app-tag--small\">Deactivated</strong>")
     end
   end
 end
diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb
index 58bd3872e..11c826d28 100644
--- a/spec/models/location_spec.rb
+++ b/spec/models/location_spec.rb
@@ -34,12 +34,18 @@ RSpec.describe Location, type: :model do
       expect { location.save! }
         .to raise_error(ActiveRecord::RecordInvalid, "Validation failed: Postcode #{I18n.t('validations.postcode')}")
     end
+
+    it "does add an error when the postcode is missing" do
+      location.postcode = nil
+      expect { location.save! }
+        .to raise_error(ActiveRecord::RecordInvalid, "Validation failed: Postcode #{I18n.t('validations.postcode')}")
+    end
   end
 
   describe "#units" do
     let(:location) { FactoryBot.build(:location) }
 
-    it "does add an error when the postcode is invalid" do
+    it "does add an error when the number of units is invalid" do
       location.units = nil
       expect { location.save! }
         .to raise_error(ActiveRecord::RecordInvalid, "Validation failed: Units #{I18n.t('activerecord.errors.models.location.attributes.units.blank')}")
@@ -49,13 +55,23 @@ RSpec.describe Location, type: :model do
   describe "#type_of_unit" do
     let(:location) { FactoryBot.build(:location) }
 
-    it "does add an error when the postcode is invalid" do
+    it "does add an error when the type of unit is invalid" do
       location.type_of_unit = nil
       expect { location.save! }
         .to raise_error(ActiveRecord::RecordInvalid, "Validation failed: Type of unit #{I18n.t('activerecord.errors.models.location.attributes.type_of_unit.blank')}")
     end
   end
 
+  describe "#mobility_type" do
+    let(:location) { FactoryBot.build(:location) }
+
+    it "does add an error when the mobility type is invalid" do
+      location.mobility_type = nil
+      expect { location.save! }
+        .to raise_error(ActiveRecord::RecordInvalid, "Validation failed: Mobility type #{I18n.t('activerecord.errors.models.location.attributes.mobility_type.blank')}")
+    end
+  end
+
   describe "paper trail" do
     let(:location) { FactoryBot.create(:location) }
     let!(:name) { location.name }
@@ -123,6 +139,13 @@ RSpec.describe Location, type: :model do
       Timecop.unfreeze
     end
 
+    context "when location is not confirmed" do
+      it "returns incomplete " do
+        location.confirmed = false
+        expect(location.status).to eq(:incomplete)
+      end
+    end
+
     context "when there have not been any previous deactivations" do
       it "returns active if the location has no deactivation records" do
         expect(location.status).to eq(:active)
diff --git a/spec/requests/locations_controller_spec.rb b/spec/requests/locations_controller_spec.rb
index 1c3c47219..45463ceb1 100644
--- a/spec/requests/locations_controller_spec.rb
+++ b/spec/requests/locations_controller_spec.rb
@@ -867,14 +867,25 @@ RSpec.describe LocationsController, type: :request do
         end
       end
 
-      it "shows scheme" do
+      it "shows locations with correct data wben the new locations layout feature toggle is enabled" do
+        locations.each do |location|
+          expect(page).to have_content(location.id)
+          expect(page).to have_content(location.postcode)
+          expect(page).to have_content(location.name)
+          expect(page).to have_content(location.status)
+        end
+      end
+
+      it "shows locations with correct data wben the new locations layout feature toggle is disabled" do
+        allow(FeatureToggle).to receive(:location_toggle_enabled?).and_return(false)
+        get "/schemes/#{scheme.id}/locations"
         locations.each do |location|
           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.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
 
@@ -972,12 +983,25 @@ RSpec.describe LocationsController, type: :request do
         get "/schemes/#{scheme.id}/locations"
       end
 
-      it "shows scheme" do
+      it "shows locations with correct data wben the new locations layout feature toggle is enabled" do
+        locations.each do |location|
+          expect(page).to have_content(location.id)
+          expect(page).to have_content(location.postcode)
+          expect(page).to have_content(location.name)
+          expect(page).to have_content(location.status)
+        end
+      end
+
+      it "shows locations with correct data wben the new locations layout feature toggle is disabled" do
+        allow(FeatureToggle).to receive(:location_toggle_enabled?).and_return(false)
+        get "/schemes/#{scheme.id}/locations"
         locations.each do |location|
           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.mobility_type)
+          expect(page).to have_content(location.location_admin_district)
+          expect(page).to have_content(location.startdate&.to_formatted_s(:govuk_date))
         end
       end
 

From 3295e850059d0d78baf9f34c5e19124741a903d4 Mon Sep 17 00:00:00 2001
From: James Rose <james@jbpr.net>
Date: Wed, 30 Nov 2022 15:46:42 +0000
Subject: [PATCH 5/8] Add hint text to household rent or charges question
 (#1042)

---
 config/forms/2022_2023.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index 2c6d0763f..a40ad87f0 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -7470,7 +7470,7 @@
                 "household_charge": {
                   "check_answer_label": "Does the household pay rent or charges?",
                   "header": "Does the household pay rent or other charges for the accommodation?",
-                  "hint_text": "",
+                  "hint_text": "If rent is charged on the property then answer Yes to this question, even if the tenants do not pay it themselves.",
                   "type": "radio",
                   "answer_options": {
                     "0": {

From b52c27782c2828d6cd3624bd6f25cb18027055e6 Mon Sep 17 00:00:00 2001
From: Phil Lee <asmega@users.noreply.github.com>
Date: Thu, 1 Dec 2022 09:22:55 +0000
Subject: [PATCH 6/8] tweak copy for 2022/2023 lettings access needs Q (#1014)

---
 config/forms/2022_2023.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index a40ad87f0..fe1511153 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -5929,7 +5929,7 @@
               "description": "",
               "questions": {
                 "housingneeds_type": {
-                  "header": "What type of access need do they have?",
+                  "header": "What type of access needs do they have?",
                   "hint_text": "",
                   "type": "radio",
                   "check_answer_label": "Disabled access needs",
@@ -5947,7 +5947,7 @@
                       "value": true
                     },
                     "3": {
-                      "value": "None of the above"
+                      "value": "None of the listed options"
                     }
                   }
                 },

From a305bb7d52920df01afeb8b493ea4bfc6c8de856 Mon Sep 17 00:00:00 2001
From: Phil Lee <asmega@users.noreply.github.com>
Date: Thu, 1 Dec 2022 09:55:08 +0000
Subject: [PATCH 7/8] [1714] Bulk upload part three (#1032)

* add start of bulk upload logs journey

* split upload controller into 2

* add year page to bulk upload journey

* bulk upload years now dynamic

* bulk upload journey: add copy for prepare file

* add link to bulk upload template

* add placeholder for upload your file page

* handle bulk upload when not in crossover

* fix tests around bulk upload redirect

* fix typos in bulk upload jouney
---
 .../bulk_upload_lettings_logs_controller.rb   |  50 +++++++++++++++++
 .../bulk_upload_sales_logs_controller.rb      |  50 +++++++++++++++++
 app/helpers/logs_helper.rb                    |  21 ++++++++
 app/helpers/navigation_items_helper.rb        |   4 +-
 app/models/form.rb                            |   8 +++
 .../bulk_upload_lettings/prepare_your_file.rb |  41 ++++++++++++++
 .../bulk_upload_lettings/upload_your_file.rb  |  19 +++++++
 app/models/forms/bulk_upload_lettings/year.rb |  37 +++++++++++++
 .../bulk_upload_sales/prepare_your_file.rb    |  41 ++++++++++++++
 .../bulk_upload_sales/upload_your_file.rb     |  19 +++++++
 app/models/forms/bulk_upload_sales/year.rb    |  37 +++++++++++++
 .../forms/prepare_your_file.html.erb          |  33 ++++++++++++
 .../forms/upload_your_file.html.erb           |  17 ++++++
 .../forms/year.html.erb                       |  16 ++++++
 .../forms/prepare_your_file.html.erb          |  33 ++++++++++++
 .../forms/upload_your_file.html.erb           |  17 ++++++
 .../forms/year.html.erb                       |  16 ++++++
 app/views/logs/index.html.erb                 |  12 +++--
 config/initializers/feature_toggle.rb         |   4 ++
 config/locales/en.yml                         |  12 +++++
 config/routes.rb                              |  14 +++++
 .../bulk-upload-lettings-template-v1.xlsx     | Bin 0 -> 35928 bytes
 .../files/bulk-upload-sales-template-v1.xlsx  | Bin 0 -> 26703 bytes
 .../bulk_upload_lettings_logs_spec.rb         |  51 ++++++++++++++++++
 spec/features/bulk_upload_sales_logs_spec.rb  |  51 ++++++++++++++++++
 spec/models/form_spec.rb                      |  34 ++++++++++++
 .../forms/bulk_upload_lettings/year_spec.rb   |  12 +++++
 .../forms/bulk_upload_sales/year_spec.rb      |  12 +++++
 spec/rails_helper.rb                          |   1 +
 ...lk_upload_lettings_logs_controller_spec.rb |  32 +++++++++++
 .../bulk_upload_sales_logs_controller_spec.rb |  32 +++++++++++
 31 files changed, 720 insertions(+), 6 deletions(-)
 create mode 100644 app/controllers/bulk_upload_lettings_logs_controller.rb
 create mode 100644 app/controllers/bulk_upload_sales_logs_controller.rb
 create mode 100644 app/helpers/logs_helper.rb
 create mode 100644 app/models/forms/bulk_upload_lettings/prepare_your_file.rb
 create mode 100644 app/models/forms/bulk_upload_lettings/upload_your_file.rb
 create mode 100644 app/models/forms/bulk_upload_lettings/year.rb
 create mode 100644 app/models/forms/bulk_upload_sales/prepare_your_file.rb
 create mode 100644 app/models/forms/bulk_upload_sales/upload_your_file.rb
 create mode 100644 app/models/forms/bulk_upload_sales/year.rb
 create mode 100644 app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb
 create mode 100644 app/views/bulk_upload_lettings_logs/forms/upload_your_file.html.erb
 create mode 100644 app/views/bulk_upload_lettings_logs/forms/year.html.erb
 create mode 100644 app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb
 create mode 100644 app/views/bulk_upload_sales_logs/forms/upload_your_file.html.erb
 create mode 100644 app/views/bulk_upload_sales_logs/forms/year.html.erb
 create mode 100644 public/files/bulk-upload-lettings-template-v1.xlsx
 create mode 100644 public/files/bulk-upload-sales-template-v1.xlsx
 create mode 100644 spec/features/bulk_upload_lettings_logs_spec.rb
 create mode 100644 spec/features/bulk_upload_sales_logs_spec.rb
 create mode 100644 spec/models/forms/bulk_upload_lettings/year_spec.rb
 create mode 100644 spec/models/forms/bulk_upload_sales/year_spec.rb
 create mode 100644 spec/requests/bulk_upload_lettings_logs_controller_spec.rb
 create mode 100644 spec/requests/bulk_upload_sales_logs_controller_spec.rb

diff --git a/app/controllers/bulk_upload_lettings_logs_controller.rb b/app/controllers/bulk_upload_lettings_logs_controller.rb
new file mode 100644
index 000000000..108c25fef
--- /dev/null
+++ b/app/controllers/bulk_upload_lettings_logs_controller.rb
@@ -0,0 +1,50 @@
+class BulkUploadLettingsLogsController < ApplicationController
+  before_action :authenticate_user!
+
+  def start
+    if in_crossover_period?
+      redirect_to bulk_upload_lettings_log_path(id: "year")
+    else
+      redirect_to bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: current_year })
+    end
+  end
+
+  def show
+    render form.view_path
+  end
+
+  def update
+    if form.valid?
+      redirect_to form.next_path
+    else
+      render form.view_path
+    end
+  end
+
+private
+
+  def current_year
+    FormHandler.instance.forms["current_lettings"].start_date.year
+  end
+
+  def in_crossover_period?
+    FormHandler.instance.forms.values.any?(&:in_crossover_period?)
+  end
+
+  def form
+    @form ||= case params[:id]
+              when "year"
+                Forms::BulkUploadLettings::Year.new(form_params)
+              when "prepare-your-file"
+                Forms::BulkUploadLettings::PrepareYourFile.new(form_params)
+              when "upload-your-file"
+                Forms::BulkUploadLettings::UploadYourFile.new(form_params)
+              else
+                raise "Page not found for path #{params[:id]}"
+              end
+  end
+
+  def form_params
+    params.fetch(:form, {}).permit(:year)
+  end
+end
diff --git a/app/controllers/bulk_upload_sales_logs_controller.rb b/app/controllers/bulk_upload_sales_logs_controller.rb
new file mode 100644
index 000000000..81d018d4c
--- /dev/null
+++ b/app/controllers/bulk_upload_sales_logs_controller.rb
@@ -0,0 +1,50 @@
+class BulkUploadSalesLogsController < ApplicationController
+  before_action :authenticate_user!
+
+  def start
+    if in_crossover_period?
+      redirect_to bulk_upload_sales_log_path(id: "year")
+    else
+      redirect_to bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: current_year })
+    end
+  end
+
+  def show
+    render form.view_path
+  end
+
+  def update
+    if form.valid?
+      redirect_to form.next_path
+    else
+      render form.view_path
+    end
+  end
+
+private
+
+  def current_year
+    FormHandler.instance.forms["current_sales"].start_date.year
+  end
+
+  def in_crossover_period?
+    FormHandler.instance.forms.values.any?(&:in_crossover_period?)
+  end
+
+  def form
+    @form ||= case params[:id]
+              when "year"
+                Forms::BulkUploadSales::Year.new(form_params)
+              when "prepare-your-file"
+                Forms::BulkUploadSales::PrepareYourFile.new(form_params)
+              when "upload-your-file"
+                Forms::BulkUploadSales::UploadYourFile.new(form_params)
+              else
+                raise "Page not found for path #{params[:id]}"
+              end
+  end
+
+  def form_params
+    params.fetch(:form, {}).permit(:year)
+  end
+end
diff --git a/app/helpers/logs_helper.rb b/app/helpers/logs_helper.rb
new file mode 100644
index 000000000..6567f0a13
--- /dev/null
+++ b/app/helpers/logs_helper.rb
@@ -0,0 +1,21 @@
+module LogsHelper
+  def log_type_for_controller(controller)
+    case controller.class.to_s
+    when "LettingsLogsController"
+      "lettings"
+    when "SalesLogsController"
+      "sales"
+    else
+      raise "Log type not found for #{controller.class}"
+    end
+  end
+
+  def bulk_upload_path_for_controller(controller, id:)
+    case log_type_for_controller(controller)
+    when "lettings"
+      bulk_upload_lettings_log_path(id:)
+    when "sales"
+      bulk_upload_sales_log_path(id:)
+    end
+  end
+end
diff --git a/app/helpers/navigation_items_helper.rb b/app/helpers/navigation_items_helper.rb
index 07c125a8d..d996894ea 100644
--- a/app/helpers/navigation_items_helper.rb
+++ b/app/helpers/navigation_items_helper.rb
@@ -65,11 +65,11 @@ module NavigationItemsHelper
 private
 
   def lettings_logs_current?(path)
-    path == "/lettings-logs"
+    path.starts_with?("/lettings-logs")
   end
 
   def sales_logs_current?(path)
-    path == "/sales-logs"
+    path.starts_with?("/sales-logs")
   end
 
   def users_current?(path)
diff --git a/app/models/form.rb b/app/models/form.rb
index 22321f431..9d9acf2ea 100644
--- a/app/models/form.rb
+++ b/app/models/form.rb
@@ -223,4 +223,12 @@ class Form
       end
     end
   end
+
+  def in_crossover_period?(now: Time.zone.now)
+    ((end_date - 3.months) < now) && (now < end_date)
+  end
+
+  def inspect
+    "#<#{self.class} @type=#{type} @name=#{name}>"
+  end
 end
diff --git a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
new file mode 100644
index 000000000..684ba1437
--- /dev/null
+++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
@@ -0,0 +1,41 @@
+module Forms
+  module BulkUploadLettings
+    class PrepareYourFile
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+      include Rails.application.routes.url_helpers
+
+      attribute :year, :integer
+
+      def view_path
+        "bulk_upload_lettings_logs/forms/prepare_your_file"
+      end
+
+      def back_path
+        if in_crossover_period?
+          Rails.application.routes.url_helpers.bulk_upload_lettings_log_path(id: "year", form: { year: })
+        else
+          Rails.application.routes.url_helpers.lettings_logs_path
+        end
+      end
+
+      def next_path
+        bulk_upload_lettings_log_path(id: "upload-your-file", form: { year: })
+      end
+
+      def template_path
+        "/files/bulk-upload-lettings-template-v1.xlsx"
+      end
+
+      def year_combo
+        "#{year}/#{year + 1 - 2000}"
+      end
+
+    private
+
+      def in_crossover_period?
+        FormHandler.instance.forms.values.any?(&:in_crossover_period?)
+      end
+    end
+  end
+end
diff --git a/app/models/forms/bulk_upload_lettings/upload_your_file.rb b/app/models/forms/bulk_upload_lettings/upload_your_file.rb
new file mode 100644
index 000000000..1415ffe19
--- /dev/null
+++ b/app/models/forms/bulk_upload_lettings/upload_your_file.rb
@@ -0,0 +1,19 @@
+module Forms
+  module BulkUploadLettings
+    class UploadYourFile
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+      include Rails.application.routes.url_helpers
+
+      attribute :year, :integer
+
+      def view_path
+        "bulk_upload_lettings_logs/forms/upload_your_file"
+      end
+
+      def back_path
+        bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: })
+      end
+    end
+  end
+end
diff --git a/app/models/forms/bulk_upload_lettings/year.rb b/app/models/forms/bulk_upload_lettings/year.rb
new file mode 100644
index 000000000..9fa17b19e
--- /dev/null
+++ b/app/models/forms/bulk_upload_lettings/year.rb
@@ -0,0 +1,37 @@
+module Forms
+  module BulkUploadLettings
+    class Year
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+      include Rails.application.routes.url_helpers
+
+      attribute :year, :integer
+
+      validates :year, presence: true
+
+      def view_path
+        "bulk_upload_lettings_logs/forms/year"
+      end
+
+      def options
+        possible_years.map do |year|
+          OpenStruct.new(id: year, name: "#{year}/#{year + 1}")
+        end
+      end
+
+      def back_path
+        lettings_logs_path
+      end
+
+      def next_path
+        bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: })
+      end
+
+    private
+
+      def possible_years
+        FormHandler.instance.lettings_forms.values.map { |form| form.start_date.year }.sort.reverse
+      end
+    end
+  end
+end
diff --git a/app/models/forms/bulk_upload_sales/prepare_your_file.rb b/app/models/forms/bulk_upload_sales/prepare_your_file.rb
new file mode 100644
index 000000000..da017dbbd
--- /dev/null
+++ b/app/models/forms/bulk_upload_sales/prepare_your_file.rb
@@ -0,0 +1,41 @@
+module Forms
+  module BulkUploadSales
+    class PrepareYourFile
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+      include Rails.application.routes.url_helpers
+
+      attribute :year, :integer
+
+      def view_path
+        "bulk_upload_sales_logs/forms/prepare_your_file"
+      end
+
+      def back_path
+        if in_crossover_period?
+          Rails.application.routes.url_helpers.bulk_upload_sales_log_path(id: "year", form: { year: })
+        else
+          Rails.application.routes.url_helpers.sales_logs_path
+        end
+      end
+
+      def next_path
+        bulk_upload_sales_log_path(id: "upload-your-file", form: { year: })
+      end
+
+      def template_path
+        "/files/bulk-upload-sales-template-v1.xlsx"
+      end
+
+      def year_combo
+        "#{year}/#{year + 1 - 2000}"
+      end
+
+    private
+
+      def in_crossover_period?
+        FormHandler.instance.forms.values.any?(&:in_crossover_period?)
+      end
+    end
+  end
+end
diff --git a/app/models/forms/bulk_upload_sales/upload_your_file.rb b/app/models/forms/bulk_upload_sales/upload_your_file.rb
new file mode 100644
index 000000000..3d421e9f1
--- /dev/null
+++ b/app/models/forms/bulk_upload_sales/upload_your_file.rb
@@ -0,0 +1,19 @@
+module Forms
+  module BulkUploadSales
+    class UploadYourFile
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+      include Rails.application.routes.url_helpers
+
+      attribute :year, :integer
+
+      def view_path
+        "bulk_upload_sales_logs/forms/upload_your_file"
+      end
+
+      def back_path
+        bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: })
+      end
+    end
+  end
+end
diff --git a/app/models/forms/bulk_upload_sales/year.rb b/app/models/forms/bulk_upload_sales/year.rb
new file mode 100644
index 000000000..361061990
--- /dev/null
+++ b/app/models/forms/bulk_upload_sales/year.rb
@@ -0,0 +1,37 @@
+module Forms
+  module BulkUploadSales
+    class Year
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+      include Rails.application.routes.url_helpers
+
+      attribute :year, :integer
+
+      validates :year, presence: true
+
+      def view_path
+        "bulk_upload_sales_logs/forms/year"
+      end
+
+      def options
+        possible_years.map do |year|
+          OpenStruct.new(id: year, name: "#{year}/#{year + 1}")
+        end
+      end
+
+      def back_path
+        sales_logs_path
+      end
+
+      def next_path
+        bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: })
+      end
+
+    private
+
+      def possible_years
+        FormHandler.instance.sales_forms.values.map { |form| form.start_date.year }.sort.reverse
+      end
+    end
+  end
+end
diff --git a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb
new file mode 100644
index 000000000..d8cfedd08
--- /dev/null
+++ b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb
@@ -0,0 +1,33 @@
+<% content_for :before_content do %>
+  <%= govuk_back_link href: @form.back_path %>
+<% end %>
+
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <%= form_with model: @form, scope: :form, url: bulk_upload_lettings_log_path(id: "prepare-your-file"), method: :patch do |f| %>
+      <%= f.hidden_field :year %>
+
+      <span class="govuk-caption-l">Upload lettings logs in bulk (<%= @form.year_combo %>)</span>
+      <h1 class="govuk-heading-l">Prepare your file</h1>
+
+      <h2 class="govuk-heading-m">Create your file</h2>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>Download the <%= govuk_link_to "bulk lettings template", @form.template_path %></li>
+        <li>Export the data from your housing management system, matching the template</li>
+        <li>If you cannot export it in this format, you may have to input it manually</li>
+      </ul>
+
+      <h2 class="govuk-heading-m">Check your data</h2>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>Check data is complete and formatted correctly, using data specifications (opens in a new tab)</li>
+      </ul>
+
+      <h2 class="govuk-heading-m">Save your file</h2>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>Save the file (CSV format <strong>only</strong>)</li>
+      </ul>
+
+      <%= f.govuk_submit %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/bulk_upload_lettings_logs/forms/upload_your_file.html.erb b/app/views/bulk_upload_lettings_logs/forms/upload_your_file.html.erb
new file mode 100644
index 000000000..86dde8ae2
--- /dev/null
+++ b/app/views/bulk_upload_lettings_logs/forms/upload_your_file.html.erb
@@ -0,0 +1,17 @@
+<% content_for :before_content do %>
+  <%= govuk_back_link href: @form.back_path %>
+<% end %>
+
+<%= form_with model: @form, scope: :form, url: bulk_upload_lettings_log_path(id: "upload-your-file"), method: :patch do |f| %>
+  <%= f.govuk_error_summary %>
+
+  <div>
+    Upload your file goes here
+  </div>
+
+  <div>
+    year selected <%= @form.year %>
+  </div>
+
+  <%= f.govuk_submit %>
+<% end %>
diff --git a/app/views/bulk_upload_lettings_logs/forms/year.html.erb b/app/views/bulk_upload_lettings_logs/forms/year.html.erb
new file mode 100644
index 000000000..8ba1c280f
--- /dev/null
+++ b/app/views/bulk_upload_lettings_logs/forms/year.html.erb
@@ -0,0 +1,16 @@
+<% content_for :before_content do %>
+  <%= govuk_back_link href: @form.back_path %>
+<% end %>
+
+<%= form_with model: @form, scope: :form, url: bulk_upload_lettings_log_path(id: "year"), method: :patch do |f| %>
+  <%= f.govuk_error_summary %>
+
+  <%= f.govuk_collection_radio_buttons :year,
+        @form.options,
+        :id,
+        :name,
+        legend: { text: "Which year are you uploading data for?", size: "l" },
+        caption: { text: "Upload lettings logs in bulk", size: "l" } %>
+
+  <%= f.govuk_submit %>
+<% end %>
diff --git a/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb b/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb
new file mode 100644
index 000000000..0157b66eb
--- /dev/null
+++ b/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb
@@ -0,0 +1,33 @@
+<% content_for :before_content do %>
+  <%= govuk_back_link href: @form.back_path %>
+<% end %>
+
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <%= form_with model: @form, scope: :form, url: bulk_upload_sales_log_path(id: "prepare-your-file"), method: :patch do |f| %>
+      <%= f.hidden_field :year %>
+
+      <span class="govuk-caption-l">Upload sales logs in bulk (<%= @form.year_combo %>)</span>
+      <h1 class="govuk-heading-l">Prepare your file</h1>
+
+      <h2 class="govuk-heading-m">Create your file</h2>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>Download the <%= govuk_link_to "bulk sales template", @form.template_path %></li>
+        <li>Export the data from your housing management system, matching the template</li>
+        <li>If you cannot export it in this format, you may have to input it manually</li>
+      </ul>
+
+      <h2 class="govuk-heading-m">Check your data</h2>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>Check data is complete and formatted correctly, using data specifications (opens in a new tab)</li>
+      </ul>
+
+      <h2 class="govuk-heading-m">Save your file</h2>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>Save the file (CSV format <strong>only</strong>)</li>
+      </ul>
+
+      <%= f.govuk_submit %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/bulk_upload_sales_logs/forms/upload_your_file.html.erb b/app/views/bulk_upload_sales_logs/forms/upload_your_file.html.erb
new file mode 100644
index 000000000..a178339e8
--- /dev/null
+++ b/app/views/bulk_upload_sales_logs/forms/upload_your_file.html.erb
@@ -0,0 +1,17 @@
+<% content_for :before_content do %>
+  <%= govuk_back_link href: @form.back_path %>
+<% end %>
+
+<%= form_with model: @form, scope: :form, url: bulk_upload_sales_log_path(id: "upload-your-file"), method: :patch do |f| %>
+  <%= f.govuk_error_summary %>
+
+  <div>
+    Upload your file goes here
+  </div>
+
+  <div>
+    year selected <%= @form.year %>
+  </div>
+
+  <%= f.govuk_submit %>
+<% end %>
diff --git a/app/views/bulk_upload_sales_logs/forms/year.html.erb b/app/views/bulk_upload_sales_logs/forms/year.html.erb
new file mode 100644
index 000000000..d8aa09172
--- /dev/null
+++ b/app/views/bulk_upload_sales_logs/forms/year.html.erb
@@ -0,0 +1,16 @@
+<% content_for :before_content do %>
+  <%= govuk_back_link href: @form.back_path %>
+<% end %>
+
+<%= form_with model: @form, scope: :form, url: bulk_upload_sales_log_path(id: "year"), method: :patch do |f| %>
+  <%= f.govuk_error_summary %>
+
+  <%= f.govuk_collection_radio_buttons :year,
+        @form.options,
+        :id,
+        :name,
+        legend: { text: "Which year are you uploading data for?", size: "l" },
+        caption: { text: "Upload sales logs in bulk", size: "l" } %>
+
+  <%= f.govuk_submit %>
+<% end %>
diff --git a/app/views/logs/index.html.erb b/app/views/logs/index.html.erb
index 431ca0f45..a340973cf 100644
--- a/app/views/logs/index.html.erb
+++ b/app/views/logs/index.html.erb
@@ -10,14 +10,18 @@
 <% end %>
 
 <div class="app-filter-layout" data-controller="filter-layout">
-  <div class="govuk-button-group app-filter-toggle">
+  <div class="govuk-button-group app-filter-toggle govuk-!-margin-bottom-6">
     <% if current_page?(controller: 'lettings_logs', action: 'index') %>
-      <%= govuk_button_to "Create a new lettings log", lettings_logs_path %>
+      <%= govuk_button_to "Create a new lettings log", lettings_logs_path, class: "govuk-!-margin-right-6" %>
     <% end %>
+
     <% if FeatureToggle.sales_log_enabled? && current_page?(controller: 'sales_logs', action: 'index') %>
-      <%= govuk_button_to "Create a new sales log", sales_logs_path %>
+      <%= govuk_button_to "Create a new sales log", sales_logs_path, class: "govuk-!-margin-right-6" %>
+    <% end %>
+
+    <% if FeatureToggle.bulk_upload_logs? %>
+      <%= govuk_button_link_to "Upload #{log_type_for_controller(controller)} logs in bulk", bulk_upload_path_for_controller(controller, id: "start"), secondary: true %>
     <% end %>
-    <%#= govuk_link_to "Upload logs", bulk_upload_lettings_logs_path %>
   </div>
 
   <%= render partial: "log_filters" %>
diff --git a/config/initializers/feature_toggle.rb b/config/initializers/feature_toggle.rb
index 7cd75ddd3..8fc2cd7d4 100644
--- a/config/initializers/feature_toggle.rb
+++ b/config/initializers/feature_toggle.rb
@@ -22,4 +22,8 @@ class FeatureToggle
   def self.managing_for_other_user_enabled?
     !Rails.env.production?
   end
+
+  def self.bulk_upload_logs?
+    !Rails.env.production?
+  end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 43e03c814..2463041f9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,6 +38,18 @@ en:
     create_password: "Create a password to finish setting up your account"
     reset_password: "Reset your password"
 
+  activemodel:
+    errors:
+      models:
+        forms/bulk_upload_lettings/year:
+          attributes:
+            year:
+              blank: You must select a collection period to upload for
+        forms/bulk_upload_sales/year:
+          attributes:
+            year:
+              blank: You must select a collection period to upload for
+
   activerecord:
     errors:
       models:
diff --git a/config/routes.rb b/config/routes.rb
index ce005902f..aebc664ab 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -111,6 +111,12 @@ Rails.application.routes.draw do
       get "csv-download", to: "lettings_logs#download_csv"
       post "email-csv", to: "lettings_logs#email_csv"
       get "csv-confirmation", to: "lettings_logs#csv_confirmation"
+
+      resources :bulk_upload_lettings_logs, path: "bulk-upload-logs" do
+        collection do
+          get :start
+        end
+      end
     end
 
     member do
@@ -130,6 +136,14 @@ Rails.application.routes.draw do
   end
 
   resources :sales_logs, path: "/sales-logs" do
+    collection do
+      resources :bulk_upload_sales_logs, path: "bulk-upload-logs" do
+        collection do
+          get :start
+        end
+      end
+    end
+
     FormHandler.instance.sales_forms.each do |_key, form|
       form.pages.map do |page|
         get page.id.to_s.dasherize, to: "form#show_page"
diff --git a/public/files/bulk-upload-lettings-template-v1.xlsx b/public/files/bulk-upload-lettings-template-v1.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..ca30388baf0f2e1933ef805f8e397d0bd9ca6c13
GIT binary patch
literal 35928
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

literal 0
HcmV?d00001

diff --git a/public/files/bulk-upload-sales-template-v1.xlsx b/public/files/bulk-upload-sales-template-v1.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..73c9f829c4e4ebe46b21db1539704ccb4b048927
GIT binary patch
literal 26703
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

literal 0
HcmV?d00001

diff --git a/spec/features/bulk_upload_lettings_logs_spec.rb b/spec/features/bulk_upload_lettings_logs_spec.rb
new file mode 100644
index 000000000..e9a05b07d
--- /dev/null
+++ b/spec/features/bulk_upload_lettings_logs_spec.rb
@@ -0,0 +1,51 @@
+require "rails_helper"
+
+RSpec.describe "Bulk upload lettings log" do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in user
+  end
+
+  context "when during crossover period" do
+    it "shows journey with year option" do
+      Timecop.freeze(2023, 6, 1) do
+        visit("/lettings-logs")
+        expect(page).to have_link("Upload lettings logs in bulk")
+        click_link("Upload lettings logs in bulk")
+
+        expect(page).to have_content("Which year")
+        click_button("Continue")
+
+        expect(page).to have_content("You must select a collection period to upload for")
+        choose("2022/2023")
+        click_button("Continue")
+
+        click_link("Back")
+
+        expect(page.find_field("form-year-2022-field")).to be_checked
+        click_button("Continue")
+
+        expect(page).to have_content("Upload lettings logs in bulk (2022/23)")
+        click_button("Continue")
+
+        expect(page).to have_content("Upload your file")
+      end
+    end
+  end
+
+  context "when not it crossover period" do
+    it "shows journey with year option" do
+      Timecop.freeze(2023, 10, 1) do
+        visit("/lettings-logs")
+        expect(page).to have_link("Upload lettings logs in bulk")
+        click_link("Upload lettings logs in bulk")
+
+        expect(page).to have_content("Upload lettings logs in bulk (2022/23)")
+        click_button("Continue")
+
+        expect(page).to have_content("Upload your file")
+      end
+    end
+  end
+end
diff --git a/spec/features/bulk_upload_sales_logs_spec.rb b/spec/features/bulk_upload_sales_logs_spec.rb
new file mode 100644
index 000000000..67187ff78
--- /dev/null
+++ b/spec/features/bulk_upload_sales_logs_spec.rb
@@ -0,0 +1,51 @@
+require "rails_helper"
+
+RSpec.describe "Bulk upload sales log" do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in user
+  end
+
+  context "when during crossover period" do
+    it "shows journey with year option" do
+      Timecop.freeze(2023, 6, 1) do
+        visit("/sales-logs")
+        expect(page).to have_link("Upload sales logs in bulk")
+        click_link("Upload sales logs in bulk")
+
+        expect(page).to have_content("Which year")
+        click_button("Continue")
+
+        expect(page).to have_content("You must select a collection period to upload for")
+        choose("2022/2023")
+        click_button("Continue")
+
+        click_link("Back")
+
+        expect(page.find_field("form-year-2022-field")).to be_checked
+        click_button("Continue")
+
+        expect(page).to have_content("Upload sales logs in bulk (2022/23)")
+        click_button("Continue")
+
+        expect(page).to have_content("Upload your file")
+      end
+    end
+  end
+
+  context "when not it crossover period" do
+    it "shows journey with year option" do
+      Timecop.freeze(2023, 10, 1) do
+        visit("/sales-logs")
+        expect(page).to have_link("Upload sales logs in bulk")
+        click_link("Upload sales logs in bulk")
+
+        expect(page).to have_content("Upload sales logs in bulk (2022/23)")
+        click_button("Continue")
+
+        expect(page).to have_content("Upload your file")
+      end
+    end
+  end
+end
diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb
index a062a4aa5..f8bcddcca 100644
--- a/spec/models/form_spec.rb
+++ b/spec/models/form_spec.rb
@@ -235,4 +235,38 @@ RSpec.describe Form, type: :model do
       expect(form.sections[1].class).to eq(Form::Sales::Sections::PropertyInformation)
     end
   end
+
+  describe "#in_crossover_period?" do
+    context "when now not specified" do
+      context "when after end period" do
+        subject(:form) { described_class.new(nil, 2022, [], "sales") }
+
+        it "returns false" do
+          Timecop.freeze(2023, 8, 1) do
+            expect(form).not_to be_in_crossover_period
+          end
+        end
+      end
+
+      context "when during crossover" do
+        subject(:form) { described_class.new(nil, 2022, [], "sales") }
+
+        it "returns true" do
+          Timecop.freeze(2023, 6, 1) do
+            expect(form).to be_in_crossover_period
+          end
+        end
+      end
+
+      context "when before crossover" do
+        subject(:form) { described_class.new(nil, 2022, [], "sales") }
+
+        it "returns false" do
+          Timecop.freeze(2023, 1, 1) do
+            expect(form).not_to be_in_crossover_period
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/spec/models/forms/bulk_upload_lettings/year_spec.rb b/spec/models/forms/bulk_upload_lettings/year_spec.rb
new file mode 100644
index 000000000..0b0babb30
--- /dev/null
+++ b/spec/models/forms/bulk_upload_lettings/year_spec.rb
@@ -0,0 +1,12 @@
+require "rails_helper"
+
+RSpec.describe Forms::BulkUploadLettings::Year do
+  subject(:form) { described_class.new }
+
+  describe "#options" do
+    it "returns correct years" do
+      expect(form.options.map(&:id)).to eql([2022, 2021])
+      expect(form.options.map(&:name)).to eql(%w[2022/2023 2021/2022])
+    end
+  end
+end
diff --git a/spec/models/forms/bulk_upload_sales/year_spec.rb b/spec/models/forms/bulk_upload_sales/year_spec.rb
new file mode 100644
index 000000000..2276b1e4d
--- /dev/null
+++ b/spec/models/forms/bulk_upload_sales/year_spec.rb
@@ -0,0 +1,12 @@
+require "rails_helper"
+
+RSpec.describe Forms::BulkUploadSales::Year do
+  subject(:form) { described_class.new }
+
+  describe "#options" do
+    it "returns correct years" do
+      expect(form.options.map(&:id)).to eql([2022, 2021])
+      expect(form.options.map(&:name)).to eql(%w[2022/2023 2021/2022])
+    end
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index cdeb71092..e25631df7 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -82,6 +82,7 @@ RSpec.configure do |config|
   config.include Devise::Test::ControllerHelpers, type: :controller
   config.include Devise::Test::ControllerHelpers, type: :view
   config.include Devise::Test::IntegrationHelpers, type: :request
+  config.include Devise::Test::IntegrationHelpers, type: :feature
   config.include ViewComponent::TestHelpers, type: :component
   config.include Capybara::RSpecMatchers, type: :component
   config.include ActiveJob::TestHelper
diff --git a/spec/requests/bulk_upload_lettings_logs_controller_spec.rb b/spec/requests/bulk_upload_lettings_logs_controller_spec.rb
new file mode 100644
index 000000000..788965e83
--- /dev/null
+++ b/spec/requests/bulk_upload_lettings_logs_controller_spec.rb
@@ -0,0 +1,32 @@
+require "rails_helper"
+
+RSpec.describe BulkUploadLettingsLogsController, type: :request do
+  let(:user) { FactoryBot.create(:user) }
+  let(:organisation) { user.organisation }
+
+  before do
+    sign_in user
+  end
+
+  describe "GET /lettings-logs/bulk-upload-logs/start" do
+    context "when not in crossover period" do
+      it "redirects to /prepare-your-file" do
+        Timecop.freeze(2022, 1, 1) do
+          get "/lettings-logs/bulk-upload-logs/start", params: {}
+
+          expect(response).to redirect_to("/lettings-logs/bulk-upload-logs/prepare-your-file?form%5Byear%5D=2022")
+        end
+      end
+    end
+
+    context "when in crossover period" do
+      it "redirects to /year" do
+        Timecop.freeze(2023, 6, 1) do
+          get "/lettings-logs/bulk-upload-logs/start", params: {}
+
+          expect(response).to redirect_to("/lettings-logs/bulk-upload-logs/year")
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/bulk_upload_sales_logs_controller_spec.rb b/spec/requests/bulk_upload_sales_logs_controller_spec.rb
new file mode 100644
index 000000000..f668b0da1
--- /dev/null
+++ b/spec/requests/bulk_upload_sales_logs_controller_spec.rb
@@ -0,0 +1,32 @@
+require "rails_helper"
+
+RSpec.describe BulkUploadSalesLogsController, type: :request do
+  let(:user) { FactoryBot.create(:user) }
+  let(:organisation) { user.organisation }
+
+  before do
+    sign_in user
+  end
+
+  describe "GET /sales-logs/bulk-upload-logs/start" do
+    context "when not in crossover period" do
+      it "redirects to /prepare-your-file" do
+        Timecop.freeze(2022, 1, 1) do
+          get "/sales-logs/bulk-upload-logs/start", params: {}
+
+          expect(response).to redirect_to("/sales-logs/bulk-upload-logs/prepare-your-file?form%5Byear%5D=2022")
+        end
+      end
+    end
+
+    context "when in crossover period" do
+      it "redirects to /year" do
+        Timecop.freeze(2023, 6, 1) do
+          get "/sales-logs/bulk-upload-logs/start", params: {}
+
+          expect(response).to redirect_to("/sales-logs/bulk-upload-logs/year")
+        end
+      end
+    end
+  end
+end

From d52d45b941c5884eb0929a12f5fc537b96abd39d Mon Sep 17 00:00:00 2001
From: Phil Lee <asmega@users.noreply.github.com>
Date: Fri, 2 Dec 2022 09:23:35 +0000
Subject: [PATCH 8/8] fix test (#1047)

- we now do a lookup for the expected start year on current form
---
 spec/requests/bulk_upload_lettings_logs_controller_spec.rb | 4 +++-
 spec/requests/bulk_upload_sales_logs_controller_spec.rb    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec/requests/bulk_upload_lettings_logs_controller_spec.rb b/spec/requests/bulk_upload_lettings_logs_controller_spec.rb
index 788965e83..3b59d449d 100644
--- a/spec/requests/bulk_upload_lettings_logs_controller_spec.rb
+++ b/spec/requests/bulk_upload_lettings_logs_controller_spec.rb
@@ -10,11 +10,13 @@ RSpec.describe BulkUploadLettingsLogsController, type: :request do
 
   describe "GET /lettings-logs/bulk-upload-logs/start" do
     context "when not in crossover period" do
+      let(:expected_year) { FormHandler.instance.forms["current_lettings"].start_date.year }
+
       it "redirects to /prepare-your-file" do
         Timecop.freeze(2022, 1, 1) do
           get "/lettings-logs/bulk-upload-logs/start", params: {}
 
-          expect(response).to redirect_to("/lettings-logs/bulk-upload-logs/prepare-your-file?form%5Byear%5D=2022")
+          expect(response).to redirect_to("/lettings-logs/bulk-upload-logs/prepare-your-file?form%5Byear%5D=#{expected_year}")
         end
       end
     end
diff --git a/spec/requests/bulk_upload_sales_logs_controller_spec.rb b/spec/requests/bulk_upload_sales_logs_controller_spec.rb
index f668b0da1..348179dd2 100644
--- a/spec/requests/bulk_upload_sales_logs_controller_spec.rb
+++ b/spec/requests/bulk_upload_sales_logs_controller_spec.rb
@@ -10,11 +10,13 @@ RSpec.describe BulkUploadSalesLogsController, type: :request do
 
   describe "GET /sales-logs/bulk-upload-logs/start" do
     context "when not in crossover period" do
+      let(:expected_year) { FormHandler.instance.forms["current_sales"].start_date.year }
+
       it "redirects to /prepare-your-file" do
         Timecop.freeze(2022, 1, 1) do
           get "/sales-logs/bulk-upload-logs/start", params: {}
 
-          expect(response).to redirect_to("/sales-logs/bulk-upload-logs/prepare-your-file?form%5Byear%5D=2022")
+          expect(response).to redirect_to("/sales-logs/bulk-upload-logs/prepare-your-file?form%5Byear%5D=#{expected_year}")
         end
       end
     end