diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb index c6bc5888e..61cd43674 100644 --- a/app/controllers/organisations_controller.rb +++ b/app/controllers/organisations_controller.rb @@ -47,17 +47,7 @@ class OrganisationsController < ApplicationController def duplicate_schemes authorize @organisation - duplicate_scheme_sets = @organisation.owned_schemes.duplicate_sets - @duplicate_schemes = duplicate_scheme_sets.map { |set| set.map { |id| @organisation.owned_schemes.find(id) } } - @duplicate_locations = [] - @organisation.owned_schemes.each do |scheme| - duplicate_location_sets = scheme.locations.duplicate_sets - next unless duplicate_location_sets.any? - - duplicate_location_sets.each do |duplicate_set| - @duplicate_locations << { scheme: scheme, locations: duplicate_set.map { |id| scheme.locations.find(id) } } - end - end + get_duplicate_schemes_and_locations end def show @@ -311,6 +301,22 @@ class OrganisationsController < ApplicationController render json: org_data.to_json end + def confirm_duplicate_schemes + authorize @organisation + + if scheme_duplicates_checked_params[:scheme_duplicates_checked] == "true" + @organisation.schemes_deduplicated_at = Time.zone.now + if @organisation.save + flash[:notice] = I18n.t("organisation.duplicate_schemes_confirmed") + redirect_to schemes_organisation_path(@organisation) + end + else + @organisation.errors.add(:scheme_duplicates_checked, I18n.t("validations.organisation.scheme_duplicates_not_resolved")) + get_duplicate_schemes_and_locations + render :duplicate_schemes, status: :unprocessable_entity + end + end + private def filter_type @@ -341,6 +347,10 @@ private params.require(:organisation).permit(rent_periods: [], all_rent_periods: []) end + def scheme_duplicates_checked_params + params.require(:organisation).permit(:scheme_duplicates_checked) + end + def codes_only_export? params.require(:codes_only) == "true" end @@ -360,4 +370,18 @@ private def find_resource @organisation = Organisation.find(params[:id]) end + + def get_duplicate_schemes_and_locations + duplicate_scheme_sets = @organisation.owned_schemes.duplicate_sets + @duplicate_schemes = duplicate_scheme_sets.map { |set| set.map { |id| @organisation.owned_schemes.find(id) } } + @duplicate_locations = [] + @organisation.owned_schemes.each do |scheme| + duplicate_location_sets = scheme.locations.duplicate_sets + next unless duplicate_location_sets.any? + + duplicate_location_sets.each do |duplicate_set| + @duplicate_locations << { scheme: scheme, locations: duplicate_set.map { |id| scheme.locations.find(id) } } + end + end + end end diff --git a/app/policies/organisation_policy.rb b/app/policies/organisation_policy.rb index 97fd4582e..9c5fc4449 100644 --- a/app/policies/organisation_policy.rb +++ b/app/policies/organisation_policy.rb @@ -38,4 +38,8 @@ class OrganisationPolicy def duplicate_schemes? user.support? || (user.data_coordinator? && user.organisation == organisation) end + + def confirm_duplicate_schemes? + duplicate_schemes? + end end diff --git a/app/views/organisations/duplicate_schemes.html.erb b/app/views/organisations/duplicate_schemes.html.erb index d002f2989..ecbea184e 100644 --- a/app/views/organisations/duplicate_schemes.html.erb +++ b/app/views/organisations/duplicate_schemes.html.erb @@ -1,114 +1,129 @@ <% content_for :before_content do %> <%= govuk_back_link href: schemes_organisation_path(@organisation) %> <% end %> +<%= form_with model: @organisation, url: schemes_duplicates_organisation_path(@organisation), method: "post" do |f| %> + <%= f.govuk_error_summary %> -<% title = "Review these sets of schemes and locations" %> -<% content_for :title, title %> + <% title = "Review these sets of schemes and locations" %> + <% content_for :title, title %> -<% if current_user.support? %> - <%= render SubNavigationComponent.new( - items: secondary_items(request.path, @organisation.id), - ) %> -<% end %> + <% if current_user.support? %> + <%= render SubNavigationComponent.new( + items: secondary_items(request.path, @organisation.id), + ) %> + <% end %> -
-
-

<%= title %>

+
+
+

<%= title %>

-

Since your organisation recently merged, we’ve reviewed your schemes for possible duplicates.

-

These sets of schemes and locations might be duplicates because they have the same answers for certain fields.

-

What you need to do

-
    -
  • Review each set of schemes or locations and decide if they are duplicates.
    • -
  • If they are, choose one to keep and deactivate the others on the date your organisation merged.
    • -
  • When you have resolved all duplicates, confirm below.
    • -
-

If you need help with this, <%= govuk_link_to "contact the helpdesk (opens in a new tab)", GlobalConstants::HELPDESK_URL, target: "#" %>.

+

Since your organisation recently merged, we’ve reviewed your schemes for possible duplicates.

+

These sets of schemes and locations might be duplicates because they have the same answers for certain fields.

+

What you need to do

+
    +
  • Review each set of schemes or locations and decide if they are duplicates.
    • +
  • If they are, choose one to keep and deactivate the others on the date your organisation merged.
    • +
  • When you have resolved all duplicates, confirm below.
    • +
+

If you need help with this, <%= govuk_link_to "contact the helpdesk (opens in a new tab)", GlobalConstants::HELPDESK_URL, target: "#" %>.

- <% if @duplicate_schemes.any? %> -

<%= @duplicate_schemes.count == 1 ? "This set" : "These #{@duplicate_schemes.count} sets" %> of schemes might have duplicates

+ <% if @duplicate_schemes.any? %> +

<%= @duplicate_schemes.count == 1 ? "This set" : "These #{@duplicate_schemes.count} sets" %> of schemes might have duplicates

- <%= govuk_details(summary_text: "Why are these schemes identified as duplicates?") do %> -

- These schemes have the same answers for the following fields: -

-
    -
  • Type of scheme
    • -
  • Registered under Care Standards Act 2000
    • -
  • Housing stock owned by
    • -
  • Support services provided by
    • -
  • Primary client group
    • -
  • Has another client group
    • -
  • Secondary client group
    • -
  • Level of support given
    • -
  • Intended length of stay
    • -
- <% end %> + <%= govuk_details(summary_text: "Why are these schemes identified as duplicates?") do %> +

+ These schemes have the same answers for the following fields: +

+
    +
  • Type of scheme
    • +
  • Registered under Care Standards Act 2000
    • +
  • Housing stock owned by
    • +
  • Support services provided by
    • +
  • Primary client group
    • +
  • Has another client group
    • +
  • Secondary client group
    • +
  • Level of support given
    • +
  • Intended length of stay
    • +
+ <% end %> - <%= govuk_table do |table| %> - <%= table.with_head do |head| %> - <% head.with_row do |row| %> - <% row.with_cell(header: true, text: "Schemes") %> - <% end %> + <%= govuk_table do |table| %> + <%= table.with_head do |head| %> + <% head.with_row do |row| %> + <% row.with_cell(header: true, text: "Schemes") %> + <% end %> - <%= table.with_body do |body| %> - <% @duplicate_schemes.each do |duplicate_set| %> - <% body.with_row do |row| %> - <% row.with_cell do %> -
    - <% duplicate_set.each do |scheme| %> -
  1. - <%= govuk_link_to scheme.service_name, scheme %> -
    2. - <% end %> -
+ <%= table.with_body do |body| %> + <% @duplicate_schemes.each do |duplicate_set| %> + <% body.with_row do |row| %> + <% row.with_cell do %> +
    + <% duplicate_set.each do |scheme| %> +
  1. + <%= govuk_link_to scheme.service_name, scheme %> +
    2. + <% end %> +
+ <% end %> <% end %> <% end %> <% end %> <% end %> <% end %> <% end %> - <% end %> - <% if @duplicate_locations.any? %> -

<%= @duplicate_locations.count == 1 ? "This set" : "These #{@duplicate_locations.count} sets" %> of locations might have duplicates

- <%= govuk_details(summary_text: "Why are these locations identified as duplicates?") do %> -

- These locations belong to the same scheme and have the same answers for the following fields: -

-
    -
  • Postcode
    • -
  • Mobility standards
    • -
- <% end %> + <% if @duplicate_locations.any? %> +

<%= @duplicate_locations.count == 1 ? "This set" : "These #{@duplicate_locations.count} sets" %> of locations might have duplicates

+ <%= govuk_details(summary_text: "Why are these locations identified as duplicates?") do %> +

+ These locations belong to the same scheme and have the same answers for the following fields: +

+
    +
  • Postcode
    • +
  • Mobility standards
    • +
+ <% end %> - <%= govuk_table do |table| %> - <%= table.with_head do |head| %> - <% head.with_row do |row| %> - <% row.with_cell(header: true, text: "Locations") %> - <% row.with_cell(header: true, text: "Scheme") %> - <% end %> + <%= govuk_table do |table| %> + <%= table.with_head do |head| %> + <% head.with_row do |row| %> + <% row.with_cell(header: true, text: "Locations") %> + <% row.with_cell(header: true, text: "Scheme") %> + <% end %> - <%= table.with_body do |body| %> - <% @duplicate_locations.each do |duplicate_set| %> - <% body.with_row do |row| %> - <% row.with_cell do %> -
    - <% duplicate_set[:locations].each do |location| %> -
  1. - <%= govuk_link_to location.name, scheme_location_path(location) %> -
    2. - <% end %> -
- <% end %> - <% row.with_cell do %> - <%= govuk_link_to duplicate_set[:scheme].service_name, duplicate_set[:scheme] %> + <%= table.with_body do |body| %> + <% @duplicate_locations.each do |duplicate_set| %> + <% body.with_row do |row| %> + <% row.with_cell do %> +
    + <% duplicate_set[:locations].each do |location| %> +
  1. + <%= govuk_link_to location.name, scheme_location_path(location) %> +
    2. + <% end %> +
+ <% end %> + <% row.with_cell do %> + <%= govuk_link_to duplicate_set[:scheme].service_name, duplicate_set[:scheme] %> + <% end %> <% end %> <% end %> <% end %> <% end %> <% end %> <% end %> - <% end %> + + <%= f.govuk_check_boxes_fieldset :scheme_duplicates_checked, + legend: { text: "Have you resolved all duplicates?" } do %> + <%= f.govuk_check_box :scheme_duplicates_checked, + true, + false, + multiple: false, + checked: false, + label: { text: "Yes, none of the schemes and locations above are duplicates" } %> + <% end %> + + <%= f.govuk_submit "Confirm" %> +
-
+<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index c666746da..53de1fc34 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -37,6 +37,7 @@ en: updated: "Organisation details updated" reactivated: "%{organisation} has been reactivated." deactivated: "%{organisation} has been deactivated." + duplicate_schemes_confirmed: "You’ve confirmed the remaining schemes and locations are not duplicates." user: create_password: "Create a password to finish setting up your account" reset_password: "Reset your password" @@ -229,6 +230,7 @@ en: blank: "You must choose a managing agent" already_added: "You have already added this managing agent" merged: "That organisation has already been merged. Select a different organisation." + scheme_duplicates_not_resolved: "You must resolve all duplicates or indicate that there are no duplicates" not_answered: "You must answer %{question}" invalid_option: "Enter a valid value for %{question}" invalid_number: "Enter a number for %{question}" diff --git a/config/routes.rb b/config/routes.rb index c0182175d..ed6f47bbd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -179,6 +179,7 @@ Rails.application.routes.draw do post "schemes/email-csv", to: "organisations#email_schemes_csv" get "schemes/csv-confirmation", to: "schemes#csv_confirmation" get "schemes/duplicates", to: "organisations#duplicate_schemes" + post "schemes/duplicates", to: "organisations#confirm_duplicate_schemes" get "stock-owners", to: "organisation_relationships#stock_owners" get "stock-owners/add", to: "organisation_relationships#add_stock_owner" get "stock-owners/remove", to: "organisation_relationships#remove_stock_owner" diff --git a/db/migrate/20240920144611_add_schemes_deduplicated_at.rb b/db/migrate/20240920144611_add_schemes_deduplicated_at.rb new file mode 100644 index 000000000..02c1a6e05 --- /dev/null +++ b/db/migrate/20240920144611_add_schemes_deduplicated_at.rb @@ -0,0 +1,5 @@ +class AddSchemesDeduplicatedAt < ActiveRecord::Migration[7.0] + def change + add_column :organisations, :schemes_deduplicated_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index 80463eaad..d7a1b3042 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2024_09_18_112702) do +ActiveRecord::Schema[7.0].define(version: 2024_09_20_144611) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -512,6 +512,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_18_112702) do t.bigint "absorbing_organisation_id" t.datetime "available_from" t.datetime "discarded_at" + t.datetime "schemes_deduplicated_at" t.index ["absorbing_organisation_id"], name: "index_organisations_on_absorbing_organisation_id" t.index ["old_visible_id"], name: "index_organisations_on_old_visible_id", unique: true end diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb index 8f62e72a8..a8d686635 100644 --- a/spec/requests/organisations_controller_spec.rb +++ b/spec/requests/organisations_controller_spec.rb @@ -411,10 +411,10 @@ RSpec.describe OrganisationsController, type: :request do context "with data coordinator user" do let(:user) { create(:user, :data_coordinator) } - let!(:schemes) { create_list(:scheme, 5, :duplicate) } before do sign_in user + create_list(:scheme, 5, :duplicate) get "/organisations/#{organisation.id}/schemes/duplicates", headers: end @@ -423,7 +423,7 @@ RSpec.describe OrganisationsController, type: :request do end end - context "with data coordinator user" do + context "with data provider user" do let(:user) { create(:user, :data_provider) } before do @@ -2352,4 +2352,65 @@ RSpec.describe OrganisationsController, type: :request do end end end + + describe "POST #confirm_duplicate_schemes" do + let(:organisation) { create(:organisation) } + + context "when not signed in" do + it "redirects to sign in" do + post "/organisations/#{organisation.id}/schemes/duplicates", headers: headers + expect(response).to redirect_to("/account/sign-in") + end + end + + context "when signed in" do + before do + allow(user).to receive(:need_two_factor_authentication?).and_return(false) + sign_in user + end + + context "when user is data provider" do + let(:user) { create(:user, role: "data_provider", organisation:) } + + it "returns not found" do + post "/organisations/#{organisation.id}/schemes/duplicates", headers: headers + expect(response).to have_http_status(:unauthorized) + end + end + + context "when user is coordinator" do + let(:user) { create(:user, role: "data_coordinator", organisation:) } + + context "and the duplicate schemes have been confirmed" do + let(:params) { { "organisation": { scheme_duplicates_checked: "true" } } } + + it "redirects to schemes page" do + post "/organisations/#{organisation.id}/schemes/duplicates", headers: headers, params: params + + expect(response).to redirect_to("/organisations/#{organisation.id}/schemes") + expect(flash[:notice]).to eq("You’ve confirmed the remaining schemes and locations are not duplicates.") + end + + it "updates schemes_deduplicated_at" do + expect(organisation.reload.schemes_deduplicated_at).to be_nil + + post "/organisations/#{organisation.id}/schemes/duplicates", headers: headers, params: params + + expect(organisation.reload.schemes_deduplicated_at).not_to be_nil + end + end + + context "and the duplicate schemes have not been confirmed" do + let(:params) { { "organisation": { scheme_duplicates_checked: "" } } } + + it "displays an error" do + post "/organisations/#{organisation.id}/schemes/duplicates", headers: headers, params: params + + expect(response).to have_http_status(:unprocessable_entity) + expect(page).to have_content("You must resolve all duplicates or indicate that there are no duplicates") + end + end + end + end + end end