forest_admin_datasource_toolkit 1.0.0.pre.beta.22 → 1.0.0.pre.beta.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcd6677ce3f931b19f6b5e575c3235c724e8d23022ad43b768c11429cb59f537
-  data.tar.gz: 89acacaa778c611cc3bccda72f2757bd738bee2a446381bdc6c33e7e037135f7
+  metadata.gz: 786b58c3bc21c7187d7a95025aae6229de6c04bac42549cede55f060be797d86
+  data.tar.gz: 477ffdc3ed1eba5e5240e641741f9f7cbd311373e35594438ccc452584a75830
 SHA512:
-  metadata.gz: d8453ea97a82fd1c8b329a48c102cd355eaf34488103e60baa4682dce03a648f0a8aea55497ec3b3484acfc1b7ce66c20e9f06d7bcc12dd9f614c03742ff136c
-  data.tar.gz: 374f7e949ad419ab3fb9f2928031e0c9257f8a8d1258652b829c36acadeba5da8cc81e2e6d2e6f2430ffe221550999d2e2a67f8bff460adcd08ae43d826b0342
+  metadata.gz: 46282da2e6d7221c853d234d382a3712a4fcb0e0340c06f93ba97f2a9ca26967a0adc0e153e6b904dfe39c4aaadcb31ffe0a3731ae6a097e3520120dbdaa0e16
+  data.tar.gz: 52c33562da9679ea958fec285158dc6c12f5fb7ff9a3076f2724951bae500e99debb10925a562add7daeab4d749102494b46c6a33eaaaee22e54c5fb4c861984

data/lib/forest_admin_datasource_toolkit/components/charts/chart.rb

@@ -0,0 +1,11 @@
+module ForestAdminDatasourceToolkit
+  module Components
+    module Charts
+      class Chart
+        def serialize
+          raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/components/charts/leaderboard_chart.rb

@@ -0,0 +1,24 @@
+module ForestAdminDatasourceToolkit
+  module Components
+    module Charts
+      class LeaderboardChart
+        include ForestAdminDatasourceToolkit::Validations
+
+        attr_reader :data
+
+        def initialize(data)
+          super()
+          @data = data
+        end
+
+        def serialize
+          data.each do |item|
+            ChartValidator.validate?(!item.key?(:key) || !item.key?(:value), item, "'key', 'value'")
+          end
+
+          data
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/components/charts/line_chart.rb

@@ -0,0 +1,24 @@
+module ForestAdminDatasourceToolkit
+  module Components
+    module Charts
+      class LineChart
+        include ForestAdminDatasourceToolkit::Validations
+
+        attr_reader :data
+
+        def initialize(data)
+          super()
+          @data = data
+        end
+
+        def serialize
+          data.each do |item|
+            ChartValidator.validate?(!item.key?(:label) || !item.key?(:values), item, "'label', 'values'")
+          end
+
+          data
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/components/charts/objective_chart.rb

@@ -0,0 +1,22 @@
+module ForestAdminDatasourceToolkit
+  module Components
+    module Charts
+      class ObjectiveChart
+        attr_reader :value, :objective
+
+        def initialize(value, objective = nil)
+          super()
+          @value = value
+          @objective = objective
+        end
+
+        def serialize
+          result = { value: value }
+          result[:objective] = objective if objective
+
+          result
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/components/charts/percentage_chart.rb

@@ -0,0 +1,18 @@
+module ForestAdminDatasourceToolkit
+  module Components
+    module Charts
+      class PercentageChart
+        attr_reader :value
+
+        def initialize(value)
+          super()
+          @value = value
+        end
+
+        def serialize
+          value
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/components/charts/pie_chart.rb

@@ -0,0 +1,24 @@
+module ForestAdminDatasourceToolkit
+  module Components
+    module Charts
+      class PieChart
+        include ForestAdminDatasourceToolkit::Validations
+
+        attr_reader :data
+
+        def initialize(data)
+          super()
+          @data = data
+        end
+
+        def serialize
+          data.each do |item|
+            ChartValidator.validate?(!item.key?(:key) || !item.key?(:value), item, "'key', 'value'")
+          end
+
+          data
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/components/charts/smart_chart.rb

@@ -0,0 +1,18 @@
+module ForestAdminDatasourceToolkit
+  module Components
+    module Charts
+      class SmartChart
+        attr_reader :data
+
+        def initialize(data)
+          super()
+          @data = data
+        end
+
+        def serialize
+          data
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/components/charts/value_chart.rb

@@ -0,0 +1,19 @@
+module ForestAdminDatasourceToolkit
+  module Components
+    module Charts
+      class ValueChart
+        attr_reader :value, :previous_value
+
+        def initialize(value, previous_value = nil)
+          super()
+          @value = value
+          @previous_value = previous_value
+        end
+
+        def serialize
+          { countCurrent: value, countPrevious: previous_value }
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/components/query/aggregation.rb

@@ -1,3 +1,6 @@
+require 'active_support/all'
+require 'active_support/core_ext/numeric/time'
+
 module ForestAdminDatasourceToolkit
   module Components
     module Query
@@ -17,6 +20,171 @@ module ForestAdminDatasourceToolkit
 
           raise ForestException, "Aggregate operation #{operation} not allowed"
         end
+
+        def projection
+          aggregate_fields = []
+          aggregate_fields << field if field
+
+          groups.each do |group|
+            aggregate_fields << group[:field]
+          end
+
+          Projection.new(aggregate_fields)
+        end
+
+        def replace_fields(handler)
+          result = clone
+          result.field = handler.call(result.field) if result.field
+          result.groups = result.groups.map do |group|
+            {
+              field: handler.call(group[:field]),
+              operation: group[:operation] || nil
+            }
+          end
+          result
+        end
+
+        def override(**args)
+          Aggregation.new(**to_h.merge(args))
+        end
+
+        def apply(records, timezone, limit = nil)
+          rows = format_summaries(create_summaries(records, timezone))
+          rows.sort do |r1, r2|
+            if r1[:value] == r2[:value]
+              0
+            else
+              r1[:value] < r2[:value] ? 1 : -1
+            end
+          end
+
+          rows = rows[0..limit - 1] if limit && rows.size > limit
+
+          rows
+        end
+
+        def nest(prefix = nil)
+          return self unless prefix
+
+          nested_field = nil
+          nested_groups = []
+          nested_field = "#{prefix}:#{field}" if field
+
+          if groups.size.positive?
+            nested_groups = groups.map do |item|
+              {
+                field: "#{prefix}:#{item[:field]}",
+                operation: item[:operation]
+              }
+            end
+          end
+
+          self.class.new(operation: operation, field: nested_field, groups: nested_groups)
+        end
+
+        def to_h
+          {
+            operation: operation,
+            field: field,
+            groups: groups
+          }
+        end
+
+        private
+
+        def create_summaries(records, timezone)
+          grouping_map = {}
+
+          records.each do |record|
+            group = create_group(record, timezone)
+            unique_key = Digest::SHA1.hexdigest(group.to_json)
+            summary = grouping_map[unique_key] || create_summary(group)
+
+            update_summary_in_place(summary, record)
+
+            grouping_map[unique_key] = summary
+          end
+
+          grouping_map.values
+        end
+
+        def format_summaries(summaries)
+          if operation == 'Avg'
+            summaries
+              .select { |summary| (summary['Count']).positive? }
+              .map do |summary|
+              {
+                group: summary['group'],
+                value: summary['Sum'] / summary['Count']
+              }
+            end
+          else
+            summaries.map do |summary|
+              {
+                group: summary['group'],
+                value: operation == 'Count' && !field ? summary['starCount'] : summary[operation]
+              }
+            end
+          end
+        end
+
+        def create_group(record, timezone)
+          group = {}
+
+          groups.each do |value|
+            group_value = record[value[:field]]
+            group[value[:field]] = apply_date_operation(group_value, value[:operation], timezone)
+          end
+
+          group
+        end
+
+        def apply_date_operation(value, operation, timezone)
+          return value unless operation
+
+          case operation
+          when 'Year'
+            DateTime.parse(value).in_time_zone(timezone).strftime('%Y-01-01')
+          when 'Month'
+            DateTime.parse(value).in_time_zone(timezone).strftime('%Y-%m-01')
+          when 'Day'
+            DateTime.parse(value).in_time_zone(timezone).strftime('%Y-%m-%d')
+          when 'Week'
+            DateTime.parse(value).in_time_zone(timezone).beginning_of_month.strftime('%Y-%m-%d')
+          else
+            value
+          end
+        end
+
+        def create_summary(group)
+          {
+            'group' => group,
+            'starCount' => 0,
+            'Count' => 0,
+            'Sum' => 0,
+            'Min' => nil,
+            'Max' => nil
+          }
+        end
+
+        def update_summary_in_place(summary, record)
+          summary['starCount'] += 1
+
+          return unless field
+
+          value = ForestAdminDatasourceToolkit::Utils::Record.field_value(record, field)
+
+          if value
+            min = summary['Min']
+            max = summary['Max']
+
+            summary['Count'] += 1
+            summary['Min'] = value if min.nil? || value < min
+            summary['Max'] = value if max.nil? || value < max
+          end
+
+          summary['Sum'] += value if value.is_a?(Numeric)
+        end
       end
     end
   end

data/lib/forest_admin_datasource_toolkit/components/query/condition_tree/condition_tree_equivalent.rb

@@ -41,18 +41,18 @@ module ForestAdminDatasourceToolkit
                 depends_on = alt[:depends_on]
                 valid = alt[:for_types].nil? || alt[:for_types].include?(column_type)
 
-                if valid && !visited.include?(alt)
-                  depends_replacers = depends_on.map do |replacement|
-                    get_replacer(replacement, filter_operators, column_type, visited + [alt])
-                  end
+                next unless valid && !visited.include?(alt)
 
-                  if depends_replacers.all? { |r| !r.nil? }
-                    return lambda { |leaf, timezone|
-                      replacer.call(leaf).replace_leafs do |sub_leaf|
-                        depends_replacers[depends_on.index(sub_leaf.operator)].call(sub_leaf, timezone)
-                      end
-                    }
-                  end
+                depends_replacers = depends_on.map do |replacement|
+                  get_replacer(replacement, filter_operators, column_type, visited + [alt])
+                end
+
+                if depends_replacers.all? { |r| !r.nil? }
+                  return lambda { |leaf, timezone|
+                    replacer.call(leaf).replace_leafs do |sub_leaf|
+                      depends_replacers[depends_on.index(sub_leaf.operator)].call(sub_leaf, timezone)
+                    end
+                  }
                 end
               end
 

data/lib/forest_admin_datasource_toolkit/utils/collection.rb

@@ -106,6 +106,23 @@ module ForestAdminDatasourceToolkit
         nil
       end
 
+      def self.get_through_origin(collection, relation_name)
+        relation = collection.fields[relation_name]
+        raise ForestException, 'Relation must be many to many' unless relation.is_a?(ManyToManySchema)
+
+        through_collection = collection.datasource.collection(relation.through_collection)
+        through_collection.fields.select do |field_name, field|
+          if field.is_a?(ManyToOneSchema) &&
+             field.foreign_collection == collection.name &&
+             field.foreign_key == relation.origin_key &&
+             field.foreign_key_target == relation.origin_key_target
+            return field_name
+          end
+        end
+
+        nil
+      end
+
       def self.list_relation(collection, id, relation_name, caller, foreign_filter, projection)
         relation = collection.fields[relation_name]
         foreign_collection = collection.datasource.collection(relation.foreign_collection)

data/lib/forest_admin_datasource_toolkit/validations/chart_validator.rb

@@ -0,0 +1,15 @@
+module ForestAdminDatasourceToolkit
+  module Validations
+    class ChartValidator
+      def self.validate?(condition, result, key_names)
+        if condition
+          result_keys = result.keys.join(',')
+          raise ForestAdminDatasourceToolkit::Exceptions::ForestException,
+                "The result columns must be named '#{key_names}' instead of '#{result_keys}'"
+        end
+
+        true
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceToolkit
-  VERSION = "1.0.0-beta.22"
+  VERSION = "1.0.0-beta.23"
 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.22
+  version: 1.0.0.pre.beta.23
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2023-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,6 +56,14 @@ files:
 - lib/forest_admin_datasource_toolkit.rb
 - lib/forest_admin_datasource_toolkit/collection.rb
 - lib/forest_admin_datasource_toolkit/components/caller.rb
+- lib/forest_admin_datasource_toolkit/components/charts/chart.rb
+- lib/forest_admin_datasource_toolkit/components/charts/leaderboard_chart.rb
+- lib/forest_admin_datasource_toolkit/components/charts/line_chart.rb
+- lib/forest_admin_datasource_toolkit/components/charts/objective_chart.rb
+- lib/forest_admin_datasource_toolkit/components/charts/percentage_chart.rb
+- lib/forest_admin_datasource_toolkit/components/charts/pie_chart.rb
+- lib/forest_admin_datasource_toolkit/components/charts/smart_chart.rb
+- lib/forest_admin_datasource_toolkit/components/charts/value_chart.rb
 - lib/forest_admin_datasource_toolkit/components/contracts/collection_contract.rb
 - lib/forest_admin_datasource_toolkit/components/contracts/datasource_contract.rb
 - lib/forest_admin_datasource_toolkit/components/query/aggregation.rb
@@ -85,6 +93,7 @@ files:
 - lib/forest_admin_datasource_toolkit/utils/collection.rb
 - 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/version.rb
 - sig/forest_admin_datasource_toolkit.rbs
 - sig/forest_admin_datasource_toolkit/collection.rbs