+ These logs are duplicates because they have the same answers for certain fields. +
++ Review each set of logs and either delete any duplicates or change any incorrect answers. +
+You changed the %{changed_question_label}.
" + duplicate_sets: + one: "There is %{count} set of duplicate logs" + other: "There are %{count} sets of duplicate logs" validations: organisation: diff --git a/config/routes.rb b/config/routes.rb index d509fc392..9ba1a2f18 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -105,6 +105,8 @@ Rails.application.routes.draw do end end + resources :duplicate_logs, only: [:index], path: "/duplicate-logs" + resources :users do get "edit-dpo", to: "users#dpo" get "edit-key-contact", to: "users#key_contact" @@ -117,6 +119,8 @@ Rails.application.routes.draw do end resources :organisations do + get "duplicates", to: "duplicate_logs#index" + member do get "details", to: "organisations#details" get "data-sharing-agreement", to: "organisations#data_sharing_agreement" diff --git a/spec/factories/lettings_log.rb b/spec/factories/lettings_log.rb index ae203b79e..59eb48da2 100644 --- a/spec/factories/lettings_log.rb +++ b/spec/factories/lettings_log.rb @@ -35,12 +35,13 @@ FactoryBot.define do hhmemb { 1 } end trait :duplicate do + setup_completed status { 1 } - needstype { 1 } tenancycode { "same tenancy code" } postcode_full { "A1 1AA" } uprn_known { 0 } declaration { 1 } + age1_known { 0 } age1 { 18 } sex1 { "M" } ecstat1 { 0 } @@ -51,8 +52,6 @@ FactoryBot.define do supcharg { 35 } tcharge { 325 } propcode { "same property code" } - renewal { 1 } - rent_type { 1 } startdate { Time.zone.today } end trait :completed do diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index 54687c928..177ed600c 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -41,6 +41,7 @@ FactoryBot.define do type { 8 } jointpur { 2 } saledate { Time.zone.today } + age1_known { 1 } age1 { 20 } sex1 { "F" } ecstat1 { 1 } diff --git a/spec/helpers/duplicate_logs_helper_spec.rb b/spec/helpers/duplicate_logs_helper_spec.rb new file mode 100644 index 000000000..8cb971832 --- /dev/null +++ b/spec/helpers/duplicate_logs_helper_spec.rb @@ -0,0 +1,136 @@ +require "rails_helper" + +RSpec.describe DuplicateLogsHelper do + describe "#duplicates_for_user" do + let(:org) { create(:organisation) } + let(:other_org) { create(:organisation) } + let(:current_user) { create(:user, organisation: org) } + let(:user_same_org) { create(:user, organisation: org) } + let(:user_other_org) { create(:user, organisation: other_org) } + + let!(:lettings_log) { create(:lettings_log, :duplicate, created_by: current_user) } + let!(:sales_log) { create(:sales_log, :duplicate, created_by: current_user) } + let(:result) { duplicates_for_user(current_user) } + + context "when there are no duplicates" do + it "returns empty duplicates" do + expect(result).to eq({ lettings: [], sales: [] }) + end + end + + context "when there are duplicates in another org" do + before do + create(:lettings_log, :duplicate, created_by: user_other_org) + create(:sales_log, :duplicate, created_by: user_other_org) + end + + it "does not locate duplicates" do + expect(result).to eq({ lettings: [], sales: [] }) + end + end + + context "when another user in the same org has created a duplicate lettings log" do + let!(:duplicate_lettings_log) { create(:lettings_log, :duplicate, created_by: user_same_org) } + + it "returns the ids of the duplicates in a hash under the lettings key" do + expect(result).to be_a Hash + expect(result[:lettings]).to match_array [[lettings_log.id, duplicate_lettings_log.id]] + end + end + + context "when another user in the same org has created a duplicate sales log" do + let!(:duplicate_sales_log) { create(:sales_log, :duplicate, created_by: user_same_org) } + + it "returns the ids of the duplicates in a hash under the sales key" do + expect(result).to be_a Hash + expect(result[:sales]).to match_array [[sales_log.id, duplicate_sales_log.id]] + end + end + + context "when there is a set of duplicate lettings logs not associated with the user" do + before do + create_list(:lettings_log, 3, :duplicate, tenancycode: "other", owning_organisation: org) + end + + it "returns the ids of the duplicates in a hash under the lettings key" do + expect(result).to be_a Hash + expect(result[:lettings]).to be_empty + end + end + + context "when there is a set of duplicate sales logs not associated with the user" do + before do + create_list(:sales_log, 3, :duplicate, purchid: "other", owning_organisation: org) + end + + it "returns the ids of the duplicates in a hash under the sales key" do + expect(result).to be_a Hash + expect(result[:sales]).to be_empty + end + end + + context "when there are multiple sets of duplicates across lettings and sales" do + let!(:duplicate_lettings_log) { create(:lettings_log, :duplicate, created_by: user_same_org) } + let!(:duplicate_sales_log) { create(:sales_log, :duplicate, created_by: user_same_org) } + let!(:further_sales_log) { create(:sales_log, :duplicate, purchid: "further", created_by: current_user) } + let!(:further_duplicate_sales_logs) { create_list(:sales_log, 2, :duplicate, purchid: "further", created_by: user_same_org) } + + it "returns them all with no repeats" do + expected_sales_duplicates_result = [ + [sales_log.id, duplicate_sales_log.id], + [further_sales_log.id, *further_duplicate_sales_logs.map(&:id)], + ] + + expect(result[:lettings]).to match_array [[lettings_log.id, duplicate_lettings_log.id]] + expect(result[:sales]).to match_array expected_sales_duplicates_result + end + end + end + + describe "#duplicates_for_organisation" do + let(:organisation) { create(:organisation) } + let(:sales_logs) { SalesLog.filter_by_organisation(organisation) } + + context "when there are no duplicates" do + it "returns empty duplicates" do + expect(duplicates_for_organisation(organisation)).to eq({ lettings: [], sales: [] }) + end + end + + context "when there are multiple sets of sales duplicates" do + let!(:duplicate_sales_logs) { create_list(:sales_log, 4, :duplicate, purchid: "set 1", owning_organisation: organisation) } + let!(:duplicate_sales_logs_too) { create_list(:sales_log, 5, :duplicate, postcode_full: "B1 1BB", owning_organisation: organisation) } + let!(:duplicate_sales_logs_3) { create_list(:sales_log, 3, :duplicate, age1: 38, owning_organisation: organisation) } + + let!(:duplicate_lettings_logs) { create_list(:lettings_log, 4, :duplicate, tenancycode: "set 1", owning_organisation: organisation) } + let!(:duplicate_lettings_logs_too) { create_list(:lettings_log, 5, :duplicate, postcode_full: "B1 1BB", owning_organisation: organisation) } + let!(:duplicate_lettings_logs_3) { create_list(:lettings_log, 3, :duplicate, age1: 38, owning_organisation: organisation) } + + before do + create_list(:sales_log, 3, :duplicate, discarded_at: Time.zone.now, status: 4, owning_organisation: organisation) + create_list(:lettings_log, 3, :duplicate, discarded_at: Time.zone.now, status: 4, owning_organisation: organisation) + end + + it "returns them all with no repeats" do + expected_sales_duplicates_result = [ + duplicate_sales_logs.map(&:id), + duplicate_sales_logs_too.map(&:id), + duplicate_sales_logs_3.map(&:id), + ] + + expected_lettings_duplicates_result = [ + duplicate_lettings_logs.map(&:id), + duplicate_lettings_logs_too.map(&:id), + duplicate_lettings_logs_3.map(&:id), + ] + + expect(duplicates_for_organisation(organisation)[:lettings]).to match_array( + expected_lettings_duplicates_result.map { |nested_array| match_array(nested_array) }, + ) + expect(duplicates_for_organisation(organisation)[:sales]).to match_array( + expected_sales_duplicates_result.map { |nested_array| match_array(nested_array) }, + ) + end + end + end +end diff --git a/spec/models/lettings_log_spec.rb b/spec/models/lettings_log_spec.rb index 36c793c79..e89015233 100644 --- a/spec/models/lettings_log_spec.rb +++ b/spec/models/lettings_log_spec.rb @@ -2980,6 +2980,189 @@ RSpec.describe LettingsLog do end end end + + context "when getting list of duplicate logs" do + let(:organisation) { create(:organisation) } + let!(:log) { create(:lettings_log, :duplicate, owning_organisation: organisation) } + let!(:duplicate_log) { create(:lettings_log, :duplicate, owning_organisation: organisation) } + let(:duplicate_sets) { described_class.duplicate_sets } + + it "returns a list of duplicates in the same organisation" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + + context "when there is a deleted duplicate log" do + before do + create(:lettings_log, :duplicate, discarded_at: Time.zone.now, status: 4) + end + + it "does not return the deleted log as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with a different start date" do + before do + create(:lettings_log, :duplicate, startdate: Time.zone.tomorrow) + end + + it "does not return a log with a different start date as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with a different age1" do + before do + create(:lettings_log, :duplicate, age1: 50) + end + + it "does not return a log with a different age1 as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with a different sex1" do + before do + create(:lettings_log, :duplicate, sex1: "F") + end + + it "does not return a log with a different sex1 as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with a different ecstat1" do + before do + create(:lettings_log, :duplicate, ecstat1: 1) + end + + it "does not return a log with a different ecstat1 as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with a different tcharge" do + before do + create(:lettings_log, :duplicate, brent: 100) + end + + it "does not return a log with a different tcharge as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(duplicate_log.id, log.id) + end + end + + context "when there is a log with a different tenancycode" do + before do + create(:lettings_log, :duplicate, tenancycode: "different") + end + + it "does not return a log with a different tenancycode as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with a different postcode_full" do + before do + create(:lettings_log, :duplicate, postcode_full: "B1 1AA") + end + + it "does not return a log with a different postcode_full as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with nil values for duplicate check fields" do + before do + create(:lettings_log, :duplicate, age1: nil, sex1: nil, ecstat1: nil, postcode_known: 2, postcode_full: nil) + end + + it "does not return a log with nil values as a duplicate" do + log.update!(age1: nil, sex1: nil, ecstat1: nil, postcode_known: 2, postcode_full: nil) + expect(duplicate_sets).to be_empty + end + end + + context "when there is a log with nil values for tenancycode" do + let!(:tenancycode_not_given) { create(:lettings_log, :duplicate, tenancycode: nil, owning_organisation: organisation) } + + it "returns the log as a duplicate if tenancy code is nil" do + log.update!(tenancycode: nil) + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, tenancycode_not_given.id) + end + end + + context "when there is a log with age1 not known" do + let!(:age1_not_known) { create(:lettings_log, :duplicate, age1_known: 1, age1: nil, owning_organisation: organisation) } + + it "returns the log as a duplicate if age1 is not known" do + log.update!(age1_known: 1, age1: nil) + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(age1_not_known.id, log.id) + end + end + + context "when there is a duplicate supported housing log" do + let(:scheme) { create(:scheme) } + let(:location) { create(:location, scheme:) } + let(:location_2) { create(:location, scheme:) } + let!(:supported_housing_log) { create(:lettings_log, :duplicate, needstype: 2, location:, scheme:, owning_organisation: organisation) } + let!(:duplicate_supported_housing_log) { create(:lettings_log, :duplicate, needstype: 2, location:, scheme:, owning_organisation: organisation) } + + it "returns the log as a duplicate" do + expect(duplicate_sets.count).to eq(2) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + expect(duplicate_sets.second).to contain_exactly(duplicate_supported_housing_log.id, supported_housing_log.id) + end + + it "does not return the log if the locations are different" do + duplicate_supported_housing_log.update!(location: location_2) + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + + it "does not compare tcharge if there are no household charges" do + supported_housing_log.update!(household_charge: 1, supcharg: nil, brent: nil, scharge: nil, pscharge: nil, tcharge: nil, owning_organisation: organisation) + duplicate_supported_housing_log.update!(household_charge: 1, supcharg: nil, brent: nil, scharge: nil, pscharge: nil, tcharge: nil, owning_organisation: organisation) + expect(duplicate_sets.count).to eq(2) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + expect(duplicate_sets.second).to contain_exactly(supported_housing_log.id, duplicate_supported_housing_log.id) + end + + it "does not return logs not associated with the user if user is given" do + user = create(:user) + supported_housing_log.update!(created_by: user, owning_organisation: user.organisation) + duplicate_supported_housing_log.update!(owning_organisation: user.organisation) + duplicate_sets = described_class.duplicate_sets(user.id) + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(supported_housing_log.id, duplicate_supported_housing_log.id) + end + + it "compares chcharge if it's a carehome" do + supported_housing_log.update!(is_carehome: 1, chcharge: 100, supcharg: nil, brent: nil, scharge: nil, pscharge: nil, tcharge: nil, owning_organisation: organisation) + duplicate_supported_housing_log.update!(is_carehome: 1, chcharge: 100, supcharg: nil, brent: nil, scharge: nil, pscharge: nil, tcharge: nil, owning_organisation: organisation) + expect(duplicate_sets.count).to eq(2) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + expect(duplicate_sets.second).to contain_exactly(supported_housing_log.id, duplicate_supported_housing_log.id) + end + + it "does not return a duplicate if carehome charge is not given" do + supported_housing_log.update!(is_carehome: 1, chcharge: nil, supcharg: nil, brent: nil, scharge: nil, pscharge: nil, tcharge: nil, owning_organisation: organisation) + duplicate_supported_housing_log.update!(is_carehome: 1, chcharge: nil, supcharg: nil, brent: nil, scharge: nil, pscharge: nil, tcharge: nil, owning_organisation: organisation) + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + end end describe "#retirement_age_for_person" do diff --git a/spec/models/sales_log_spec.rb b/spec/models/sales_log_spec.rb index 1aa27cbd3..15f4e6518 100644 --- a/spec/models/sales_log_spec.rb +++ b/spec/models/sales_log_spec.rb @@ -279,6 +279,163 @@ RSpec.describe SalesLog, type: :model do end end + context "when getting list of duplicate logs" do + let(:organisation) { create(:organisation) } + let!(:log) { create(:sales_log, :duplicate, owning_organisation: organisation) } + let!(:duplicate_log) { create(:sales_log, :duplicate, owning_organisation: organisation) } + let(:duplicate_sets) { described_class.duplicate_sets } + + it "returns a list of duplicates in the same organisation" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + + context "when there is a deleted duplicate log" do + before do + create(:sales_log, :duplicate, discarded_at: Time.zone.now, status: 4) + end + + it "does not return the deleted log as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with a different sale date" do + before do + create(:sales_log, :duplicate, saledate: Time.zone.tomorrow) + end + + it "does not return a log with a different sale date as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with a different age1" do + before do + create(:sales_log, :duplicate, age1: 50) + end + + it "does not return a log with a different age1 as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with a different sex1" do + before do + create(:sales_log, :duplicate, sex1: "X") + end + + it "does not return a log with a different sex1 as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with a different ecstat1" do + before do + create(:sales_log, :duplicate, ecstat1: 9) + end + + it "does not return a log with a different ecstat1 as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with a different purchid" do + before do + create(:sales_log, :duplicate, purchid: "different") + end + + it "does not return a log with a different purchid as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with a different postcode_full" do + before do + create(:sales_log, :duplicate, postcode_full: "B1 1AA") + end + + it "does not return a log with a different postcode_full as a duplicate" do + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + + context "when there is a log with nil values for duplicate check fields" do + before do + create(:sales_log, :duplicate, age1: nil, sex1: nil, ecstat1: nil, pcodenk: 1, postcode_full: nil) + end + + it "does not return a log with nil values as a duplicate" do + log.update!(age1: nil, sex1: nil, ecstat1: nil, pcodenk: 1, postcode_full: nil) + expect(duplicate_sets).to be_empty + end + end + + context "when there is a log with nil values for purchid" do + let!(:purchid_not_given) { create(:sales_log, :duplicate, purchid: nil, owning_organisation: organisation) } + + it "returns the log as a duplicate if tenancy code is nil" do + log.update!(purchid: nil) + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, purchid_not_given.id) + end + end + + context "when there is a log with age1 not known" do + let!(:age1_not_known) { create(:sales_log, :duplicate, age1_known: 1, age1: nil, owning_organisation: organisation) } + + it "returns the log as a duplicate if age1 is not known" do + log.update!(age1_known: 1, age1: nil) + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(age1_not_known.id, log.id) + end + end + + context "when there is a log with age1 prefers not to say" do + let!(:age1_prefers_not_to_say) { create(:sales_log, :duplicate, age1_known: 2, age1: nil, owning_organisation: organisation) } + + it "returns the log as a duplicate if age1 is prefers not to say" do + log.update!(age1_known: 2, age1: nil) + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(age1_prefers_not_to_say.id, log.id) + end + end + + context "when there is a log with age1 not known and prefers not to say" do + before do + create(:sales_log, :duplicate, age1_known: 2, age1: nil) + end + + it "doe not return the log as a duplicate" do + log.update!(age1_known: 1, age1: nil) + expect(duplicate_sets).to be_empty + end + end + + context "when user is given" do + let(:user) { create(:user) } + + before do + create_list(:sales_log, 2, :duplicate, purchid: "other duplicates") + log.update!(created_by: user, owning_organisation: user.organisation) + end + + it "does not return logs not associated with the given user" do + duplicate_log.update!(owning_organisation: user.organisation) + duplicate_sets = described_class.duplicate_sets(user.id) + expect(duplicate_sets.count).to eq(1) + expect(duplicate_sets.first).to contain_exactly(log.id, duplicate_log.id) + end + end + end + describe "derived variables" do let(:sales_log) { create(:sales_log, :completed) } diff --git a/spec/requests/duplicate_logs_controller_spec.rb b/spec/requests/duplicate_logs_controller_spec.rb index 096b5ed61..fa989e836 100644 --- a/spec/requests/duplicate_logs_controller_spec.rb +++ b/spec/requests/duplicate_logs_controller_spec.rb @@ -313,4 +313,78 @@ RSpec.describe DuplicateLogsController, type: :request do end end end + + describe "GET #index" do + before do + allow(user).to receive(:need_two_factor_authentication?).and_return(false) + sign_in user + end + + context "when the user is support" do + let(:user) { create(:user, :support) } + + it "renders not found" do + get duplicate_logs_path(organisation_id: user.organisation.id) + expect(response).to have_http_status(:not_found) + end + end + + context "when the user is a data coordinator" do + let(:user) { create(:user, :data_coordinator) } + + before do + allow(user.organisation).to receive(:duplicate_lettings_logs_sets).and_return([[1, 2], [3, 4, 5]]) + allow(user.organisation).to receive(:duplicate_sales_logs_sets).and_return([[11, 12]]) + end + + it "gets organisation duplicates" do + expect(user.organisation).to receive(:duplicate_lettings_logs_sets) + expect(user.organisation).to receive(:duplicate_sales_logs_sets) + get duplicate_logs_path(organisation_id: user.organisation.id) + end + end + + context "when the user is a provider" do + let(:user) { create(:user) } + + before do + allow(user).to receive(:duplicate_lettings_logs_sets).and_return([[1, 2], [3, 4, 5]]) + allow(user).to receive(:duplicate_sales_logs_sets).and_return([[11, 12]]) + end + + it "calls the helper method to retrieve duplicates for the current user" do + expect(user).to receive(:duplicate_lettings_logs_sets) + expect(user).to receive(:duplicate_sales_logs_sets) + get duplicate_logs_path + end + + describe "viewing the page" do + before do + get duplicate_logs_path + end + + it "has the correct headers" do + expect(page).to have_content("Type of logs") + expect(page).to have_content("Log IDs") + end + + it "has the correct number of rows for each log type" do + expect(page).to have_selector("tbody tr td", text: "Lettings", count: 2) + expect(page).to have_selector("tbody tr td", text: "Sales", count: 1) + end + + it "shows the log ids for each set of duplicates" do + expect(page).to have_content("Log 1, Log 2") + expect(page).to have_content("Log 3, Log 4, Log 5") + expect(page).to have_content("Log 11, Log 12") + end + + it "shows links for each set of duplciates" do + expect(page).to have_link("Review logs", href: lettings_log_duplicate_logs_path(1, original_log_id: 1)) + expect(page).to have_link("Review logs", href: lettings_log_duplicate_logs_path(3, original_log_id: 3)) + expect(page).to have_link("Review logs", href: sales_log_duplicate_logs_path(11, original_log_id: 11)) + end + end + end + end end diff --git a/spec/requests/form_controller_spec.rb b/spec/requests/form_controller_spec.rb index 8e8a965cb..5f0e7b273 100644 --- a/spec/requests/form_controller_spec.rb +++ b/spec/requests/form_controller_spec.rb @@ -797,7 +797,7 @@ RSpec.describe FormController, type: :request do end it "redirects back to the duplicates page for remaining duplicates" do - expect(response).to have_http_status(:ok) + expect(response).to redirect_to("/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}") end end end @@ -805,13 +805,13 @@ RSpec.describe FormController, type: :request do context "when the sales question was accessed from a duplicate logs screen" do let(:sales_log) { create(:sales_log, :duplicate, created_by: user) } let(:duplicate_log) { create(:sales_log, :duplicate, created_by: user) } - let(:referrer) { "/sales-logs/#{sales_log.id}/buyer-1-age?referrer=duplicate_logs&first_remaining_duplicate_id=#{duplicate_log.id}&original_log_id=#{sales_log.id}" } + let(:referrer) { "/sales-logs/#{sales_log.id}/buyer-1-age?referrer=duplicate_logs&first_remaining_duplicate_id=#{duplicate_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs" } let(:params) do { id: sales_log.id, sales_log: { page: "buyer_1_age", - age1: 20, + age1: 29, age1_known: 1, }, } @@ -838,7 +838,7 @@ RSpec.describe FormController, type: :request do end it "redirects back to the duplicates page for remaining duplicates" do - expect(response).to have_http_status(:ok) + expect(response).to redirect_to("/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}") end end end diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index 6cf53acc9..b4701517f 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -238,8 +238,6 @@ RSpec.describe LettingsLogsController, type: :request do let(:headers) { { "Accept" => "text/html" } } context "when you visit the index page" do - let(:user) { FactoryBot.create(:user, :support) } - before do allow(user).to receive(:need_two_factor_authentication?).and_return(false) sign_in user @@ -308,6 +306,18 @@ RSpec.describe LettingsLogsController, type: :request do expect(page).to have_link("Download (CSV, codes only)", href: "/lettings-logs/csv-download?codes_only=true") end + context "when there are duplicate logs for this user" do + before do + FactoryBot.create_list(:lettings_log, 2, :duplicate, owning_organisation: user.organisation, created_by: user) + end + + it "does not show a notification banner even if there are duplicate logs for this user" do + get lettings_logs_path + expect(page).not_to have_content "duplicate logs" + expect(page).not_to have_link "Review logs" + end + end + context "when there are no logs in the database" do before do LettingsLog.destroy_all @@ -615,6 +625,12 @@ RSpec.describe LettingsLogsController, type: :request do expect(page).not_to have_link("Download (CSV, codes only)") end + it "does not show a notification banner even if there are duplicate logs for this user" do + get lettings_logs_path + expect(page).not_to have_content "duplicate logs" + expect(page).not_to have_link "Review logs" + end + context "when using a search query" do let(:logs) { FactoryBot.create_list(:lettings_log, 3, :completed, owning_organisation: user.organisation, created_by: user) } let(:log_to_search) { FactoryBot.create(:lettings_log, :completed, owning_organisation: user.organisation, created_by: user) } @@ -871,6 +887,36 @@ RSpec.describe LettingsLogsController, type: :request do end end end + + context "and there are duplicate logs for this user" do + before do + FactoryBot.create_list(:lettings_log, 2, :duplicate, owning_organisation: user.organisation, created_by: user) + end + + it "displays a notification banner with a link to review logs" do + get lettings_logs_path + expect(page).to have_content "duplicate logs" + expect(page).to have_link "Review logs" # add an href when routing done + end + + context "when there is one set of duplicates" do + it "displays the correct copy in the banner" do + get lettings_logs_path + expect(page).to have_content "There is 1 set of duplicate logs" + end + end + + context "when there are multiple sets of duplicates" do + before do + FactoryBot.create_list(:sales_log, 2, :duplicate, owning_organisation: user.organisation, created_by: user) + end + + it "displays the correct copy in the banner" do + get lettings_logs_path + expect(page).to have_content "There are 2 sets of duplicate logs" + end + end + end end end