From 5a6f624b272df1963a82d7954cfcc6d188223dbf Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Thu, 30 Nov 2023 08:55:09 +0000
Subject: [PATCH] Display labels and filters for merged orgs

---
 .../lettings_log_summary_component.html.erb   |  2 +-
 .../sales_log_summary_component.html.erb      |  2 +-
 app/helpers/filters_helper.rb                 |  4 ++--
 app/models/organisation.rb                    |  4 ++++
 .../requests/lettings_logs_controller_spec.rb | 14 +++++++++++++
 spec/requests/sales_logs_controller_spec.rb   | 20 +++++++++++++++++++
 6 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/app/components/lettings_log_summary_component.html.erb b/app/components/lettings_log_summary_component.html.erb
index b0bc9fed8..1845a155f 100644
--- a/app/components/lettings_log_summary_component.html.erb
+++ b/app/components/lettings_log_summary_component.html.erb
@@ -34,7 +34,7 @@
           <% end %>
         </p>
       <% end %>
-      <% if current_user.support? || current_user.organisation.has_managing_agents? %>
+      <% if current_user.support? || current_user.organisation.has_managing_agents? || current_user.organisation.has_recent_absorbed_organisations? %>
         <dl class="app-metadata">
           <% if log.owning_organisation %>
             <div class="app-metadata__item">
diff --git a/app/components/sales_log_summary_component.html.erb b/app/components/sales_log_summary_component.html.erb
index 6b3be98cb..10b021fb7 100644
--- a/app/components/sales_log_summary_component.html.erb
+++ b/app/components/sales_log_summary_component.html.erb
@@ -24,7 +24,7 @@
           Sale completed <time datetime="<%= log.saledate.iso8601 %>"><%= log.saledate.to_formatted_s(:govuk_date) %></time>
         <% end %>
       </p>
-      <% if current_user.support? || current_user.organisation.has_managing_agents? %>
+      <% if current_user.support? || current_user.organisation.has_managing_agents? || current_user.organisation.has_recent_absorbed_organisations? %>
         <dl class="app-metadata">
           <% if log.owning_organisation %>
             <div class="app-metadata__item">
diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index 2df2d21b1..f3329f2a4 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -124,11 +124,11 @@ module FiltersHelper
   end
 
   def non_support_with_multiple_owning_orgs?
-    current_user.organisation.stock_owners.count > 1 && user_lettings_path?
+    current_user.organisation.stock_owners.count > 1 && user_lettings_path? || current_user.organisation.has_recent_absorbed_organisations?
   end
 
   def non_support_with_multiple_managing_orgs?
-    current_user.organisation.managing_agents.count > 1 && user_lettings_path?
+    current_user.organisation.managing_agents.count > 1 && user_lettings_path? || current_user.organisation.has_recent_absorbed_organisations?
   end
 
   def user_lettings_path?
diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index 1e05bddab..077f0413e 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -146,4 +146,8 @@ class Organisation < ApplicationRecord
 
     absorbed_organisations.merged_during_open_collection_period.group_by(&:merge_date)
   end
+
+  def has_recent_absorbed_organisations?
+    absorbed_organisations&.merged_during_open_collection_period.present?
+  end
 end
diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb
index 7e6da9ce7..354e1a5da 100644
--- a/spec/requests/lettings_logs_controller_spec.rb
+++ b/spec/requests/lettings_logs_controller_spec.rb
@@ -277,6 +277,20 @@ RSpec.describe LettingsLogsController, type: :request do
             expect(page).not_to have_link "Delete logs"
           end
         end
+
+        context "and organisation has absorbed organisations" do
+          let(:merged_organisation) { FactoryBot.create(:organisation) }
+
+          before do
+            merged_organisation.update!(absorbing_organisation: organisation, merge_date: Time.zone.yesterday)
+          end
+
+          it "shows organisation labels" do
+            get "/lettings-logs", headers:, params: {}
+            expect(page).to have_content("Owned by")
+            expect(page).to have_content("Managed by")
+          end
+        end
       end
 
       context "when the user is a customer support user" do
diff --git a/spec/requests/sales_logs_controller_spec.rb b/spec/requests/sales_logs_controller_spec.rb
index 2b7f6e172..a20693b46 100644
--- a/spec/requests/sales_logs_controller_spec.rb
+++ b/spec/requests/sales_logs_controller_spec.rb
@@ -559,6 +559,26 @@ RSpec.describe SalesLogsController, type: :request do
           sign_in user
         end
 
+        it "does not have organisation values" do
+          get "/sales-logs", headers: headers, params: {}
+          expect(page).not_to have_content("Owned by")
+          expect(page).not_to have_content("Managed by")
+        end
+
+        context "and organisation has absorbed organisations" do
+          let(:merged_organisation) { FactoryBot.create(:organisation) }
+
+          before do
+            merged_organisation.update!(absorbing_organisation: organisation, merge_date: Time.zone.yesterday)
+          end
+
+          it "has organisation values" do
+            get "/sales-logs", headers: headers, params: {}
+            expect(page).to have_content("Owned by")
+            expect(page).not_to have_content("Managed by")
+          end
+        end
+
         it "does not have organisation columns" do
           get "/sales-logs", headers: headers, params: {}
           expect(page).not_to have_content("Owning organisation")