Merge pull request #22 from performant-software/feature/udf21_table_f…

…ilter UDF #21 - Table filter
performant-software · Oct 6, 2022 · 8e3a6ef · 8e3a6ef
2 parents 0cfd2bf + 76b5f8b
commit 8e3a6ef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/controllers/user_defined_fields/user_defined_fields_controller.rb b/app/controllers/user_defined_fields/user_defined_fields_controller.rb
@@ -9,6 +9,8 @@ def apply_filters(query)
 
       query = filter_defineable(query)
 
+      query = filter_table(query)
+
       query
     end
 
@@ -19,5 +21,11 @@ def filter_defineable(query)
 
       query.where(defineable_id: params[:defineable_id], defineable_type: params[:defineable_type])
     end
+
+    def filter_table(query)
+      return query unless params[:table_name].present?
+
+      query.where(table_name: params[:table_name])
+    end
   end
 end
diff --git a/app/models/concerns/user_defined_fields/fieldable.rb b/app/models/concerns/user_defined_fields/fieldable.rb
@@ -27,9 +27,10 @@ def where_fieldable(name, value)
       private
 
       def validate_user_defined_fields
-        defineable = self.class.resolve_defineable&.call(self)
+        query = UserDefinedField
+                  .where(table_name: self.class.to_s)
 
-        query = UserDefinedField.all
+        defineable = self.class.resolve_defineable&.call(self)
 
         if defineable
           query = query.where(