Browse Source

feat: further refactor

pull/1675/head
natdeanlewissoftwire 3 years ago
parent
commit
975acc7f9d
  1. 1
      app/controllers/lettings_logs_controller.rb
  2. 1
      app/controllers/sales_logs_controller.rb
  3. 2
      app/helpers/filters_helper.rb
  4. 6
      app/services/filter_manager.rb

1
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

1
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

2
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)

6
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

Loading…
Cancel
Save