Merge branch 'master' into attribute-searching

app/logical/concerns/searchable.rb

@@ -163,7 +163,10 @@ module Searchable
     type = column.type || reflect_on_association(name)&.class_name
 
     if column.try(:array?)
-      return search_array_attribute(name, type, params)
+      subtype = type
+      type = :array
+    elsif defined_enums.has_key?(name.to_s)
+      type = :enum
     end
 
     case type
@@ -181,6 +184,10 @@ module Searchable
       numeric_attribute_matches(name, params[name])
     when :inet
       search_inet_attribute(name, params)
+    when :enum
+      search_enum_attribute(name, params)
+    when :array
+      search_array_attribute(name, subtype, params)
     else
       raise NotImplementedError, "unhandled attribute type: #{name}" if type.blank?
       search_includes(name, params, type)
@@ -279,6 +286,19 @@ module Searchable
     relation
   end
 
+  def search_enum_attribute(name, params)
+    relation = all
+
+    if params[name].present?
+      value = params[name].split(/[, ]+/).map(&:downcase)
+      relation = relation.where(name => value)
+    elsif params["#{name}_id"].present?
+      relation = relation.numeric_attribute_matches(name, params["#{name}_id"])
+    end
+
+    relation
+  end
+
   def search_array_attribute(name, type, params)
     relation = all