From 975acc7f9d123455c5e7b45bf2d5c057876fe425 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Tue, 6 Jun 2023 11:12:34 +0100 Subject: [PATCH] feat: further refactor --- app/controllers/lettings_logs_controller.rb | 1 - app/controllers/sales_logs_controller.rb | 1 - app/helpers/filters_helper.rb | 2 +- app/services/filter_manager.rb | 6 +++--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/lettings_logs_controller.rb b/app/controllers/lettings_logs_controller.rb index 81ff7777e..eb1caa47c 100644 --- a/app/controllers/lettings_logs_controller.rb +++ b/app/controllers/lettings_logs_controller.rb @@ -139,7 +139,6 @@ private end def extract_bulk_upload_from_session_filters - filter_manager = FilterManager.new(current_user:, session:, params:, filter_type: "lettings_logs") @bulk_upload = filter_manager.bulk_upload end diff --git a/app/controllers/sales_logs_controller.rb b/app/controllers/sales_logs_controller.rb index 23bffadf6..27f3d4f05 100644 --- a/app/controllers/sales_logs_controller.rb +++ b/app/controllers/sales_logs_controller.rb @@ -90,7 +90,6 @@ private end def extract_bulk_upload_from_session_filters - filter_manager = FilterManager.new(current_user:, session:, params:, filter_type: "lettings_logs") @bulk_upload = filter_manager.bulk_upload end diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb index a5eecf370..51472b299 100644 --- a/app/helpers/filters_helper.rb +++ b/app/helpers/filters_helper.rb @@ -22,7 +22,7 @@ module FiltersHelper def selected_option(filter, filter_type) return false unless session[session_name_for(filter_type)] - JSON.parse(session[[session_name_for(filter_type)]])[filter] || "" + JSON.parse(session[session_name_for(filter_type)])[filter] || "" end def organisations_filter_options(user) diff --git a/app/services/filter_manager.rb b/app/services/filter_manager.rb index af54a7f02..39cd7cdd3 100644 --- a/app/services/filter_manager.rb +++ b/app/services/filter_manager.rb @@ -8,7 +8,7 @@ class FilterManager @filter_type = filter_type end - def filter_by_search(base_collection, search_term = nil) + def self.filter_by_search(base_collection, search_term = nil) if search_term.present? base_collection.search_by(search_term) else @@ -16,7 +16,7 @@ class FilterManager end end - def filter_logs(logs, search_term, filters, all_orgs, user) + def self.filter_logs(logs, search_term, filters, all_orgs, user) logs = filter_by_search(logs, search_term) filters.each do |category, values| @@ -58,7 +58,7 @@ class FilterManager def filtered_logs(logs, search_term, filters) all_orgs = params["organisation_select"] == "all" - filter_logs(logs, search_term, filters, all_orgs, current_user) + FilterManager.filter_logs(logs, search_term, filters, all_orgs, current_user) end def bulk_upload