refactor: type -> filter_type

app/helpers/filters_helper.rb

@@ -1,8 +1,8 @@
 module FiltersHelper
-  def filter_selected?(filter, value, type)
+  def filter_selected?(filter, value, filter_type)
-    return false unless session["#{type}_filters"]
+    return false unless session["#{filter_type}_filters"]
 
-    selected_filters = JSON.parse(session["#{type}_filters"])
+    selected_filters = JSON.parse(session["#{filter_type}_filters"])
     return true if selected_filters.blank? && filter == "user" && value == :all
     return true if !selected_filters.key?("organisation") && filter == "organisation_select" && value == :all
     return true if selected_filters["organisation"].present? && filter == "organisation_select" && value == :specific_org
@@ -19,10 +19,10 @@ module FiltersHelper
     }.freeze
   end
 
-  def selected_option(filter, type)
+  def selected_option(filter, filter_type)
-    return false unless session["#{type}_filters"]
+    return false unless session["#{filter_type}_filters"]
 
-    JSON.parse(session["#{type}_filters"])[filter] || ""
+    JSON.parse(session["#{filter_type}_filters"])[filter] || ""
   end
 
   def organisations_filter_options(user)

app/services/filter_service.rb

@@ -35,14 +35,14 @@ class FilterService
     @session = session
   end
 
-  def bulk_upload(type)
+  def bulk_upload(filter_type)
-    id = (logs_filters(type)["bulk_upload_id"] || []).reject(&:blank?)[0]
+    id = (logs_filters(filter_type)["bulk_upload_id"] || []).reject(&:blank?)[0]
     @bulk_upload ||= current_user.bulk_uploads.find_by(id:)
   end
 
 private
 
-  def logs_filters(type)
+  def logs_filters(filter_type)
-    JSON.parse(session["#{type}_filters"] || "{}") || {}
+    JSON.parse(session["#{filter_type}_filters"] || "{}") || {}
   end
 end