forest_admin_datasource_active_record 1.0.0.pre.beta.22 → 1.0.0.pre.beta.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c70063e15deac4061f339ad3c5bba3c57b7c4876ec06a302562d717e4b5206d
-  data.tar.gz: f2cc11652a6616cf11f88dfa55a7b1c08597f4f0cbdfb993f622b6ac9733362c
+  metadata.gz: e0e8066d5c92b8c29a1af80b8abf88f7f619eeb22c101a45aab964dd4b1c8d5c
+  data.tar.gz: bcdf8bbc3b7b45f0488317c56b9058b6becf7a1a93e7aa0f5609f7cbdf362ff0
 SHA512:
-  metadata.gz: 2fc56c8fa822a558ccd33cf8bb94736efa135381c0bf146756fbd228e6d752b340209afa25e0c04bd1ef331911edd3869858a89902b2919a6155b529920da778
-  data.tar.gz: 4517008faf5c70345836d1b0541c355b33a2c4d6076803106ece0d948b095b0af3ff094b615ff7c7c9ab75b21a6790d566387e182bdc550cee30b56e3b119557
+  metadata.gz: 6369edf2a171a44f5ae77474531cbe2d7943b1d12253e423dfc5353e01daacfa22a3f5870d5cc732624329f81c814115056be130c3b2a694bd7f11eaf7449eee
+  data.tar.gz: 8a91c54e1aecc09faa1dfe38dae73fb40849d73093ad46c99d0b74ea47008ca28a2053147367917a8931fd57364b659caa3f553900f52ffd9aa2569638ca4a89

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

@@ -12,6 +12,7 @@ module ForestAdminDatasourceActiveRecord
       super(datasource, name)
       fetch_fields
       fetch_associations
+      enable_count
     end
 
     def list(_caller, filter, projection)
@@ -20,15 +21,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/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}" }
+          @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
+            relation_schema = @collection.schema[:fields][relation]
+            @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))
@@ -105,8 +116,8 @@ module ForestAdminDatasourceActiveRecord
       def format_field(field)
         if field.include?(':')
           relation_name, field = field.split(':')
-          relation = @collection.fields[relation_name]
-          table_name = @collection.datasource.collection(relation.foreign_collection).model.table_name
+          relation = @collection.schema[:fields][relation_name]
+          table_name = @collection.datasource.get_collection(relation.foreign_collection).model.table_name
           add_join_relation(relation, relation_name)
           return "#{table_name}.#{field}"
         end

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.22"
+  VERSION = "1.0.0-beta.24"
 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.22
+  version: 1.0.0.pre.beta.24
 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-18 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