diff --git a/app/controllers/organisation_relationships_controller.rb b/app/controllers/organisation_relationships_controller.rb index f46a6934a..f7268684f 100644 --- a/app/controllers/organisation_relationships_controller.rb +++ b/app/controllers/organisation_relationships_controller.rb @@ -94,17 +94,14 @@ class OrganisationRelationshipsController < ApplicationController end def remove_housing_provider + @target_organisation_id = target_organisation_id render "organisation_relationships/remove_housing_provider", layout: "application" end def delete_housing_provider - organisation_relationship_to_remove = OrganisationRelationship.find_by!(child_organisation_id: @organisation.id, parent_organisation_id: organisation_to_remove_id, relationship_type: OrganisationRelationship::OWNING) - delete(organisation_relationship_to_remove) - redirect_to housing_providers_organisation_path(removed_organisation_id: organisation_to_remove_id) - end - - def delete(organisation_relationship_to_remove) + organisation_relationship_to_remove = OrganisationRelationship.find_by!(child_organisation_id: @organisation.id, parent_organisation_id: target_organisation_id, relationship_type: OrganisationRelationship::OWNING) organisation_relationship_to_remove.destroy! + redirect_to housing_providers_organisation_path(removed_organisation_id: target_organisation_id) end private @@ -122,8 +119,8 @@ private params["organisation"]["related_organisation_id"] end - def organisation_to_remove_id - params["organisation_to_remove_id"] + def target_organisation_id + params["target_organisation_id"] end def search_term diff --git a/app/views/organisation_relationships/_housing_provider_list.erb b/app/views/organisation_relationships/_housing_provider_list.erb index 3016387a9..0aa2244f6 100644 --- a/app/views/organisation_relationships/_housing_provider_list.erb +++ b/app/views/organisation_relationships/_housing_provider_list.erb @@ -12,7 +12,7 @@ scope: "row", class: "govuk-!-text-align-right", }) do %> - <%= govuk_link_to("Remove", housing_providers_remove_organisation_path(organisation_to_remove_id: housing_provider.id)) %> + <%= govuk_link_to("Remove", housing_providers_remove_organisation_path(target_organisation_id: housing_provider.id)) %> <% end %> <% end %> <% end %> diff --git a/app/views/organisation_relationships/remove_housing_provider.html.erb b/app/views/organisation_relationships/remove_housing_provider.html.erb index 850c8ce7b..9c0fed118 100644 --- a/app/views/organisation_relationships/remove_housing_provider.html.erb +++ b/app/views/organisation_relationships/remove_housing_provider.html.erb @@ -1,11 +1,10 @@ -<% @organisation_to_remove_id = params["organisation_to_remove_id"] %> -<%= form_with url: housing_providers_organisation_path(organisation_to_remove_id: @organisation_to_remove_id), method: "delete", local: true do |f| %> +<%= form_with url: housing_providers_organisation_path(target_organisation_id: @target_organisation_id), method: "delete", local: true do |f| %> <% if current_user.support? %> <%= render partial: "organisations/headings", locals: { main: @organisation.name, sub: nil } %> <%= render SubNavigationComponent.new(items: secondary_items(request.path, @organisation.id)) %>

Remove Housing Provider

<% end %> - <% @housing_provider = Organisation.find(@organisation_to_remove_id) %> + <% @housing_provider = Organisation.find(@target_organisation_id) %> <% if current_user.support? %> <%= govuk_back_link(href: :back) %> <%= render partial: "organisations/headings", locals: { main: "You are removing ‘#{@housing_provider.name}’ from this organisation's housing providers", sub: nil } %> diff --git a/spec/requests/organisation_relationships_controller_spec.rb b/spec/requests/organisation_relationships_controller_spec.rb index 88823bb91..a054e8210 100644 --- a/spec/requests/organisation_relationships_controller_spec.rb +++ b/spec/requests/organisation_relationships_controller_spec.rb @@ -194,7 +194,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do let!(:housing_provider) { FactoryBot.create(:organisation) } let(:params) do { - "organisation_to_remove_id": housing_provider.id, + "target_organisation_id": housing_provider.id, } end let(:request) { delete "/organisations/#{organisation.id}/housing-providers", headers:, params: } @@ -396,7 +396,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do let!(:housing_provider) { FactoryBot.create(:organisation) } let(:params) do { - "organisation_to_remove_id": housing_provider.id, + "target_organisation_id": housing_provider.id, } end let(:request) { delete "/organisations/#{organisation.id}/housing-providers", headers:, params: }