From e45492960d5dade9a738222f397017c875b5b625 Mon Sep 17 00:00:00 2001
From: Phil Lee <asmega@users.noreply.github.com>
Date: Wed, 14 Dec 2022 16:01:08 +0000
Subject: [PATCH] scope lettings and sales bulk upload results

---
 .../bulk_upload_lettings_results_controller.rb      |  4 +++-
 .../bulk_upload_sales_results_controller.rb         |  4 +++-
 spec/factories/bulk_upload.rb                       |  8 ++++++++
 .../bulk_upload_lettings_results_controller_spec.rb | 13 ++++++++++++-
 .../bulk_upload_sales_results_controller_spec.rb    | 13 ++++++++++++-
 5 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/app/controllers/bulk_upload_lettings_results_controller.rb b/app/controllers/bulk_upload_lettings_results_controller.rb
index 7665a33c8..a0a962b3e 100644
--- a/app/controllers/bulk_upload_lettings_results_controller.rb
+++ b/app/controllers/bulk_upload_lettings_results_controller.rb
@@ -1,7 +1,9 @@
 class BulkUploadLettingsResultsController < ApplicationController
   before_action :authenticate_user!
 
+  rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+
   def show
-    @bulk_upload = current_user.bulk_uploads.find(params[:id])
+    @bulk_upload = current_user.bulk_uploads.lettings.find(params[:id])
   end
 end
diff --git a/app/controllers/bulk_upload_sales_results_controller.rb b/app/controllers/bulk_upload_sales_results_controller.rb
index d31ff5447..6af8cb659 100644
--- a/app/controllers/bulk_upload_sales_results_controller.rb
+++ b/app/controllers/bulk_upload_sales_results_controller.rb
@@ -1,7 +1,9 @@
 class BulkUploadSalesResultsController < ApplicationController
   before_action :authenticate_user!
 
+  rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+
   def show
-    @bulk_upload = current_user.bulk_uploads.find(params[:id])
+    @bulk_upload = current_user.bulk_uploads.sales.find(params[:id])
   end
 end
diff --git a/spec/factories/bulk_upload.rb b/spec/factories/bulk_upload.rb
index d9721988b..437f977d9 100644
--- a/spec/factories/bulk_upload.rb
+++ b/spec/factories/bulk_upload.rb
@@ -7,5 +7,13 @@ FactoryBot.define do
     year { 2022 }
     identifier { SecureRandom.uuid }
     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
diff --git a/spec/requests/bulk_upload_lettings_results_controller_spec.rb b/spec/requests/bulk_upload_lettings_results_controller_spec.rb
index 828242b83..15ba0b7bb 100644
--- a/spec/requests/bulk_upload_lettings_results_controller_spec.rb
+++ b/spec/requests/bulk_upload_lettings_results_controller_spec.rb
@@ -2,7 +2,7 @@ require "rails_helper"
 
 RSpec.describe BulkUploadLettingsResultsController, type: :request do
   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) }
 
   before do
@@ -42,5 +42,16 @@ RSpec.describe BulkUploadLettingsResultsController, type: :request do
         expect(response.body).to include("<table").twice
       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
diff --git a/spec/requests/bulk_upload_sales_results_controller_spec.rb b/spec/requests/bulk_upload_sales_results_controller_spec.rb
index 24f05df85..f18bbd605 100644
--- a/spec/requests/bulk_upload_sales_results_controller_spec.rb
+++ b/spec/requests/bulk_upload_sales_results_controller_spec.rb
@@ -2,7 +2,7 @@ require "rails_helper"
 
 RSpec.describe BulkUploadSalesResultsController, type: :request do
   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) }
 
   before do
@@ -42,5 +42,16 @@ RSpec.describe BulkUploadSalesResultsController, type: :request do
         expect(response.body).to include("<table").twice
       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