From 050d02c7d22988845fa6c3ab810e325c67f09962 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Mon, 9 Oct 2023 15:30:56 +0100
Subject: [PATCH] Display managed logs

---
 app/controllers/organisations_controller.rb    | 2 +-
 spec/requests/organisations_controller_spec.rb | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb
index cce0c60fd..a45b4a66f 100644
--- a/app/controllers/organisations_controller.rb
+++ b/app/controllers/organisations_controller.rb
@@ -94,7 +94,7 @@ class OrganisationsController < ApplicationController
   end
 
   def lettings_logs
-    organisation_logs = LettingsLog.visible.where(owning_organisation_id: @organisation.id)
+    organisation_logs = LettingsLog.visible.filter_by_organisation(@organisation)
     unpaginated_filtered_logs = filter_manager.filtered_logs(organisation_logs, search_term, session_filters)
 
     @search_term = search_term
diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb
index bacb5ca33..6d6bdcbdf 100644
--- a/spec/requests/organisations_controller_spec.rb
+++ b/spec/requests/organisations_controller_spec.rb
@@ -717,10 +717,12 @@ RSpec.describe OrganisationsController, type: :request do
 
         context "when viewing a specific organisation's lettings logs" do
           let(:number_of_org1_lettings_logs) { 2 }
+          let(:number_of_org1_managed_lettings_logs) { 2 }
           let(:number_of_org2_lettings_logs) { 4 }
 
           before do
             create_list(:lettings_log, number_of_org1_lettings_logs, created_by: user)
+            create_list(:lettings_log, number_of_org1_managed_lettings_logs, managing_organisation: user.organisation)
             create(:lettings_log, created_by: user, status: "pending", skip_update_status: true)
             create_list(:lettings_log, number_of_org2_lettings_logs, created_by: nil, owning_organisation_id: unauthorised_organisation.id, managing_organisation_id: unauthorised_organisation.id)
 
@@ -728,12 +730,16 @@ RSpec.describe OrganisationsController, type: :request do
           end
 
           it "only shows logs for that organisation" do
-            expect(page).to have_content("#{number_of_org1_lettings_logs} total logs")
+            expect(page).to have_content("#{number_of_org1_lettings_logs + number_of_org1_managed_lettings_logs} total logs")
 
             organisation.lettings_logs.visible.map(&:id).each do |lettings_log_id|
               expect(page).to have_link lettings_log_id.to_s, href: "/lettings-logs/#{lettings_log_id}"
             end
 
+            organisation.managed_lettings_logs.visible.map(&:id).each do |lettings_log_id|
+              expect(page).to have_link lettings_log_id.to_s, href: "/lettings-logs/#{lettings_log_id}"
+            end
+
             unauthorised_organisation.lettings_logs.map(&:id).each do |lettings_log_id|
               expect(page).not_to have_link lettings_log_id.to_s, href: "/lettings-logs/#{lettings_log_id}"
             end