refactoring

app/controllers/case_logs_controller.rb

@@ -13,9 +13,9 @@ class CaseLogsController < ApplicationController
 
     all_logs = current_user.case_logs
 
-    unpaginated_logs = filtered_case_logs(filtered_collection(all_logs, search_term))
+    unpaginated_filtered_logs = filtered_case_logs(filtered_collection(all_logs, search_term))
 
-    @pagy, @case_logs = pagy(unpaginated_logs)
+    @pagy, @case_logs = pagy(unpaginated_filtered_logs)
 
     @searched = search_term.presence
     @total_count = all_logs.size
@@ -23,7 +23,7 @@ class CaseLogsController < ApplicationController
     respond_to do |format|
       format.html
       format.csv do
-        send_data unpaginated_logs.to_csv, filename: "logs-#{Time.zone.now}.csv"
+        send_data unpaginated_filtered_logs.to_csv, filename: "logs-#{Time.zone.now}.csv"
       end
     end
   end

app/controllers/organisations_controller.rb

@@ -56,13 +56,10 @@ class OrganisationsController < ApplicationController
 
       organisation_logs = CaseLog.all.where(owning_organisation_id: @organisation.id)
 
-      @pagy, @case_logs = pagy(
-        filtered_case_logs(
-          filtered_collection(
-            organisation_logs, search_term
-          ),
-        ),
-      )
+      unpaginated_filtered_logs = filtered_case_logs(filtered_collection(organisation_logs, search_term))
+
+      @pagy, @case_logs = pagy(unpaginated_filtered_logs)
+
       @searched = search_term.presence
       @total_count = organisation_logs.size
 

spec/requests/case_logs_controller_spec.rb

@@ -761,20 +761,13 @@ RSpec.describe CaseLogsController, type: :request do
       end
 
       context "when both filter and search applied" do
+        let(:postcode) { "XX1 1TG" }
         let!(:case_log) do
-          FactoryBot.create(
-            :case_log,
-            :completed,
-            postcode_full: "XX1 1TG",
-            owning_organisation: organisation,
-          )
+          FactoryBot.create(:case_log, :completed, postcode_full: postcode, owning_organisation: organisation)
         end
 
         before do
-          FactoryBot.create(:case_log,
-                            :in_progress,
-                            postcode_full: case_log.postcode_full,
-                            owning_organisation: organisation)
+          FactoryBot.create(:case_log, :in_progress, postcode_full: postcode, owning_organisation: organisation)
         end
 
         it "dowloads logs matching both csv and filter logs" do