From 910810e1be4bcdb827017cbda374677a84cfd69f Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Thu, 27 Oct 2022 09:58:44 +0100
Subject: [PATCH] feat: refactor create logic

---
 .../organisation_relationships_controller.rb  | 45 ++++++++-----------
 .../housing_providers.html.erb                | 17 ++++---
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/controllers/organisation_relationships_controller.rb b/app/controllers/organisation_relationships_controller.rb
index 8f6f95ba6..4c452705b 100644
--- a/app/controllers/organisation_relationships_controller.rb
+++ b/app/controllers/organisation_relationships_controller.rb
@@ -30,37 +30,30 @@ class OrganisationRelationshipsController < ApplicationController
   end
 
   def create_housing_provider
-    create(0)
-  end
-
-  def create_managing_agent
-    create(1)
-  end
-
-  def create(relationship_type)
+    child_organisation_id = @organisation.id
+    parent_organisation_id = related_organisation_id
     if related_organisation_id.empty?
       @organisation.errors.add :related_organisation_id, "You must choose a housing provider"
-      @organisations = Organisation.where.not(id: @organisation.id).pluck(:id, :name)
+      @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)
+      @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
-    case relationship_type
-    when 0
-      if OrganisationRelationship.exists?(child_organisation_id: @organisation.id, parent_organisation_id: related_organisation_id, relationship_type: 0)
-        @organisation.errors.add :related_organisation_id, "You have already added this housing provider"
-        @organisations = Organisation.where.not(id: @organisation.id).pluck(:id, :name)
-        render 'organisation_relationships/add_housing_provider'
-      else
-        @resource = OrganisationRelationship.new(child_organisation_id: @organisation.id, parent_organisation_id: related_organisation_id, relationship_type: 0)
-        @resource.save!
-        redirect_to housing_providers_organisation_path(related_organisation_id:)
-      end
-    when 1
-      @resource = OrganisationRelationship.new(child_organisation_id: related_organisation_id, parent_organisation_id: @organisation.id, relationship_type: 1)
-      @resource.save!
-      redirect_to managing_agents_organisation_path
-    end
+    create(child_organisation_id, parent_organisation_id, 0)
+    redirect_to housing_providers_organisation_path(related_organisation_id:)
+  end
+
+  def create_managing_agent
+    create(related_organisation_id, @organisation.id, 1)
+  end
 
+  def create(child_organisation_id, parent_organisation_id, relationship_type)
+    @resource = OrganisationRelationship.new(child_organisation_id:, parent_organisation_id:, relationship_type:)
+    @resource.save!
   end
 
 private
@@ -79,7 +72,7 @@ private
   end
 
   def authenticate_scope!
-    if current_user.organisation != organisation
+    if current_user.organisation != organisation && !current_user.support?
       render_not_found
     end
   end
diff --git a/app/views/organisation_relationships/housing_providers.html.erb b/app/views/organisation_relationships/housing_providers.html.erb
index d72ab6a17..b88f26790 100644
--- a/app/views/organisation_relationships/housing_providers.html.erb
+++ b/app/views/organisation_relationships/housing_providers.html.erb
@@ -23,15 +23,22 @@
       notification_banner.heading(text: "#{Organisation.find(params["related_organisation_id"]).name} is now one of your housing providers")
     end %>
   <% end %>
-  <p class="govuk-body">This organisation can submit logs for its housing providers.</p>
+  <% if @total_count == 0 %>
+    <p class="govuk-body">This organisation does not currently have any housing providers.</p>
+  <% else %>
+    <p class="govuk-body">This organisation can submit logs for its housing providers.</p>
+  <% end %>
+
 <% else %>
   <%= render partial: "organisations/headings", locals: { main: "Your housing providers", sub: nil } %>
-  <p class="govuk-body">Your organisation can submit logs for its housing providers.</p>
+  <% if @total_count == 0 %>
+    <p class="govuk-body">Your organisation does not currently have any housing providers.</p>
+  <% else %>
+    <p class="govuk-body">Your organisation can submit logs for its housing providers.</p>
+  <% end %>
 <% end %>
 
-<% if @total_count == 0 %>
-  <p class="govuk-body">This organisation does not currently have any housing providers.</p>
-<% end %>
+
 <% if current_user.support? %>
   <%= govuk_button_link_to "Add a housing provider", housing_providers_add_organisation_path(organisation_id: @organisation.id), html: { method: :get } %>
   <% elsif current_user.data_coordinator? %>