forest_admin_agent 1.12.6 → 1.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e3a7d9a9147c1fd3b2f7113515f86c4a63628907e466414284550a6254dff2f
-  data.tar.gz: e9c07eaa78c87c79b4322e3fe630f664d482823ac3397a839e7531c614087c26
+  metadata.gz: fd573234b76fd50731dee629e11f0f4aaf920752620bfd8578691f8c33cefc79
+  data.tar.gz: 4df7f0a817d9ed945e45f9298258d98e7da2ebd2931776c89f0716812490209c
 SHA512:
-  metadata.gz: b0776a9251a03139b63a12e71c8133c33b2745312be0459c2a25b50a4eeed2b0fbcea5fac11aaf620ef63a05d352082a8a4c19c3b03eb63ecf6ad6c2dafec2d5
-  data.tar.gz: fcc5c5a105a2c7cbdc2d6f01090127610b8b523e5821d456af686dc6f3bf217e4d0fe1686fcea98948def0771519034e734dd75b19f5ab5486a1ed486d18644f
+  metadata.gz: f7a71681bef6e70366de3ccc34482f924a9a45199d724705d46ebdb60371be315775196e57084d97e2e41513c20d57a60945cf1d8938eba5cadd856c5de8f3ff
+  data.tar.gz: c58258f27f3725e02c2d02ced97f322b9289b36ddb82777116d78235ec5a380662491c0f859167da7db3b18461519ef8caa5bc61308038b776bb7b72b830c4d0

data/lib/forest_admin_agent/utils/condition_tree_parser.rb

@@ -12,7 +12,7 @@ module ForestAdminAgent
       def self.from_plain_object(collection, filters)
         if leaf?(filters)
           operator = filters[:operator].titleize.tr(' ', '_').downcase
-          value = parse_value(collection, filters)
+          value = parse_value(collection, filters.merge(operator: operator))
 
           return ConditionTreeLeaf.new(filters[:field], operator, value)
         end
@@ -31,18 +31,52 @@ module ForestAdminAgent
 
       def self.parse_value(collection, leaf)
         schema = Collection.get_field_schema(collection, leaf[:field])
+        expected_type = get_expected_type_for_condition(leaf, schema)
 
-        if leaf[:operator] == Operators::IN && leaf[:field].is_a?(String)
-          values = leaf[:value].split(',').map(&:strip)
+        cast_to_type(leaf[:value], expected_type)
+      end
 
-          return values.map { |item| !%w[false 0 no].include?(item) } if schema.column_type == 'Boolean'
+      def self.get_expected_type_for_condition(leaf, schema)
+        operators_expecting_number = [
+          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 values.map(&:to_f).select { |item| item.is_a? Numeric } if schema.column_type == 'Number'
+        return 'Number' if operators_expecting_number.include?(leaf[:operator])
 
-          return values
+        if [Operators::IN, Operators::NOT_IN, Operators::INCLUDES_ALL].include?(leaf[:operator])
+          return [schema.column_type]
         end
 
-        leaf[:value]
+        schema.column_type
+      end
+
+      def self.cast_to_type(value, expected_type)
+        return value if value.nil?
+
+        if expected_type.is_a?(Array)
+          items = value.is_a?(String) ? value.split(',').map(&:strip) : value
+          filter_fn = expected_type[0] == 'Number' ? ->(item) { item.is_a?(Numeric) } : ->(_) { true }
+
+          return value unless items.is_a?(Array)
+
+          return items.map { |item| cast_to_type(item, expected_type[0]) }.select(&filter_fn)
+        end
+
+        case expected_type
+        when 'String', 'Dateonly', 'Date'
+          value.to_s
+        when 'Number'
+          value.to_f
+        when 'Boolean'
+          !%w[false 0 no].include?(value.to_s)
+        else
+          value
+        end
       end
 
       def self.leaf?(filters)

data/lib/forest_admin_agent/utils/schema/schema_emitter.rb

@@ -6,7 +6,7 @@ module ForestAdminAgent
     module Schema
       class SchemaEmitter
         LIANA_NAME = "agent-ruby"
-        LIANA_VERSION = "1.12.6"
+        LIANA_VERSION = "1.12.7"
 
         def self.generate(datasource)
           datasource.collections

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.12.6"
+  VERSION = "1.12.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_agent
 version: !ruby/object:Gem::Version
-  version: 1.12.6
+  version: 1.12.7
 platform: ruby
 authors:
 - Matthieu