forest_admin_datasource_active_record 1.0.0.pre.beta.21 → 1.0.0.pre.beta.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aace6865ce55eb722690ad3a410c31144c81a2ac7aa3f9db0d5dcb7d706e4544
-  data.tar.gz: 1ced7531287ce44c3d834875980471ccfaab5a7f2ea401ab84405f9547da96c8
+  metadata.gz: 51b8d4407b45292ae0e56ff578709bec39e08d678e6b47a1fbc24d719f2f63f3
+  data.tar.gz: d56d1f01095082675496cab77136c0ff076f1159d2f8399494d9ce168e361337
 SHA512:
-  metadata.gz: 9c6f07ba223bcbe79dac1bd5ab787378e4b68e9e0bc75576e67cc91d7d5f7de6cac8b2d60c94d66716b7140a93c8d5b19206336e0fa6efae8d419b93a07f0565
-  data.tar.gz: fd9d4172f74352ff3226513a2bc7b59f04f26b10ba04948c6d5ee87f8cc73e9f14575fe657cb36ea1892a2d5239c893cb7e7d7fc86a5683b81c0edd959d691ca
+  metadata.gz: ea8ce626732ebaad40be56a418e45367c7c51093ad19059b2c5f24ca9a0d36f8879b4a998b07f41e903c8e2491ba2d42d2cfd0998cae9a1bf24bc31c8b8fd762
+  data.tar.gz: dbb0fac6f26019beb6802c0f254e6b919ad08e7e8bbb0026aaca500c22ca92f1bd0101ab2da33d0b37315f155c6ede874f6fb420ec8f684aa936bf53bfa64e85

data/forest_admin_datasource_active_record.gemspec

@@ -33,5 +33,6 @@ admin work on any Ruby application."
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activerecord", ">= 6.1"
+  spec.add_dependency "activesupport", ">= 6.1"
   spec.add_dependency "zeitwerk", "~> 2.3"
 end

data/lib/forest_admin_datasource_active_record/collection.rb

@@ -20,15 +20,8 @@ module ForestAdminDatasourceActiveRecord
       query.all
     end
 
-    def aggregate(_caller, _filter, aggregation, _limit = nil)
-      field = aggregation.field || '*'
-
-      [
-        {
-          value: @model.send(aggregation.operation.downcase, field),
-          group: []
-        }
-      ]
+    def aggregate(_caller, filter, aggregation, limit = nil)
+      Utils::QueryAggregate.new(self, aggregation, filter, limit).get
     end
 
     def create(_caller, data)

data/lib/forest_admin_datasource_active_record/parser/column.rb

@@ -27,7 +27,7 @@ module ForestAdminDatasourceActiveRecord
           return 'Enum'
         end
 
-        is_array = (column.respond_to?(:array) && column.array == true)
+        is_array = column.respond_to?(:array) && column.array == true
         is_array ? "[#{TYPES[column.type]}]" : TYPES[column.type]
       end
 
@@ -37,7 +37,7 @@ module ForestAdminDatasourceActiveRecord
           if sti_column?(model, column)
             model.descendants.each { |sti_model| enum_values << sti_model.name }
           else
-            model.defined_enums[column.name].each { |name, _value| enum_values << name }
+            model.defined_enums[column.name].each_key { |name| enum_values << name }
           end
         end
         enum_values

data/lib/forest_admin_datasource_active_record/utils/query.rb

@@ -9,13 +9,13 @@ module ForestAdminDatasourceActiveRecord
         @projection = projection
         @filter = filter
         @arel_table = @collection.model.arel_table
+        @select = []
       end
 
       def build
-        @query = select
-        @query = apply_filter
-
-        @query
+        build_select
+        apply_filter
+        apply_select
       end
 
       def apply_filter
@@ -71,19 +71,30 @@ module ForestAdminDatasourceActiveRecord
         @query
       end
 
-      def select
+      def build_select
         unless @projection.nil?
-          query_select = @projection.columns.map { |field| "#{@collection.model.table_name}.#{field}" }
-          @projection.relations.each do |relation, _fields|
+          @select += @projection.columns.map { |field| "#{@collection.model.table_name}.#{field}" }
+          @projection.relations.each_key do |relation|
             relation_schema = @collection.fields[relation]
-            if relation_schema.type == 'OneToOne'
-              query_select.push("#{@collection.model.table_name}.#{relation_schema.origin_key_target}")
-            else
-              query_select.push("#{@collection.model.table_name}.#{relation_schema.foreign_key}")
-            end
+            @select << if relation_schema.type == 'OneToOne'
+                         "#{@collection.model.table_name}.#{relation_schema.origin_key_target}"
+                       else
+                         "#{@collection.model.table_name}.#{relation_schema.foreign_key}"
+                       end
           end
 
-          @query = @query.select(query_select.join(', '))
+          # @query = @query.select(query_select.join(', '))
+          # @query = @query.eager_load(@projection.relations.keys.map(&:to_sym))
+          # # TODO: replace eager_load by joins because eager_load select ALL columns of relation
+          # # @query = @query.joins(@projection.relations.keys.map(&:to_sym))
+        end
+
+        @query
+      end
+
+      def apply_select
+        unless @projection.nil?
+          @query = @query.select(@select.join(', '))
           @query = @query.eager_load(@projection.relations.keys.map(&:to_sym))
           # TODO: replace eager_load by joins because eager_load select ALL columns of relation
           # @query = @query.joins(@projection.relations.keys.map(&:to_sym))

data/lib/forest_admin_datasource_active_record/utils/query_aggregate.rb

@@ -0,0 +1,49 @@
+module ForestAdminDatasourceActiveRecord
+  module Utils
+    class QueryAggregate < Query
+      include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
+      include ForestAdminDatasourceToolkit::Components::Query
+
+      def initialize(collection, aggregation, filter = nil, limit = nil)
+        super(collection, ForestAdminDatasourceToolkit::Components::Query::Projection.new, filter)
+        @aggregation = aggregation
+        @limit = limit
+        @operation = aggregation.operation.downcase
+        @field = aggregation.field.nil? ? '*' : format_field(aggregation.field)
+      end
+
+      def get
+        group_fields = []
+        @aggregation.groups.each do |group|
+          field = format_field(group[:field])
+          if group[:operation]
+            @select << "DATE_TRUNC('#{group[:operation].downcase}', #{field}) AS \"#{group[:field]}\""
+            group_fields << "DATE_TRUNC('#{group[:operation].downcase}', #{field})"
+          else
+            @select << "#{field} AS \"#{group[:field]}\""
+            group_fields << field
+          end
+        end
+
+        @select << "#{@operation}(#{@field}) AS #{@operation}"
+        @query = @query.order("#{@operation} DESC")
+        @query = @query.limit(@limit) if @limit
+        @query = @query.group(group_fields.join(','))
+        build
+
+        compute_result_aggregate(@query)
+      end
+
+      def compute_result_aggregate(rows)
+        rows.map do |row|
+          {
+            value: row.send(@operation.to_sym),
+            group: @aggregation.groups.each_with_object({}) do |group, memo|
+              memo[group[:field]] = row.send(group[:field].to_sym)
+            end
+          }
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.0.0-beta.21"
+  VERSION = "1.0.0-beta.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.21
+  version: 1.0.0.pre.beta.23
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2023-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +74,7 @@ files:
 - lib/forest_admin_datasource_active_record/parser/relation.rb
 - lib/forest_admin_datasource_active_record/parser/validation.rb
 - lib/forest_admin_datasource_active_record/utils/query.rb
+- lib/forest_admin_datasource_active_record/utils/query_aggregate.rb
 - lib/forest_admin_datasource_active_record/version.rb
 - sig/forest_admin_datasource_active_record.rbs
 - sig/forest_admin_datasource_active_record/collection.rbs