forest_admin_datasource_toolkit 1.0.0.pre.beta.34 → 1.0.0.pre.beta.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c86aa154dce215a6e9d6888f6a2d9b2856d7ae4820246c6528a7d1b337db685c
-  data.tar.gz: 357cd5a8f885251fd59fe70e8b3c082e6171ae4297ebcbc9c6ac6015fcea1c2e
+  metadata.gz: b62f0db9ae5e520370092144118bfd57891f74fbc27a9a7b213b12baa7d5b1da
+  data.tar.gz: 87741b3097fe5317d3e0e08135f95d976d8b683eae7ef2f5235f1823f9be4f2f
 SHA512:
-  metadata.gz: 7de219bdb22ae93487e9f96428d58e3820e8f8e1a7cc9bb9222b567c79060f05fbd2e8c170f45f3eb20a5bf2d04bac8f7dec07cd23ef025bfe6f8e18fbf515d9
-  data.tar.gz: 485077904b49e4c80db4ad277cf52f11c4ce08ffe340c279a7a8a3be597869ae84d414d58c7af7c39638d74635b4a8b7bf719f84994c7b2c680234abb8cc8bdb
+  metadata.gz: ce3f4cc50681b49eb8a71bb9d5f120807e80774f3dae950342d6b4ebf92b77cd69b27ecae93f844aa50272fcf8b0580e79f9c7a7e30c433557c8d47ef3d8305d
+  data.tar.gz: d340bd6fd4adfd07fd30508a6df78bc531df281b975c323dfbf98119210cb92425f46a20c001bf8c923497c69975edb9094ba5cd283b9ff64c1717bbcb9e489d

data/lib/forest_admin_datasource_toolkit/validations/condition_tree_validator.rb

@@ -0,0 +1,95 @@
+module ForestAdminDatasourceToolkit
+  module Validations
+    class ConditionTreeValidator
+      include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
+
+      def self.validate(condition_tree, collection)
+        if condition_tree.is_a?(Nodes::ConditionTreeBranch)
+          validate_branch(condition_tree, collection)
+        elsif condition_tree.is_a?(Nodes::ConditionTreeLeaf)
+          validate_leaf(condition_tree, collection)
+        else
+          raise Exceptions::ValidationError, 'Unexpected condition tree type'
+        end
+      end
+
+      def self.validate_branch(branch, collection)
+        unless %w[And Or].include?(branch.aggregator)
+          raise Exceptions::ValidationError,
+                "The given aggregator '#{branch.aggregator}' is not supported. The supported values are: ['Or', 'And']"
+        end
+
+        unless branch.conditions.is_a?(Array)
+          raise Exceptions::ValidationError,
+                "The given conditions '#{branch.conditions}' were expected to be an array"
+        end
+
+        branch.conditions.each { |condition| validate(condition, collection) }
+
+        nil
+      end
+
+      def self.validate_leaf(leaf, collection)
+        field_schema = Utils::Collection.get_field_schema(collection, leaf.field)
+
+        throw_if_operator_not_allowed_with_column(leaf, field_schema)
+        throw_if_value_not_allowed_with_operator(leaf, field_schema)
+        throw_if_operator_not_allowed_with_column_type(leaf, field_schema)
+        throw_if_value_not_allowed_with_column_type(leaf, field_schema)
+
+        nil
+      end
+
+      def self.throw_if_operator_not_allowed_with_column(leaf, column_schema)
+        operators = column_schema.filter_operators
+        return if operators.include?(leaf.operator)
+
+        raise Exceptions::ValidationError,
+              "The given operator '#{leaf.operator}' is not supported by the column: '#{leaf.field}'." \
+              "#{operators.empty? ? " The allowed types are: #{operators.join(",")}" : " The column is not filterable"}"
+      end
+
+      def self.throw_if_value_not_allowed_with_operator(leaf, column_schema)
+        allowed_types = Rules.get_allowed_types_for_operator(leaf.operator)
+        validate_values(leaf.field, column_schema, leaf.value, allowed_types)
+      end
+
+      def self.throw_if_operator_not_allowed_with_column_type(leaf, column_schema)
+        allowed_operators = Rules.get_allowed_operators_for_column_type(column_schema.column_type)
+
+        return if allowed_operators.include?(leaf.operator)
+
+        raise Exceptions::ValidationError,
+              "The given operator '#{leaf.operator}' is not allowed with the columnType schema: " \
+              "'#{column_schema.column_type}'. The allowed types are: [#{allowed_operators.join(",")}]"
+      end
+
+      def self.throw_if_value_not_allowed_with_column_type(leaf, column_schema)
+        # exclude some cases where the value is not related to the columnType of the field
+        excluded_cases = [
+          Operators::SHORTER_THAN,
+          Operators::LONGER_THAN,
+          Operators::AFTER_X_HOURS_AGO,
+          Operators::BEFORE_X_HOURS_AGO,
+          Operators::PREVIOUS_X_DAYS,
+          Operators::PREVIOUS_X_DAYS_TO_DATE
+        ]
+
+        return if excluded_cases.include?(leaf.operator)
+
+        types = Rules.get_allowed_types_for_column_type(column_schema.column_type)
+        validate_values(leaf.field, column_schema, leaf.value, types)
+      end
+
+      def self.validate_values(field, column_schema, value, allowed_types)
+        if value.is_a?(Array)
+          value.each do |item|
+            FieldValidator.validate_value(field, column_schema, item, allowed_types)
+          end
+        else
+          FieldValidator.validate_value(field, column_schema, value, allowed_types)
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/validations/rules.rb

@@ -62,15 +62,11 @@ module ForestAdminDatasourceToolkit
             Operators::LESS_THAN,
             Operators::GREATER_THAN
           ],
-          PrimitiveType::JSON => [
-            Operators::BLANK,
-            Operators::MISSING,
-            Operators::PRESENT
-          ],
+          PrimitiveType::JSON => [*Rules::BASE_OPERATORS, *Rules::ARRAY_OPERATORS],
           PrimitiveType::DATEONLY => [*Rules::BASE_OPERATORS, *Rules::BASE_DATEONLY_OPERATORS],
           PrimitiveType::ENUM => [*Rules::BASE_OPERATORS, *Rules::ARRAY_OPERATORS],
           PrimitiveType::UUID => [*Rules::BASE_OPERATORS, *Rules::ARRAY_OPERATORS],
-          PrimitiveType::BOOLEAN => Rules::BASE_OPERATORS,
+          PrimitiveType::BOOLEAN => [*Rules::BASE_OPERATORS, *Rules::ARRAY_OPERATORS],
           PrimitiveType::POINT => Rules::BASE_OPERATORS
         }
 
@@ -95,7 +91,7 @@ module ForestAdminDatasourceToolkit
       end
 
       def self.compute_allowed_types_for_operators
-        get_allowed_operators_for_column_type.keys.reduce do |result, type|
+        get_allowed_operators_for_column_type.keys.each_with_object({}) do |type, result|
           allowed_operators = get_allowed_operators_for_column_type(type)
           allowed_operators.each do |operator|
             if result[operator]
@@ -104,8 +100,6 @@ module ForestAdminDatasourceToolkit
               result[operator] = [type]
             end
           end
-
-          result
         end
       end
 
@@ -134,7 +128,9 @@ module ForestAdminDatasourceToolkit
           Operators::PREVIOUS_X_DAYS_TO_DATE => ['Number'],
           Operators::PREVIOUS_X_DAYS => ['Number'],
           Operators::BEFORE_X_HOURS_AGO => ['Number'],
-          Operators::AFTER_X_HOURS_AGO => ['Number']
+          Operators::AFTER_X_HOURS_AGO => ['Number'],
+          Operators::LONGER_THAN => ['Number'],
+          Operators::SHORTER_THAN => ['Number']
         )
 
         operator ? merged[operator] : merged

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.0.0-beta.34"
+  VERSION = "1.0.0-beta.35"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.34
+  version: 1.0.0.pre.beta.35
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -103,6 +103,7 @@ files:
 - lib/forest_admin_datasource_toolkit/utils/record.rb
 - lib/forest_admin_datasource_toolkit/utils/schema.rb
 - lib/forest_admin_datasource_toolkit/validations/chart_validator.rb
+- lib/forest_admin_datasource_toolkit/validations/condition_tree_validator.rb
 - lib/forest_admin_datasource_toolkit/validations/field_validator.rb
 - lib/forest_admin_datasource_toolkit/validations/projection_validator.rb
 - lib/forest_admin_datasource_toolkit/validations/rules.rb