Merge branch 'main' into CLDC-3744-fix-uc-proportion-validation

app/controllers/merge_requests_controller.rb

@@ -143,6 +143,7 @@ private
 
       if [day, month, year].none?(&:blank?) && Date.valid_date?(year.to_i, month.to_i, day.to_i)
         merge_request_params["merge_date"] = Time.zone.local(year.to_i, month.to_i, day.to_i)
+        @merge_request.errors.add(:merge_date, :more_than_year_from_today) if Time.zone.local(year.to_i, month.to_i, day.to_i) - 1.year > Time.zone.today
       else
         @merge_request.errors.add(:merge_date, :invalid)
       end

app/controllers/organisations_controller.rb

@@ -24,7 +24,7 @@ class OrganisationsController < ApplicationController
   end
 
   def schemes
-    organisation_schemes = Scheme.visible.where(owning_organisation: [@organisation] + @organisation.parent_organisations)
+    organisation_schemes = Scheme.visible.where(owning_organisation: [@organisation] + @organisation.parent_organisations + @organisation.absorbed_organisations.visible.merged_during_open_collection_period)
 
     @pagy, @schemes = pagy(filter_manager.filtered_schemes(organisation_schemes, search_term, session_filters))
     @searched = search_term.presence

app/controllers/schemes_controller.rb

@@ -118,6 +118,10 @@ class SchemesController < ApplicationController
     validation_errors scheme_params
 
     if @scheme.errors.empty? && @scheme.save
+      if @scheme.owning_organisation.merge_date.present?
+        deactivation = SchemeDeactivationPeriod.new(scheme: @scheme, deactivation_date: @scheme.owning_organisation.merge_date)
+        deactivation.save!(validate: false)
+      end
       redirect_to scheme_primary_client_group_path(@scheme)
     else
       if @scheme.errors.any? { |error| error.attribute == :owning_organisation }
@@ -152,7 +156,7 @@ class SchemesController < ApplicationController
           flash[:notice] = if scheme_previously_confirmed
                              "#{@scheme.service_name} has been updated."
                            else
-                             "#{@scheme.service_name} has been created. It does not require helpdesk approval."
+                             "#{@scheme.service_name} has been created."
                            end
           redirect_to scheme_path(@scheme)
         end

app/controllers/users_controller.rb

@@ -114,6 +114,7 @@ class UsersController < ApplicationController
 
     validate_attributes
     if @user.errors.empty? && @user.save
+      flash[:notice] = "Invitation sent to #{@user.email}"
       redirect_to created_user_redirect_path
     else
       unless @user.errors[:organisation].empty?

app/helpers/filters_helper.rb

@@ -192,9 +192,15 @@ module FiltersHelper
   end
 
   def show_scheme_managing_org_filter?(user)
+    return true if user.support?
+
     org = user.organisation
+    stock_owners = org.stock_owners.count
+    recently_absorbed_with_stock = org.absorbed_organisations.visible.merged_during_open_collection_period.where(holds_own_stock: true).count
+
+    relevant_orgs_count = stock_owners + recently_absorbed_with_stock + (org.holds_own_stock? ? 1 : 0)
 
-    user.support? || org.stock_owners.count > 1 || (org.holds_own_stock? && org.stock_owners.count.positive?)
+    relevant_orgs_count > 1
   end
 
   def logs_for_both_needstypes_present?(organisation)

app/helpers/merge_requests_helper.rb

@@ -276,4 +276,8 @@ module MergeRequestsHelper
   def any_organisations_share_logs?(organisations, type)
     organisations.any? { |organisation| organisation.send("#{type}_logs").filter_by_managing_organisation(organisations.where.not(id: organisation.id)).exists? }
   end
+
+  def begin_merge_disabled?(merge_request)
+    merge_request.status != "ready_to_merge" || merge_request.merge_date.future?
+  end
 end

app/helpers/schemes_helper.rb

@@ -20,11 +20,14 @@ module SchemesHelper
   end
 
   def owning_organisation_options(current_user)
-    all_orgs = Organisation.visible.map { |org| OpenStruct.new(id: org.id, name: org.name) }
+    if current_user.support?
-    user_org = [OpenStruct.new(id: current_user.organisation_id, name: current_user.organisation.name)]
+      Organisation.visible.map { |org| OpenStruct.new(id: org.id, name: org.name) }
-    stock_owners = current_user.organisation.stock_owners.visible.map { |org| OpenStruct.new(id: org.id, name: org.name) }
+    else
-    merged_organisations = current_user.organisation.absorbed_organisations.visible.merged_during_open_collection_period.map { |org| OpenStruct.new(id: org.id, name: org.name) }
+      user_org = [current_user.organisation]
-    current_user.support? ? all_orgs : user_org + stock_owners + merged_organisations
+      stock_owners = current_user.organisation.stock_owners.visible.filter { |org| org.status == :active || (org.status == :merged && org.merge_date >= FormHandler.instance.start_date_of_earliest_open_for_editing_collection_period) }
+      merged_organisations = current_user.organisation.absorbed_organisations.visible.merged_during_open_collection_period
+      (user_org + stock_owners + merged_organisations).map { |org| OpenStruct.new(id: org.id, name: org.name) }
+    end
   end
 
   def null_option
@@ -81,7 +84,12 @@ module SchemesHelper
     when :deactivating_soon
       "This scheme deactivates on #{scheme.last_deactivation_date.to_formatted_s(:govuk_date)}. Any locations you add will be deactivated on the same date. Reactivate the scheme to add locations active after this date."
     when :deactivated
-      "This scheme deactivated on #{scheme.last_deactivation_date.to_formatted_s(:govuk_date)}. Any locations you add will be deactivated on the same date. Reactivate the scheme to add locations active after this date."
+      case scheme.owning_organisation.status
+      when :active
+        "This scheme deactivated on #{scheme.last_deactivation_date.to_formatted_s(:govuk_date)}. Any locations you add will be deactivated on the same date. Reactivate the scheme to add locations active after this date."
+      when :merged
+        "This scheme has been deactivated due to #{scheme.owning_organisation.name} merging into #{scheme.owning_organisation.absorbing_organisation.name} on #{scheme.owning_organisation.merge_date.to_formatted_s(:govuk_date)}. Any locations you add will be deactivated on the same date. Use the after merge organisation for schemes and locations active after this date."
+      end
     end
   end
 

app/models/form/lettings/subsections/household_needs.rb

@@ -2,7 +2,6 @@ class Form::Lettings::Subsections::HouseholdNeeds < ::Form::Subsection
   def initialize(id, hsh, section)
     super
     @id = "household_needs"
-    @copy_key = "lettings.household_needs.housingneeds_type"
     @label = "Household needs"
     @depends_on = [{ "non_location_setup_questions_completed?" => true }]
   end

app/models/location.rb

@@ -54,13 +54,13 @@ class Location < ApplicationRecord
   }
 
   scope :deactivated, lambda { |date = Time.zone.now|
-    deactivated_by_organisation
+    deactivated_by_organisation(date)
       .or(deactivated_directly(date))
       .or(deactivated_by_scheme(date))
   }
 
-  scope :deactivated_by_organisation, lambda {
+  scope :deactivated_by_organisation, lambda { |date = Time.zone.now|
-    merge(Organisation.filter_by_inactive)
+    merge(Organisation.filter_by_inactive.or(Organisation.where("merge_date <= ?", date)))
   }
 
   scope :deactivated_by_scheme, lambda { |date = Time.zone.now|
@@ -206,7 +206,7 @@ class Location < ApplicationRecord
   def status_at(date)
     return :deleted if discarded_at.present?
     return :incomplete unless confirmed
-    return :deactivated if scheme.owning_organisation.status_at(date) == :deactivated ||
+    return :deactivated if scheme.owning_organisation.status_at(date) == :deactivated || scheme.owning_organisation.status_at(date) == :merged ||
       open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date || scheme.status_at(date) == :deactivated
     return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date || scheme.status_at(date) == :deactivating_soon
     return :activating_soon if startdate.present? && date < startdate

app/models/log.rb

@@ -111,6 +111,7 @@ class Log < ApplicationRecord
         self.town_or_city = nil
         self.county = nil
         self.postcode_full = postcode_full_input
+        process_postcode_changes!
       else
         self.uprn = uprn_selection
         self.uprn_confirmed = 1

app/models/merge_request_organisation.rb

@@ -29,5 +29,12 @@ private
     if merging_organisation_id.blank? || !Organisation.where(id: merging_organisation_id).exists?
       merge_request.errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_not_selected"))
     end
+
+    existing_merges = MergeRequestOrganisation.with_merging_organisation(merging_organisation)
+    if existing_merges.count.positive?
+      existing_merge_request = existing_merges.first.merge_request
+      errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_merge"))
+      merge_request.errors.add(:merging_organisation, I18n.t("validations.merge_request.organisation_part_of_another_incomplete_merge", organisation: merging_organisation.name, absorbing_organisation: existing_merge_request.absorbing_organisation&.name, merge_date: existing_merge_request.merge_date&.to_fs(:govuk_date)))
+    end
   end
 end

app/models/scheme.rb

@@ -57,8 +57,8 @@ class Scheme < ApplicationRecord
       .or(deactivated_directly)
   }
 
-  scope :deactivated_by_organisation, lambda {
+  scope :deactivated_by_organisation, lambda { |date = Time.zone.now|
-    merge(Organisation.filter_by_inactive)
+    merge(Organisation.filter_by_inactive.or(Organisation.where("merge_date <= ?", date)))
   }
 
   scope :deactivated_directly, lambda { |date = Time.zone.now|
@@ -96,7 +96,7 @@ class Scheme < ApplicationRecord
   scope :active, lambda { |date = Time.zone.now|
     where.not(id: joins(:scheme_deactivation_periods).reactivating_soon(date).pluck(:id))
     .where.not(id: incomplete.pluck(:id))
-      .where.not(id: joins(:owning_organisation).deactivated_by_organisation.pluck(:id))
+      .where.not(id: joins(:owning_organisation).deactivated_by_organisation(date).pluck(:id))
       .where.not(id: joins(:owning_organisation).joins(:scheme_deactivation_periods).deactivated_directly(date).pluck(:id))
       .where.not(id: activating_soon(date).pluck(:id))
   }
@@ -314,7 +314,7 @@ class Scheme < ApplicationRecord
   def status_at(date)
     return :deleted if discarded_at.present?
     return :incomplete unless confirmed && locations.confirmed.any?
-    return :deactivated if owning_organisation.status_at(date) == :deactivated ||
+    return :deactivated if owning_organisation.status_at(date) == :deactivated || owning_organisation.status_at(date) == :merged ||
       (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 last_deactivation_before(date)&.reactivation_date.present? && date < last_deactivation_before(date).reactivation_date

app/policies/location_policy.rb

@@ -16,14 +16,14 @@ class LocationPolicy
     if location == Location
       user.data_coordinator?
     else
-      user.data_coordinator? && scheme_owned_by_user_org_or_stock_owner
+      user.data_coordinator? && scheme_owned_by_user_org_or_stock_owner_or_recently_absorbed_org
     end
   end
 
   def update?
     return true if user.support?
 
-    user.data_coordinator? && scheme_owned_by_user_org_or_stock_owner
+    user.data_coordinator? && scheme_owned_by_user_org_or_stock_owner_or_recently_absorbed_org
   end
 
   def delete_confirmation?
@@ -62,7 +62,7 @@ class LocationPolicy
     define_method method_name do
       return true if user.support?
 
-      user.data_coordinator? && scheme_owned_by_user_org_or_stock_owner
+      user.data_coordinator? && scheme_owned_by_user_org_or_stock_owner_or_recently_absorbed_org
     end
   end
 
@@ -73,7 +73,7 @@ class LocationPolicy
     define_method method_name do
       return true if user.support?
 
-      scheme_owned_by_user_org_or_stock_owner
+      scheme_owned_by_user_org_or_stock_owner_or_recently_absorbed_org
     end
   end
 
@@ -83,8 +83,11 @@ private
     location.scheme
   end
 
-  def scheme_owned_by_user_org_or_stock_owner
+  def scheme_owned_by_user_org_or_stock_owner_or_recently_absorbed_org
-    scheme&.owning_organisation == user.organisation || user.organisation.stock_owners.exists?(scheme&.owning_organisation_id)
+    scheme_owned_by_user_org = scheme&.owning_organisation == user.organisation
+    scheme_owned_by_stock_owner = user.organisation.stock_owners.exists?(scheme&.owning_organisation_id)
+    scheme_owned_by_recently_absorbed_org = user.organisation.absorbed_organisations.visible.merged_during_open_collection_period.exists?(scheme&.owning_organisation_id)
+    scheme_owned_by_user_org || scheme_owned_by_stock_owner || scheme_owned_by_recently_absorbed_org
   end
 
   def has_any_logs_in_editable_collection_period

app/policies/scheme_policy.rb

@@ -12,7 +12,7 @@ class SchemePolicy
     if scheme == Scheme
       true
     else
-      scheme_owned_by_user_org_or_stock_owner
+      scheme_owned_by_user_org_or_stock_owner_or_recently_absorbed_org
     end
   end
 
@@ -27,7 +27,7 @@ class SchemePolicy
   def update?
     return true if user.support?
 
-    user.data_coordinator? && scheme_owned_by_user_org_or_stock_owner
+    user.data_coordinator? && scheme_owned_by_user_org_or_stock_owner_or_recently_absorbed_org
   end
 
   def changes?
@@ -41,7 +41,7 @@ class SchemePolicy
     define_method method_name do
       return true if user.support?
 
-      scheme_owned_by_user_org_or_stock_owner
+      scheme_owned_by_user_org_or_stock_owner_or_recently_absorbed_org
     end
   end
 
@@ -61,7 +61,7 @@ class SchemePolicy
     define_method method_name do
       return true if user.support?
 
-      user.data_coordinator? && scheme_owned_by_user_org_or_stock_owner
+      user.data_coordinator? && scheme_owned_by_user_org_or_stock_owner_or_recently_absorbed_org
     end
   end
 
@@ -78,8 +78,11 @@ class SchemePolicy
 
 private
 
-  def scheme_owned_by_user_org_or_stock_owner
+  def scheme_owned_by_user_org_or_stock_owner_or_recently_absorbed_org
-    scheme&.owning_organisation == user.organisation || user.organisation.stock_owners.exists?(scheme&.owning_organisation_id)
+    scheme_owned_by_user_org = scheme&.owning_organisation == user.organisation
+    scheme_owned_by_stock_owner = user.organisation.stock_owners.exists?(scheme&.owning_organisation_id)
+    scheme_owned_by_recently_absorbed_org = user.organisation.absorbed_organisations.visible.merged_during_open_collection_period.exists?(scheme&.owning_organisation_id)
+    scheme_owned_by_user_org || scheme_owned_by_stock_owner || scheme_owned_by_recently_absorbed_org
   end
 
   def has_any_logs_in_editable_collection_period

app/views/locations/index.html.erb

@@ -56,14 +56,13 @@
       <% end %>
     <% end %>
 
-    <% if status_hint_message = scheme_status_hint(@scheme) %>
+    <% if LocationPolicy.new(current_user, @scheme.locations.new).create? && [:active, :merged].include?(@scheme.owning_organisation.status) %>
-      <div class="govuk-hint">
+      <% if status_hint_message = scheme_status_hint(@scheme) %>
-        <%= status_hint_message %>
+        <div class="govuk-hint">
-      </div>
+          <%= status_hint_message %>
-      <br>
+        </div>
-    <% end %>
+        <br>
-
+      <% end %>
-    <% if LocationPolicy.new(current_user, @scheme.locations.new).create? %>
       <%= govuk_button_to "Add a location", scheme_locations_path(@scheme), method: "post" %>
     <% end %>
     <br>

app/views/locations/show.html.erb

@@ -47,7 +47,7 @@
   </div>
 </div>
 
-<% if @location.scheme.owning_organisation.active? && LocationPolicy.new(current_user, @location).deactivate? %>
+<% if @location.scheme.owning_organisation.status == :active && LocationPolicy.new(current_user, @location).deactivate? %>
   <%= toggle_location_link(@location) %>
 <% end %>
 

app/views/merge_requests/_notification_banners.html.erb

@@ -19,3 +19,11 @@
     No changes have been made. Try beginning the merge again.
   <% end %>
 <% end %>
+
+<% if @merge_request.merge_date&.future? %>
+  <%= govuk_notification_banner(title_text: "Important") do %>
+    <p class="govuk-notification-banner__heading govuk-!-width-full" style="max-width: fit-content">
+      This merge is happening in the future. Wait until the merge date to begin this merge.
+    </p>
+  <% end %>
+<% end %>

app/views/merge_requests/show.html.erb

@@ -12,7 +12,7 @@
 </h1>
 <% unless @merge_request.status == "request_merged" || @merge_request.status == "processing" %>
 <div class="govuk-button-group">
-  <%= govuk_button_link_to "Begin merge", merge_start_confirmation_merge_request_path(@merge_request), disabled: @merge_request.status != "ready_to_merge" %>
+  <%= govuk_button_link_to "Begin merge", merge_start_confirmation_merge_request_path(@merge_request), disabled: begin_merge_disabled?(@merge_request) %>
   <%= govuk_button_link_to "Delete merge request", delete_confirmation_merge_request_path(@merge_request), warning: true %>
 </div>
 <% end %>

app/views/schemes/details.html.erb

@@ -49,11 +49,13 @@
                                            :description,
                                            legend: { text: "Is this scheme registered under the Care Standards Act 2000?", size: "m" } %>
 
-      <% if current_user.data_coordinator? && current_user.organisation.stock_owners.count.zero? && !current_user.organisation.has_recent_absorbed_organisations? %>
+      <% scheme_owning_organisation_options = owning_organisation_options(current_user) %>
+
+      <% if scheme_owning_organisation_options.count == 1 %>
         <%= f.hidden_field :owning_organisation_id, value: current_user.organisation.id %>
       <% else %>
         <%= f.govuk_collection_select :owning_organisation_id,
-                                      owning_organisation_options(current_user),
+                                      scheme_owning_organisation_options,
                                       :id,
                                       :name,
                                       label: { text: "Which organisation owns the housing stock for this scheme?", size: "m" },

app/views/schemes/show.html.erb

@@ -52,7 +52,7 @@
   </div>
 </div>
 
-<% if @scheme.owning_organisation.active? && SchemePolicy.new(current_user, @scheme).deactivate? %>
+<% if @scheme.owning_organisation.status == :active && SchemePolicy.new(current_user, @scheme).deactivate? %>
   <%= toggle_scheme_link(@scheme) %>
 <% end %>
 

config/locales/en.yml

@@ -183,8 +183,11 @@ en:
             merge_date:
               blank: "Enter a merge date."
               invalid: "Enter a valid merge date."
+              more_than_year_from_today: "The merge date must not be later than a year from today’s date."
             existing_absorbing_organisation:
               blank: "You must answer absorbing organisation already active?"
+            merging_organisation_id:
+              part_of_another_merge: "Another merge request records %{organisation} as merging into %{absorbing_organisation} on %{merge_date}. Select another organisation or remove this organisation from the other merge request."
         notification:
           attributes:
             title:
@@ -370,6 +373,7 @@ en:
         during_deactivated_period: "The location is already deactivated during this date, please enter a different date."
     merge_request:
       organisation_part_of_another_merge: "This organisation is part of another merge - select a different one."
+      organisation_part_of_another_incomplete_merge: "Another merge request records %{organisation} as merging into %{absorbing_organisation} on %{merge_date}. Select another organisation or remove this organisation from the other merge request."
       organisation_not_selected: "Select an organisation from the search list."
 
   soft_validations:

spec/features/schemes_spec.rb

@@ -677,7 +677,7 @@ RSpec.describe "Schemes scheme Features" do
           end
 
           it "adds scheme to the list of schemes" do
-            expect(page).to have_content "#{scheme.service_name} has been created. It does not require helpdesk approval."
+            expect(page).to have_content "#{scheme.service_name} has been created."
             click_link "Schemes"
             expect(page).to have_content "Supported housing schemes"
             expect(page).to have_content scheme.id_to_display

spec/models/lettings_log_spec.rb

@@ -2021,5 +2021,17 @@ RSpec.describe LettingsLog do
       end
     end
   end
+
+  describe "#process_address_change!" do
+    context "when uprn_selection is uprn_not_listed" do
+      let(:log) { build(:lettings_log, uprn_selection: "uprn_not_listed", address_line1_input: "Address line 1", postcode_full_input: "AA1 1AA") }
+
+      it "sets log address fields, including postcode known" do
+        expect { log.process_address_change! }.to change(log, :address_line1).from(nil).to("Address line 1")
+                                              .and change(log, :postcode_full).from(nil).to("AA1 1AA")
+                                              .and change(log, :postcode_known).from(nil).to(1)
+      end
+    end
+  end
 end
 # rubocop:enable RSpec/MessageChain

spec/models/location_spec.rb

@@ -929,6 +929,11 @@ RSpec.describe Location, type: :model do
         expect(location.status).to eq(:deactivated)
       end
 
+      it "returns deactivated if the owning organisation has been merged" do
+        location.scheme.owning_organisation.merge_date = 2.days.ago
+        expect(location.status).to eq(:deactivated)
+      end
+
       it "returns deactivated if deactivation_date is in the past" do
         FactoryBot.create(:location_deactivation_period, deactivation_date: Time.zone.yesterday, location:)
         location.save!

spec/models/sales_log_spec.rb

@@ -995,5 +995,17 @@ RSpec.describe SalesLog, type: :model do
       expect(sales_log.reload.is_la_inferred).to eq(false)
     end
   end
+
+  describe "#process_address_change!" do
+    context "when uprn_selection is uprn_not_listed" do
+      let(:log) { build(:sales_log, uprn_selection: "uprn_not_listed", address_line1_input: "Address line 1", postcode_full_input: "AA1 1AA") }
+
+      it "sets log address fields, including postcode known" do
+        expect { log.process_address_change! }.to change(log, :address_line1).from(nil).to("Address line 1")
+                                              .and change(log, :postcode_full).from(nil).to("AA1 1AA")
+                                              .and change(log, :pcodenk).from(nil).to(0)
+      end
+    end
+  end
 end
 # rubocop:enable RSpec/MessageChain

spec/models/scheme_spec.rb

@@ -363,6 +363,11 @@ RSpec.describe Scheme, type: :model do
         expect(scheme.status).to eq(:deactivated)
       end
 
+      it "returns deactivated if the owning organisation has been merged" do
+        scheme.owning_organisation.merge_date = 2.days.ago
+        expect(scheme.status).to eq(:deactivated)
+      end
+
       it "returns deactivated if deactivation_date is in the past" do
         FactoryBot.create(:scheme_deactivation_period, deactivation_date: Time.zone.yesterday, scheme:)
         scheme.reload

spec/requests/merge_requests_controller_spec.rb

@@ -84,6 +84,22 @@ RSpec.describe MergeRequestsController, type: :request do
         end
       end
 
+      context "when the user updates merge request with organisation that is already part of another merge" do
+        let(:another_organisation) { create(:organisation) }
+        let(:other_merge_request) { create(:merge_request, merge_date: Time.zone.local(2022, 5, 4)) }
+        let(:params) { { merge_request: { merging_organisation: another_organisation.id, new_merging_org_ids: [] } } }
+
+        before do
+          MergeRequestOrganisation.create!(merge_request_id: other_merge_request.id, merging_organisation_id: another_organisation.id)
+          patch "/merge-request/#{merge_request.id}/merging-organisations", headers:, params:
+        end
+
+        it "displays the page with an error message" do
+          expect(response).to have_http_status(:unprocessable_entity)
+          expect(page).to have_content("Another merge request records #{another_organisation.name} as merging into #{other_merge_request.absorbing_organisation&.name} on 4 May 2022. Select another organisation or remove this organisation from the other merge request.")
+        end
+      end
+
       context "when the user selects an organisation that is a part of another merge" do
         let(:another_organisation) { create(:organisation) }
         let(:params) { { merge_request: { merging_organisation: another_organisation.id, new_merging_org_ids: [] } } }
@@ -396,6 +412,24 @@ RSpec.describe MergeRequestsController, type: :request do
             }.from(nil).to(Time.zone.local(2022, 4, 10))
           end
         end
+
+        context "when merge date set to a date more than 1 year in the future" do
+          let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation) }
+          let(:params) do
+            { merge_request: { page: "merge_date", "merge_date(3i)": (Time.zone.now.day + 1).to_s, "merge_date(2i)": Time.zone.now.month.to_s, "merge_date(1i)": (Time.zone.now.year + 1).to_s } }
+          end
+
+          let(:request) do
+            patch "/merge-request/#{merge_request.id}", headers:, params:
+          end
+
+          it "displays the page with an error message" do
+            request
+
+            expect(response).to have_http_status(:unprocessable_entity)
+            expect(page).to have_content("The merge date must not be later than a year from today’s date.")
+          end
+        end
       end
 
       describe "from merging_organisations page" do

spec/requests/schemes_controller_spec.rb

@@ -89,9 +89,47 @@ RSpec.describe SchemesController, type: :request do
         end
       end
 
+      context "when a recently absorbed organisation has schemes" do
+        let(:absorbed_org) { create(:organisation) }
+        let!(:absorbed_org_schemes) { create_list(:scheme, 2, owning_organisation: absorbed_org) }
+
+        before do
+          absorbed_org.merge_date = 2.days.ago
+          absorbed_org.absorbing_organisation = user.organisation
+          absorbed_org.save!
+        end
+
+        it "shows absorbed organisation schemes" do
+          get "/schemes"
+          follow_redirect!
+          absorbed_org_schemes.each do |scheme|
+            expect(page).to have_content(scheme.id_to_display)
+          end
+        end
+      end
+
+      context "when a non-recently absorbed organisation has schemes" do
+        let(:absorbed_org) { create(:organisation) }
+        let!(:absorbed_org_schemes) { create_list(:scheme, 2, owning_organisation: absorbed_org) }
+
+        before do
+          absorbed_org.merge_date = 2.years.ago
+          absorbed_org.absorbing_organisation = user.organisation
+          absorbed_org.save!
+        end
+
+        it "shows absorbed organisation schemes" do
+          get "/schemes"
+          follow_redirect!
+          absorbed_org_schemes.each do |scheme|
+            expect(page).not_to have_content(scheme.id_to_display)
+          end
+        end
+      end
+
       context "when filtering" do
         context "with owning organisation filter" do
-          context "when user org does not have owning orgs" do
+          context "when user org does not have owning orgs or recently absorbed orgs" do
             it "does not show filter" do
               expect(page).not_to have_content("Owned by")
             end
@@ -700,6 +738,27 @@ RSpec.describe SchemesController, type: :request do
         end
       end
 
+      context "when coordinator attempts to see scheme belonging to a recently absorbed organisation" do
+        let(:absorbed_organisation) { create(:organisation) }
+        let!(:specific_scheme) { create(:scheme, owning_organisation: absorbed_organisation) }
+
+        before do
+          absorbed_organisation.merge_date = 2.days.ago
+          absorbed_organisation.absorbing_organisation = user.organisation
+          absorbed_organisation.save!
+
+          get "/schemes/#{specific_scheme.id}"
+        end
+
+        it "shows the scheme" do
+          expect(page).to have_content(specific_scheme.id_to_display)
+        end
+
+        it "allows editing" do
+          expect(page).to have_link("Change")
+        end
+      end
+
       context "when the scheme has all details but no confirmed locations" do
         it "shows the scheme as incomplete with text to explain" do
           get scheme_path(specific_scheme)
@@ -1146,6 +1205,31 @@ RSpec.describe SchemesController, type: :request do
           end
         end
       end
+
+      context "when making a scheme in an organisation recently absorbed by the users organisation" do
+        let(:absorbed_organisation) { create(:organisation) }
+        let(:params) do
+          { scheme: { service_name: "  testy ",
+                      sensitive: "1",
+                      scheme_type: "Foyer",
+                      registered_under_care_act: "No",
+                      owning_organisation_id: absorbed_organisation.id,
+                      arrangement_type: "D" } }
+        end
+
+        before do
+          absorbed_organisation.merge_date = 2.days.ago
+          absorbed_organisation.absorbing_organisation = user.organisation
+          absorbed_organisation.save!
+        end
+
+        it "creates a new scheme for this organisation and renders correct page" do
+          expect { post "/schemes", params: }.to change(Scheme, :count).by(1)
+          follow_redirect!
+          expect(response).to have_http_status(:ok)
+          expect(page).to have_content("What client group is this scheme intended for?")
+        end
+      end
     end
 
     context "when signed in as a support user" do

spec/requests/users_controller_spec.rb

@@ -1043,6 +1043,9 @@ RSpec.describe UsersController, type: :request do
 
       it "invites a new user" do
         expect { request }.to change(User, :count).by(1)
+        follow_redirect!
+        expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success")
+        expect(page).to have_content("Invitation sent to new_user@example.com")
       end
 
       it "sends an invitation email" do