From 63193a150db97d277df94b945dcd35e3b6fd7bf7 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Thu, 27 Oct 2022 14:33:09 +0100 Subject: [PATCH] fet: simplify controller args --- app/controllers/organisation_relationships_controller.rb | 9 +++++---- spec/requests/organisations_controller_spec.rb | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/organisation_relationships_controller.rb b/app/controllers/organisation_relationships_controller.rb index ba286210d..4d9e75912 100644 --- a/app/controllers/organisation_relationships_controller.rb +++ b/app/controllers/organisation_relationships_controller.rb @@ -45,26 +45,27 @@ class OrganisationRelationshipsController < ApplicationController def create_housing_provider child_organisation_id = @organisation.id parent_organisation_id = related_organisation_id + relationship_type = OrganisationRelationship::OWNING if related_organisation_id.empty? @organisation.errors.add :related_organisation_id, "You must choose a housing provider" @organisations = Organisation.where.not(id: child_organisation_id).pluck(:id, :name) render 'organisation_relationships/add_housing_provider' return - elsif OrganisationRelationship.exists?(child_organisation_id:, parent_organisation_id:, relationship_type: 0) + elsif OrganisationRelationship.exists?(child_organisation_id:, parent_organisation_id:, relationship_type:) @organisation.errors.add :related_organisation_id, "You have already added this housing provider" @organisations = Organisation.where.not(id: child_organisation_id).pluck(:id, :name) render 'organisation_relationships/add_housing_provider' return end - create(child_organisation_id, parent_organisation_id, 0) + create(child_organisation_id:, parent_organisation_id:, relationship_type:) redirect_to housing_providers_organisation_path(related_organisation_id:) end def create_managing_agent - create(related_organisation_id, @organisation.id, 1) + create(child_organisation_id: related_organisation_id, parent_organisation_id: @organisation.id, relationship_type: 1) end - def create(child_organisation_id, parent_organisation_id, relationship_type) + def create(child_organisation_id:, parent_organisation_id:, relationship_type:) @resource = OrganisationRelationship.new(child_organisation_id:, parent_organisation_id:, relationship_type:) @resource.save! end diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb index d2c197b7e..aa82fc3c8 100644 --- a/spec/requests/organisations_controller_spec.rb +++ b/spec/requests/organisations_controller_spec.rb @@ -335,7 +335,6 @@ RSpec.describe OrganisationsController, type: :request do end end - context "with an organisation that are not in scope for the user, i.e. that they do not belong to" do before do get "/organisations/#{unauthorised_organisation.id}/housing-providers", headers:, params: {}