Rename param and update conditionals

app/controllers/form_controller.rb

@@ -252,7 +252,7 @@ private
       send("#{class_name}_duplicate_logs_path", original_log, original_log_id: original_log.id)
     else
       flash[:notice] = deduplication_success_banner
-      send("#{class_name}_duplicate_logs_path", "#{class_name}_id".to_sym => from_referrer_query("remaining_duplicate_id"), original_log_id: from_referrer_query("original_log_id"))
+      send("#{class_name}_duplicate_logs_path", "#{class_name}_id".to_sym => from_referrer_query("first_remaining_duplicate_id"), original_log_id: from_referrer_query("original_log_id"))
     end
   end
 

app/helpers/duplicate_logs_helper.rb

@@ -24,7 +24,7 @@ module DuplicateLogsHelper
   end
 
   def change_duplicate_logs_action_href(log, page_id, all_duplicates, original_log_id)
-    remaining_duplicate_id = all_duplicates.map(&:id).reject { |id| id == log.id }.first
+    first_remaining_duplicate_id = all_duplicates.map(&:id).reject { |id| id == log.id }.first
-    send("#{log.model_name.param_key}_#{page_id}_path", log, referrer: "duplicate_logs", remaining_duplicate_id:, original_log_id:)
+    send("#{log.model_name.param_key}_#{page_id}_path", log, referrer: "duplicate_logs", first_remaining_duplicate_id:, original_log_id:)
   end
 end

app/views/duplicate_logs/_duplicate_log_check_answers.erb

@@ -26,7 +26,7 @@
               <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span>
             <% end %>
           <% end %>
-          <% if @all_duplicates.count > 1 %>
+          <% if @all_duplicates.many? %>
             <% row.action(
                 text: question.action_text(log),
                 href: change_duplicate_logs_action_href(log, question.page.id, @all_duplicates, @original_log.id),

app/views/duplicate_logs/show.html.erb

@@ -1,7 +1,7 @@
 <% content_for :title, "Check duplicate logs" %>
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-        <% if @all_duplicates.count > 1 %>
+        <% if @all_duplicates.many? %>
             <%= govuk_panel(
                 classes: "app-panel--interruption",
               ) do %>

spec/features/lettings_log_spec.rb

@@ -508,7 +508,7 @@ RSpec.describe "Lettings Log Features" do
 
       it "allows deduplicating logs by changing the answers on the duplicate log" do
         expect(page).to have_current_path("/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}")
-        click_link("Change", href: "/lettings-logs/#{duplicate_log.id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=duplicate_logs&remaining_duplicate_id=#{lettings_log.id}")
+        click_link("Change", href: "/lettings-logs/#{duplicate_log.id}/tenant-code?first_remaining_duplicate_id=#{lettings_log.id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs")
         fill_in("lettings-log-tenancycode-field", with: "something else")
         click_button("Save and continue")
         expect(page).to have_current_path("/lettings-logs/#{lettings_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}")
@@ -519,7 +519,7 @@ RSpec.describe "Lettings Log Features" do
       end
 
       it "allows deduplicating logs by changing the answers on the original log" do
-        click_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=duplicate_logs&remaining_duplicate_id=#{duplicate_log.id}")
+        click_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?first_remaining_duplicate_id=#{duplicate_log.id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs")
         fill_in("lettings-log-tenancycode-field", with: "something else")
         click_button("Save and continue")
         expect(page).to have_current_path("/lettings-logs/#{duplicate_log.id}/duplicate-logs?original_log_id=#{lettings_log.id}")

spec/features/sales_log_spec.rb

@@ -247,7 +247,7 @@ RSpec.describe "Sales Log Features" do
 
     it "allows deduplicating logs by changing the answers on the duplicate log" do
       expect(page).to have_current_path("/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}")
-      click_link("Change", href: "/sales-logs/#{duplicate_log.id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=duplicate_logs&remaining_duplicate_id=#{sales_log.id}")
+      click_link("Change", href: "/sales-logs/#{duplicate_log.id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs")
       fill_in("sales-log-purchid-field", with: "something else")
       click_button("Save and continue")
       expect(page).to have_current_path("/sales-logs/#{sales_log.id}/duplicate-logs?original_log_id=#{sales_log.id}")
@@ -258,7 +258,7 @@ RSpec.describe "Sales Log Features" do
     end
 
     it "allows deduplicating logs by changing the answers on the original log" do
-      click_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=duplicate_logs&remaining_duplicate_id=#{duplicate_log.id}")
+      click_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?first_remaining_duplicate_id=#{duplicate_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs")
       fill_in("sales-log-purchid-field", with: "something else")
       click_button("Save and continue")
       expect(page).to have_current_path("/sales-logs/#{duplicate_log.id}/duplicate-logs?original_log_id=#{sales_log.id}")

spec/requests/duplicate_logs_controller_spec.rb

@@ -58,9 +58,9 @@ RSpec.describe DuplicateLogsController, type: :request do
             expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 3)
             expect(page).to have_content("Household rent and charges", count: 3)
             expect(page).to have_link("Change", count: 21)
-            expect(page).to have_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=duplicate_logs&remaining_duplicate_id=#{duplicate_logs[0].id}")
+            expect(page).to have_link("Change", href: "/lettings-logs/#{lettings_log.id}/tenant-code?first_remaining_duplicate_id=#{duplicate_logs[0].id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs")
-            expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[0].id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=duplicate_logs&remaining_duplicate_id=#{lettings_log.id}")
+            expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[0].id}/tenant-code?first_remaining_duplicate_id=#{lettings_log.id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs")
-            expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[1].id}/tenant-code?original_log_id=#{lettings_log.id}&referrer=duplicate_logs&remaining_duplicate_id=#{lettings_log.id}")
+            expect(page).to have_link("Change", href: "/lettings-logs/#{duplicate_logs[1].id}/tenant-code?first_remaining_duplicate_id=#{lettings_log.id}&original_log_id=#{lettings_log.id}&referrer=duplicate_logs")
           end
 
           it "displays buttons to delete" do
@@ -122,9 +122,9 @@ RSpec.describe DuplicateLogsController, type: :request do
             expect(page).to have_content("Q25 - Buyer 1's working situation", count: 3)
             expect(page).to have_content("Q15 - Postcode", count: 3)
             expect(page).to have_link("Change", count: 18)
-            expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=duplicate_logs&remaining_duplicate_id=#{duplicate_logs[0].id}")
+            expect(page).to have_link("Change", href: "/sales-logs/#{sales_log.id}/purchaser-code?first_remaining_duplicate_id=#{duplicate_logs[0].id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs")
-            expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[0].id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=duplicate_logs&remaining_duplicate_id=#{sales_log.id}")
+            expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[0].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs")
-            expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[1].id}/purchaser-code?original_log_id=#{sales_log.id}&referrer=duplicate_logs&remaining_duplicate_id=#{sales_log.id}")
+            expect(page).to have_link("Change", href: "/sales-logs/#{duplicate_logs[1].id}/purchaser-code?first_remaining_duplicate_id=#{sales_log.id}&original_log_id=#{sales_log.id}&referrer=duplicate_logs")
           end
 
           it "displays buttons to delete" do

spec/requests/form_controller_spec.rb

@@ -736,7 +736,7 @@ RSpec.describe FormController, type: :request do
         context "when the question was accessed from a duplicate logs screen" do
           let(:lettings_log) { create(:lettings_log, :duplicate, created_by: user) }
           let(:duplicate_log) { create(:lettings_log, :duplicate, created_by: user) }
-          let(:referrer) { "/lettings-logs/#{lettings_log.id}/lead-tenant-age?referrer=duplicate_logs&remaining_duplicate_id=#{duplicate_log.id}&original_log_id=#{lettings_log.id}" }
+          let(:referrer) { "/lettings-logs/#{lettings_log.id}/lead-tenant-age?referrer=duplicate_logs&first_remaining_duplicate_id=#{duplicate_log.id}&original_log_id=#{lettings_log.id}" }
           let(:params) do
             {
               id: lettings_log.id,
@@ -777,7 +777,7 @@ RSpec.describe FormController, type: :request do
         context "when the sales question was accessed from a duplicate logs screen" do
           let(:sales_log) { create(:sales_log, :duplicate, created_by: user) }
           let(:duplicate_log) { create(:sales_log, :duplicate, created_by: user) }
-          let(:referrer) { "/sales-logs/#{sales_log.id}/buyer-1-age?referrer=duplicate_logs&remaining_duplicate_id=#{duplicate_log.id}&original_log_id=#{sales_log.id}" }
+          let(:referrer) { "/sales-logs/#{sales_log.id}/buyer-1-age?referrer=duplicate_logs&first_remaining_duplicate_id=#{duplicate_log.id}&original_log_id=#{sales_log.id}" }
           let(:params) do
             {
               id: sales_log.id,