diff --git a/app/controllers/lettings_logs_controller.rb b/app/controllers/lettings_logs_controller.rb index 169ff42e3..6b1d4a531 100644 --- a/app/controllers/lettings_logs_controller.rb +++ b/app/controllers/lettings_logs_controller.rb @@ -118,7 +118,7 @@ private end def redirect_if_bulk_upload_resolved - if @bulk_upload && @bulk_upload.lettings_logs.in_progress.count.zero? + if @bulk_upload && @bulk_upload.lettings? && @bulk_upload.lettings_logs.in_progress.count.zero? redirect_to resume_bulk_upload_lettings_result_path(@bulk_upload) end end diff --git a/spec/controllers/lettings_logs_controller_spec.rb b/spec/controllers/lettings_logs_controller_spec.rb new file mode 100644 index 000000000..0874649e7 --- /dev/null +++ b/spec/controllers/lettings_logs_controller_spec.rb @@ -0,0 +1,21 @@ +require "rails_helper" + +RSpec.describe LettingsLogsController do + before do + sign_in bulk_upload.user + end + + describe "#index" do + context "when a sales bulk upload filter is applied" do + let(:bulk_upload) { create(:bulk_upload, :sales) } + + it "does not redirect to resume path" do + session[:logs_filters] = { bulk_upload_id: [bulk_upload.id.to_s] }.to_json + + get :index + + expect(response).to be_successful + end + end + end +end diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index 6de5c4db2..7f1dda118 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -438,7 +438,7 @@ RSpec.describe LettingsLogsController, type: :request do let(:organisation) { create(:organisation) } let(:user) { create(:user, organisation:) } - let(:bulk_upload) { create(:bulk_upload, user:) } + let(:bulk_upload) { create(:bulk_upload, :lettings, user:) } let!(:included_log) { create(:lettings_log, :in_progress, bulk_upload:, owning_organisation: organisation) } let!(:excluded_log) { create(:lettings_log, :in_progress, owning_organisation: organisation) } @@ -492,7 +492,7 @@ RSpec.describe LettingsLogsController, type: :request do let(:user) { create(:user, organisation:) } let(:other_user) { create(:user, organisation:) } - let(:bulk_upload) { create(:bulk_upload, user: other_user) } + let(:bulk_upload) { create(:bulk_upload, :lettings, user: other_user) } let!(:excluded_log) { create(:lettings_log, bulk_upload:, owning_organisation: organisation) } let!(:also_excluded_log) { create(:lettings_log, owning_organisation: organisation) } @@ -509,7 +509,7 @@ RSpec.describe LettingsLogsController, type: :request do let(:organisation) { create(:organisation) } let(:user) { create(:user, organisation:) } - let(:bulk_upload) { create(:bulk_upload, user:) } + let(:bulk_upload) { create(:bulk_upload, :lettings, user:) } it "redirects to resume the bulk upload" do get "/lettings-logs?bulk_upload_id[]=#{bulk_upload.id}"