-
Add all organisations to be merged - we have already added your own.
+
+ Add all organisations to be merged - we have already added your own.
+
-<%= form_with model: @merge_request, url: organisations_merge_request_path, method: :patch do |f| %>
- <%= f.govuk_error_summary %>
-
Start typing to search
- <%= render partial: "organisation_relationships/related_organisation_select_question", locals: {
- field: :merging_organisation,
- question: Form::Question.new("", { "answer_options" => @answer_options }, nil),
- f:,
- } %>
- <%= f.govuk_submit "Add organisation", classes: "govuk-button--secondary" %>
- <%= govuk_table do |table| %>
- <% @merge_request.merging_organisations.each do |merging_organisation| %>
- <%= table.body do |body| %>
- <%= body.row do |row| %>
- <% row.cell(text: merging_organisation.name) %>
- <% row.cell(html_attributes: {
- scope: "row",
- class: "govuk-!-text-align-right",
- }) do %>
- <% if @merge_request.requesting_organisation != merging_organisation %>
- <%= govuk_link_to("Remove", organisations_remove_merge_request_path(merge_request: { merging_organisation: merging_organisation.id })) %>
+ <%= form_with model: @merge_request, url: organisations_merge_request_path, method: :patch do |f| %>
+ <%= f.govuk_error_summary %>
+
Start typing to search
+ <%= render partial: "organisation_relationships/related_organisation_select_question", locals: {
+ field: :merging_organisation,
+ question: Form::Question.new("", { "answer_options" => @answer_options }, nil),
+ f:,
+ } %>
+ <%= f.govuk_submit "Add organisation", classes: "govuk-button--secondary" %>
+ <%= govuk_table do |table| %>
+ <% @merge_request.merging_organisations.order(:name).each do |merging_organisation| %>
+ <%= table.body do |body| %>
+ <%= body.row do |row| %>
+ <% row.cell(text: merging_organisation.name) %>
+ <% row.cell(html_attributes: {
+ scope: "row",
+ class: "govuk-!-text-align-right",
+ }) do %>
+ <% if @merge_request.requesting_organisation != merging_organisation %>
+ <%= govuk_link_to("Remove", organisations_remove_merge_request_path(merge_request: { merging_organisation: merging_organisation.id })) %>
+ <% end %>
<% end %>
<% end %>
<% end %>
<% end %>
<% end %>
<% end %>
-<% end %>
-<%= form_with model: @merge_request, url: merge_request_path(id: @merge_request.id), method: :patch do |f| %>
- <%= govuk_details(summary_text: "I cannot find an organisation on the list") do %>
- <%= f.govuk_text_area :other_merging_organisations, label: { text: "Other organisations" }, hint: { text: "List other organisations that are part of the merge but not registered on CORE." }, rows: 9 %>
- <% end %>
- <% if @merge_request.merging_organisations.count > 1 %>
- <%= f.govuk_submit "Continue" %>
+ <%= form_with model: @merge_request, url: merge_request_path(id: @merge_request.id), method: :patch do |f| %>
+ <%= govuk_details(summary_text: "I cannot find an organisation on the list") do %>
+ <%= f.govuk_text_area :other_merging_organisations, label: { text: "Other organisations" }, hint: { text: "List other organisations that are part of the merge but not registered on CORE." }, rows: 9 %>
+ <% end %>
+ <% if @merge_request.merging_organisations.count > 1 %>
+ <%= f.hidden_field :page, value: "organisations" %>
+ <%= f.govuk_submit "Continue" %>
+ <% end %>
<% end %>
-<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7bf8839a9..ff409f2e0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -512,6 +512,7 @@ en:
merge_request:
organisation_part_of_another_merge: "This organisation is part of another merge - select a different one"
organisation_not_selected: "Select an organisation from the search list"
+ absorbing_organisation_blank: Select the organisation absorbing the others
soft_validations:
net_income:
diff --git a/config/routes.rb b/config/routes.rb
index a9eaa86ef..cdbfc4616 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -137,6 +137,8 @@ Rails.application.routes.draw do
patch "organisations", to: "merge_requests#update_organisations"
get "organisations/remove", to: "merge_requests#remove_merging_organisation"
get "absorbing-organisation"
+ get "confirm-telephone-number"
+ get "new-org-name"
end
end
diff --git a/db/migrate/20230421124536_add_absorbing_organisation_to_merge_request.rb b/db/migrate/20230421124536_add_absorbing_organisation_to_merge_request.rb
new file mode 100644
index 000000000..a038eebfa
--- /dev/null
+++ b/db/migrate/20230421124536_add_absorbing_organisation_to_merge_request.rb
@@ -0,0 +1,8 @@
+class AddAbsorbingOrganisationToMergeRequest < ActiveRecord::Migration[7.0]
+ def change
+ change_table :merge_requests, bulk: true do |t|
+ t.column :absorbing_organisation_id, :integer
+ t.column :new_absorbing_organisation, :boolean
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 734968255..f891d1024 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: 2023_04_19_153741) do
+ActiveRecord::Schema[7.0].define(version: 2023_04_21_124536) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -367,6 +367,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_19_153741) do
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "status"
+ t.integer "absorbing_organisation_id"
+ t.boolean "new_absorbing_organisation"
end
create_table "organisation_relationships", force: :cascade do |t|
@@ -575,8 +577,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_19_153741) do
t.integer "ethnicbuy2"
t.integer "proplen_asked"
t.string "old_id"
- t.integer "buy2living"
- t.integer "prevtenbuy2"
t.integer "pregblank"
t.string "uprn"
t.integer "uprn_known"
@@ -585,6 +585,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_19_153741) do
t.string "address_line2"
t.string "town_or_city"
t.string "county"
+ t.integer "buy2living"
+ t.integer "prevtenbuy2"
t.integer "nationalbuy2"
t.integer "discounted_sale_value_check"
t.integer "student_not_child_value_check"
diff --git a/spec/requests/merge_requests_controller_spec.rb b/spec/requests/merge_requests_controller_spec.rb
index ac7094df6..5e2479189 100644
--- a/spec/requests/merge_requests_controller_spec.rb
+++ b/spec/requests/merge_requests_controller_spec.rb
@@ -2,32 +2,29 @@ require "rails_helper"
RSpec.describe MergeRequestsController, type: :request do
let(:organisation) { user.organisation }
- let(:other_organisation) { FactoryBot.create(:organisation, name: "Other Test Org") }
+ let(:other_organisation) { create(:organisation, name: "Other Test Org") }
let(:headers) { { "Accept" => "text/html" } }
let(:page) { Capybara::Node::Simple.new(response.body) }
- let(:user) { FactoryBot.create(:user, :data_coordinator) }
- let(:support_user) { FactoryBot.create(:user, :support, organisation:) }
+ let(:user) { create(:user, :data_coordinator) }
+ let(:support_user) { create(:user, :support, organisation:) }
let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation) }
let(:other_merge_request) { MergeRequest.create!(requesting_organisation: other_organisation) }
context "when user is signed in with a data coordinator user" do
- before do
- sign_in user
- end
+ before { sign_in user }
describe "#organisations" do
let(:params) { { merge_request: { requesting_organisation_id: "9", status: "unsubmitted" } } }
context "when creating a new merge request" do
before do
- organisation.update!(name: "Test Org")
post "/merge-request", headers:, params:
end
it "creates merge request with requesting organisation" do
follow_redirect!
expect(page).to have_content("Which organisations are merging?")
- expect(page).to have_content("Test Org")
+ expect(page).to have_content(organisation.name)
expect(page).not_to have_link("Remove")
end
@@ -46,13 +43,12 @@ RSpec.describe MergeRequestsController, type: :request do
context "when viewing existing merge request" do
before do
- organisation.update!(name: "Test Org")
get "/merge-request/#{merge_request.id}/organisations", headers:, params:
end
it "shows merge request with requesting organisation" do
expect(page).to have_content("Which organisations are merging?")
- expect(page).to have_content("Test Org")
+ expect(page).to have_content(organisation.name)
end
end
@@ -116,7 +112,7 @@ RSpec.describe MergeRequestsController, type: :request do
end
context "when the user selects an organisation that is a part of another merge" do
- let(:another_organisation) { FactoryBot.create(:organisation, name: "Other Test Org") }
+ let(:another_organisation) { create(:organisation) }
let(:params) { { merge_request: { merging_organisation: another_organisation.id } } }
before do
@@ -134,7 +130,7 @@ RSpec.describe MergeRequestsController, type: :request do
end
context "when the user selects an organisation that is a part of another unsubmitted merge" do
- let(:another_organisation) { FactoryBot.create(:organisation, name: "Other Test Org") }
+ let(:another_organisation) { create(:organisation) }
let(:params) { { merge_request: { merging_organisation: another_organisation.id } } }
before do
@@ -151,7 +147,7 @@ RSpec.describe MergeRequestsController, type: :request do
end
context "when the user selects an organisation that is a part of current merge" do
- let(:another_organisation) { FactoryBot.create(:organisation, name: "Other Test Org") }
+ let(:another_organisation) { create(:organisation) }
let(:params) { { merge_request: { merging_organisation: another_organisation.id } } }
before do
@@ -237,18 +233,99 @@ RSpec.describe MergeRequestsController, type: :request do
end
end
- describe "#other_merging_organisations" do
- let(:params) { { merge_request: { other_merging_organisations: "A list of other merging organisations" } } }
+ describe "#update" do
+ before { sign_in user }
- context "when adding other merging organisations" do
- before do
- MergeRequestOrganisation.create!(merge_request_id: merge_request.id, merging_organisation_id: other_organisation.id)
+ describe "#other_merging_organisations" do
+ let(:other_merging_organisations) { "A list of other merging organisations" }
+ let(:params) { { merge_request: { other_merging_organisations:, page: "organisations" } } }
+ let(:request) do
patch "/merge-request/#{merge_request.id}", headers:, params:
end
- it "updates the merge request" do
- merge_request.reload
- expect(merge_request.other_merging_organisations).to eq("A list of other merging organisations")
+ context "when adding other merging organisations" do
+ before do
+ MergeRequestOrganisation.create!(merge_request_id: merge_request.id, merging_organisation_id: other_organisation.id)
+ end
+
+ it "updates the merge request" do
+ expect { request }.to change { merge_request.reload.other_merging_organisations }.from(nil).to(other_merging_organisations)
+ end
+
+ it "redirects telephone number path" do
+ request
+
+ expect(response).to redirect_to(absorbing_organisation_merge_request_path(merge_request))
+ end
+ end
+ end
+
+ context "when not answering the question" do
+ let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: other_organisation) }
+ let(:params) do
+ { merge_request: { page: "absorbing_organisation" } }
+ end
+ let(:request) do
+ patch "/merge-request/#{merge_request.id}", headers:, params:
+ end
+
+ it "renders the error" do
+ request
+
+ expect(page).to have_content("Select the organisation absorbing the others")
+ end
+
+ it "does not update the request" do
+ expect { request }.not_to(change { merge_request.reload.attributes })
+ end
+ end
+
+ context "when absorbing_organisation_id set to other" do
+ let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, absorbing_organisation: other_organisation) }
+ let(:params) do
+ { merge_request: { absorbing_organisation_id: "other", page: "absorbing_organisation" } }
+ end
+ let(:request) do
+ patch "/merge-request/#{merge_request.id}", headers:, params:
+ end
+
+ it "redirects to new org path" do
+ request
+
+ expect(response).to redirect_to(new_org_name_merge_request_path(merge_request))
+ end
+
+ it "resets absorbing_organisation and sets new_absorbing_organisation to true" do
+ expect { request }.to change {
+ merge_request.reload.absorbing_organisation
+ }.from(other_organisation).to(nil).and change {
+ merge_request.reload.new_absorbing_organisation
+ }.from(nil).to(true)
+ end
+ end
+
+ context "when absorbing_organisation_id set to id" do
+ let(:merge_request) { MergeRequest.create!(requesting_organisation: organisation, new_absorbing_organisation: true) }
+ let(:params) do
+ { merge_request: { absorbing_organisation_id: other_organisation.id, page: "absorbing_organisation" } }
+ end
+
+ let(:request) do
+ patch "/merge-request/#{merge_request.id}", headers:, params:
+ end
+
+ it "redirects telephone number path" do
+ request
+
+ expect(response).to redirect_to(confirm_telephone_number_merge_request_path(merge_request))
+ end
+
+ it "updates absorbing_organisation_id and sets new_absorbing_organisation to false" do
+ expect { request }.to change {
+ merge_request.reload.absorbing_organisation
+ }.from(nil).to(other_organisation).and change {
+ merge_request.reload.new_absorbing_organisation
+ }.from(true).to(false)
end
end
end
@@ -264,7 +341,6 @@ RSpec.describe MergeRequestsController, type: :request do
let(:params) { { merge_request: { requesting_organisation_id: other_organisation.id, status: "unsubmitted" } } }
before do
- organisation.update!(name: "Test Org")
post "/merge-request", headers:, params:
end