Browse Source

scope lettings and sales bulk upload results

remotes/origin/bulk-upload-errors-integration
Phil Lee 4 years ago
parent
commit
e45492960d
  1. 4
      app/controllers/bulk_upload_lettings_results_controller.rb
  2. 4
      app/controllers/bulk_upload_sales_results_controller.rb
  3. 8
      spec/factories/bulk_upload.rb
  4. 13
      spec/requests/bulk_upload_lettings_results_controller_spec.rb
  5. 13
      spec/requests/bulk_upload_sales_results_controller_spec.rb

4
app/controllers/bulk_upload_lettings_results_controller.rb

@ -1,7 +1,9 @@
class BulkUploadLettingsResultsController < ApplicationController class BulkUploadLettingsResultsController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
def show def show
@bulk_upload = current_user.bulk_uploads.find(params[:id]) @bulk_upload = current_user.bulk_uploads.lettings.find(params[:id])
end end
end end

4
app/controllers/bulk_upload_sales_results_controller.rb

@ -1,7 +1,9 @@
class BulkUploadSalesResultsController < ApplicationController class BulkUploadSalesResultsController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
def show def show
@bulk_upload = current_user.bulk_uploads.find(params[:id]) @bulk_upload = current_user.bulk_uploads.sales.find(params[:id])
end end
end end

8
spec/factories/bulk_upload.rb

@ -7,5 +7,13 @@ FactoryBot.define do
year { 2022 } year { 2022 }
identifier { SecureRandom.uuid } identifier { SecureRandom.uuid }
sequence(:filename) { |n| "bulk-upload-#{n}.csv" } sequence(:filename) { |n| "bulk-upload-#{n}.csv" }
trait(:sales) do
log_type { BulkUpload.log_types[:sales] }
end
trait(:lettings) do
log_type { BulkUpload.log_types[:lettings] }
end
end end
end end

13
spec/requests/bulk_upload_lettings_results_controller_spec.rb

@ -2,7 +2,7 @@ require "rails_helper"
RSpec.describe BulkUploadLettingsResultsController, type: :request do RSpec.describe BulkUploadLettingsResultsController, type: :request do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:bulk_upload) { create(:bulk_upload, user:, bulk_upload_errors:) } let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:) }
let(:bulk_upload_errors) { create_list(:bulk_upload_error, 2) } let(:bulk_upload_errors) { create_list(:bulk_upload_error, 2) }
before do before do
@ -42,5 +42,16 @@ RSpec.describe BulkUploadLettingsResultsController, type: :request do
expect(response.body).to include("<table").twice expect(response.body).to include("<table").twice
end end
end end
context "when viewing sales log" do
let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:) }
it "renders a 404" do
get "/lettings-logs/bulk-upload-results/#{bulk_upload.id}"
expect(response).not_to be_successful
expect(response).to be_not_found
end
end
end end
end end

13
spec/requests/bulk_upload_sales_results_controller_spec.rb

@ -2,7 +2,7 @@ require "rails_helper"
RSpec.describe BulkUploadSalesResultsController, type: :request do RSpec.describe BulkUploadSalesResultsController, type: :request do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:bulk_upload) { create(:bulk_upload, user:, bulk_upload_errors:) } let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:) }
let(:bulk_upload_errors) { create_list(:bulk_upload_error, 2) } let(:bulk_upload_errors) { create_list(:bulk_upload_error, 2) }
before do before do
@ -42,5 +42,16 @@ RSpec.describe BulkUploadSalesResultsController, type: :request do
expect(response.body).to include("<table").twice expect(response.body).to include("<table").twice
end end
end end
context "when viewing lettings log" do
let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:) }
it "renders a 404" do
get "/sales-logs/bulk-upload-results/#{bulk_upload.id}"
expect(response).not_to be_successful
expect(response).to be_not_found
end
end
end end
end end

Loading…
Cancel
Save