From e04c2fc81c4252d1746ce38008f69d5f99a21d69 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Mon, 10 Jul 2023 12:41:52 +0100
Subject: [PATCH] Rebase updates

---
 app/controllers/duplicate_logs_controller.rb    | 6 +++++-
 app/controllers/form_controller.rb              | 8 ++++++--
 spec/requests/duplicate_logs_controller_spec.rb | 4 ++--
 spec/requests/form_controller_spec.rb           | 4 ++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/controllers/duplicate_logs_controller.rb b/app/controllers/duplicate_logs_controller.rb
index 17b526bef..e08ec828d 100644
--- a/app/controllers/duplicate_logs_controller.rb
+++ b/app/controllers/duplicate_logs_controller.rb
@@ -4,7 +4,11 @@ class DuplicateLogsController < ApplicationController
 
   def show
     if @log
-      @duplicate_logs = @log.class.duplicate_logs_for_organisation(current_user.organisation_id, @log)
+      @duplicate_logs = if @log.lettings?
+                          current_user.lettings_logs.duplicate_logs(@log)
+                        else
+                          current_user.sales_logs.duplicate_logs(@log)
+                        end
       @all_duplicates = [@log, *@duplicate_logs]
       @duplicate_check_questions = duplicate_check_question_ids.map { |question_id| @log.form.get_question(question_id, @log) }.compact
     else
diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index 0ffd63fa0..1d51ad381 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -155,8 +155,12 @@ private
   end
 
   def successful_redirect_path
-    if @log.class.duplicate_logs_for_organisation(current_user.organisation, @log).count.positive?
-      return send("#{@log.class.name.underscore}_duplicate_logs_path", @log)
+    if @log.lettings?
+      if current_user.lettings_logs.duplicate_logs(@log).count.positive?
+        return send("lettings_log_duplicate_logs_path", @log)
+      end
+    elsif current_user.sales_logs.duplicate_logs(@log).count.positive?
+      return send("sales_log_duplicate_logs_path", @log)
     end
 
     if is_referrer_type?("check_answers")
diff --git a/spec/requests/duplicate_logs_controller_spec.rb b/spec/requests/duplicate_logs_controller_spec.rb
index 502de78dd..c706f313f 100644
--- a/spec/requests/duplicate_logs_controller_spec.rb
+++ b/spec/requests/duplicate_logs_controller_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe DuplicateLogsController, type: :request do
           let(:duplicate_logs) { create_list(:lettings_log, 2, :completed) }
 
           before do
-            allow(LettingsLog).to receive(:duplicate_logs_for_organisation).and_return(duplicate_logs)
+            allow(LettingsLog).to receive(:duplicate_logs).and_return(duplicate_logs)
             get "/lettings-logs/#{lettings_log.id}/duplicate-logs"
           end
 
@@ -83,7 +83,7 @@ RSpec.describe DuplicateLogsController, type: :request do
           let(:duplicate_logs) { create_list(:sales_log, 2, :completed) }
 
           before do
-            allow(SalesLog).to receive(:duplicate_logs_for_organisation).and_return(duplicate_logs)
+            allow(SalesLog).to receive(:duplicate_logs).and_return(duplicate_logs)
             get "/sales-logs/#{sales_log.id}/duplicate-logs"
           end
 
diff --git a/spec/requests/form_controller_spec.rb b/spec/requests/form_controller_spec.rb
index 7f4fa749f..a6143f91a 100644
--- a/spec/requests/form_controller_spec.rb
+++ b/spec/requests/form_controller_spec.rb
@@ -537,7 +537,7 @@ RSpec.describe FormController, type: :request do
             let(:duplicate_logs) { create_list(:lettings_log, 2) }
 
             before do
-              allow(LettingsLog).to receive(:duplicate_logs_for_organisation).and_return(duplicate_logs)
+              allow(LettingsLog).to receive(:duplicate_logs).and_return(duplicate_logs)
               post "/lettings-logs/#{lettings_log.id}/#{page_id.dasherize}", params:
             end
 
@@ -570,7 +570,7 @@ RSpec.describe FormController, type: :request do
             let(:duplicate_logs) { create_list(:sales_log, 2) }
 
             before do
-              allow(SalesLog).to receive(:duplicate_logs_for_organisation).and_return(duplicate_logs)
+              allow(SalesLog).to receive(:duplicate_logs).and_return(duplicate_logs)
               post "/sales-logs/#{sales_log.id}/buyer-1-age", params:
             end