From b99a40ac5827cdb0bb6bae8a2782d129cfb2ee2b Mon Sep 17 00:00:00 2001
From: Kat <kosiak.katrina@gmail.com>
Date: Tue, 13 Sep 2022 15:30:29 +0100
Subject: [PATCH] update sales logs controller

---
 app/controllers/organisations_controller.rb |  2 +-
 app/controllers/sales_logs_controller.rb    | 16 +++++++---------
 spec/requests/sales_logs_controller_spec.rb |  4 ----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb
index 4fbbe8c3b..7bd238686 100644
--- a/app/controllers/organisations_controller.rb
+++ b/app/controllers/organisations_controller.rb
@@ -139,7 +139,7 @@ class OrganisationsController < ApplicationController
     end
   end
 
-  private
+private
 
   def org_params
     params.require(:organisation).permit(:name, :address_line1, :address_line2, :postcode, :phone, :holds_own_stock, :provider_type, :housing_registration_no)
diff --git a/app/controllers/sales_logs_controller.rb b/app/controllers/sales_logs_controller.rb
index 77501e168..8a6c9937f 100644
--- a/app/controllers/sales_logs_controller.rb
+++ b/app/controllers/sales_logs_controller.rb
@@ -1,25 +1,23 @@
 class SalesLogsController < LogsController
+  before_action :session_filters, if: :current_user
+  before_action :set_session_filters, if: :current_user
+
   def create
     super { SalesLog.new(log_params) }
   end
 
   def index
-    set_session_filters
-
-    all_logs = current_user.sales_logs
-    unpaginated_filtered_logs = filtered_logs(filtered_collection(all_logs, search_term))
-
     respond_to do |format|
       format.html do
+        all_logs = current_user.sales_logs
+        unpaginated_filtered_logs = filtered_logs(all_logs, search_term, @session_filters)
+
+        @search_term = search_term
         @pagy, @logs = pagy(unpaginated_filtered_logs)
         @searched = search_term.presence
         @total_count = all_logs.size
         render "logs/index"
       end
-
-      format.csv do
-        send_data byte_order_mark + unpaginated_filtered_logs.to_csv(current_user), filename: "logs-#{Time.zone.now}.csv"
-      end
     end
   end
 
diff --git a/spec/requests/sales_logs_controller_spec.rb b/spec/requests/sales_logs_controller_spec.rb
index 10de433fa..f4299d380 100644
--- a/spec/requests/sales_logs_controller_spec.rb
+++ b/spec/requests/sales_logs_controller_spec.rb
@@ -355,10 +355,6 @@ RSpec.describe SalesLogsController, type: :request do
             expect(page).to have_title("Logs - Submit social housing lettings and sales data (CORE) - GOV.UK")
           end
 
-          it "shows the download csv link" do
-            expect(page).to have_link("Download (CSV)", href: "/sales-logs.csv")
-          end
-
           it "does not show the organisation filter" do
             expect(page).not_to have_field("organisation-field")
           end