Add moved user banner

app/models/bulk_upload.rb

@@ -101,6 +101,10 @@ class BulkUpload < ApplicationRecord
     logs.filter_by_status("in_progress").map(&:missing_answers_count).sum(0)
   end
 
+  def moved_user_name
+    User.find_by(id: moved_user_id)&.name
+  end
+
 private
 
   def generate_identifier

app/views/bulk_upload_lettings_results/show.html.erb

@@ -2,6 +2,8 @@
   <%= govuk_back_link(href: :back) %>
 <% end %>
 
+<%= render partial: "bulk_upload_shared/moved_user_banner" %>
+
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>

app/views/bulk_upload_lettings_results/summary.html.erb

@@ -1,3 +1,5 @@
+<%= render partial: "bulk_upload_shared/moved_user_banner" %>
+
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>

app/views/bulk_upload_sales_results/show.html.erb

@@ -2,6 +2,8 @@
   <%= govuk_back_link(href: :back) %>
 <% end %>
 
+<%= render partial: "bulk_upload_shared/moved_user_banner" %>
+
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <span class="govuk-caption-l">Bulk Upload for sales (<%= @bulk_upload.year_combo %>)</span>

app/views/bulk_upload_sales_results/summary.html.erb

@@ -1,3 +1,5 @@
+<%= render partial: "bulk_upload_shared/moved_user_banner" %>
+
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <span class="govuk-caption-l">Bulk upload for sales (<%= @bulk_upload.year_combo %>)</span>

app/views/bulk_upload_shared/_moved_user_banner.html.erb

@@ -0,0 +1,12 @@
+<% if @bulk_upload.choice == "cancelled-by-moved-user" %>
+  <%= govuk_notification_banner(title_text: "Important") do %>
+    <p class="govuk-notification-banner__heading govuk-!-width-full" style="max-width: fit-content">
+      This error report is out of date.
+    <p>
+    <% if current_user.id == @bulk_upload.moved_user_id %>
+      You moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.
+    <% else %>
+      Some logs in this upload are assigned to <%= @bulk_upload.moved_user_name %>, who has moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.
+    <% end %>
+  <% end %>
+<% end %>

spec/requests/bulk_upload_lettings_results_controller_spec.rb

@@ -60,6 +60,28 @@ RSpec.describe BulkUploadLettingsResultsController, type: :request do
         expect(response).to be_successful
         expect(response.body).to include(bulk_upload.filename)
       end
+
+      context "and bulk upload has been cancelled by not the current moved user" do
+        let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "cancelled-by-moved-user", moved_user_id: user.id) }
+
+        it "is displays a correct banner" do
+          get "/lettings-logs/bulk-upload-results/#{bulk_upload.id}/summary"
+
+          expect(response.body).to include("This error report is out of date.")
+          expect(response.body).to include("Some logs in this upload are assigned to #{user.name}, who has moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+        end
+      end
+
+      context "and bulk upload has been cancelled by the current moved user" do
+        let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "cancelled-by-moved-user", moved_user_id: other_user.id) }
+
+        it "is displays a correct banner" do
+          get "/lettings-logs/bulk-upload-results/#{bulk_upload.id}/summary"
+
+          expect(response.body).to include("This error report is out of date.")
+          expect(response.body).to include("You moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+        end
+      end
     end
   end
 
@@ -107,5 +129,28 @@ RSpec.describe BulkUploadLettingsResultsController, type: :request do
         expect(response).to be_not_found
       end
     end
+
+    context "and bulk upload has been cancelled by not the current moved user" do
+      let(:other_user) { create(:user, organisation: user.organisation) }
+      let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "cancelled-by-moved-user", moved_user_id: other_user.id) }
+
+      it "is displays a correct banner" do
+        get "/lettings-logs/bulk-upload-results/#{bulk_upload.id}/summary"
+
+        expect(response.body).to include("This error report is out of date.")
+        expect(response.body).to include("Some logs in this upload are assigned to #{other_user.name}, who has moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+      end
+    end
+
+    context "and bulk upload has been cancelled by the current moved user" do
+      let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:, choice: "cancelled-by-moved-user", moved_user_id: user.id) }
+
+      it "is displays a correct banner" do
+        get "/lettings-logs/bulk-upload-results/#{bulk_upload.id}/summary"
+
+        expect(response.body).to include("This error report is out of date.")
+        expect(response.body).to include("You moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+      end
+    end
   end
 end

spec/requests/bulk_upload_sales_results_controller_spec.rb

@@ -11,6 +11,42 @@ RSpec.describe BulkUploadSalesResultsController, type: :request do
     sign_in viewing_user
   end
 
+  describe "GET /sales-logs/bulk-upload-results/:ID/summary" do
+    context "when viewed by another user in the same org" do
+      let(:other_user) { create(:user, organisation: user.organisation) }
+      let(:viewing_user) { other_user }
+
+      it "is accessible" do
+        get "/sales-logs/bulk-upload-results/#{bulk_upload.id}/summary"
+
+        expect(response).to be_successful
+        expect(response.body).to include(bulk_upload.filename)
+      end
+
+      context "and bulk upload has been cancelled by not the current moved user" do
+        let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "cancelled-by-moved-user", moved_user_id: user.id) }
+
+        it "is displays a correct banner" do
+          get "/sales-logs/bulk-upload-results/#{bulk_upload.id}/summary"
+
+          expect(response.body).to include("This error report is out of date.")
+          expect(response.body).to include("Some logs in this upload are assigned to #{user.name}, who has moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+        end
+      end
+
+      context "and bulk upload has been cancelled by the current moved user" do
+        let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "cancelled-by-moved-user", moved_user_id: other_user.id) }
+
+        it "is displays a correct banner" do
+          get "/sales-logs/bulk-upload-results/#{bulk_upload.id}/summary"
+
+          expect(response.body).to include("This error report is out of date.")
+          expect(response.body).to include("You moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+        end
+      end
+    end
+  end
+
   describe "GET /sales-logs/bulk-upload-results/:ID" do
     it "renders correct year" do
       get "/sales-logs/bulk-upload-results/#{bulk_upload.id}"
@@ -68,5 +104,28 @@ RSpec.describe BulkUploadSalesResultsController, type: :request do
         expect(response).to be_not_found
       end
     end
+
+    context "and bulk upload has been cancelled by not the current moved user" do
+      let(:other_user) { create(:user, organisation: user.organisation) }
+      let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "cancelled-by-moved-user", moved_user_id: other_user.id) }
+
+      it "is displays a correct banner" do
+        get "/sales-logs/bulk-upload-results/#{bulk_upload.id}/summary"
+
+        expect(response.body).to include("This error report is out of date.")
+        expect(response.body).to include("Some logs in this upload are assigned to #{other_user.name}, who has moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+      end
+    end
+
+    context "and bulk upload has been cancelled by the current moved user" do
+      let(:bulk_upload) { create(:bulk_upload, :sales, user:, bulk_upload_errors:, choice: "cancelled-by-moved-user", moved_user_id: user.id) }
+
+      it "is displays a correct banner" do
+        get "/sales-logs/bulk-upload-results/#{bulk_upload.id}/summary"
+
+        expect(response.body).to include("This error report is out of date.")
+        expect(response.body).to include("You moved to a different organisation since this file was uploaded. Reupload the file to get an accurate error report.")
+      end
+    end
   end
 end