forest_admin_datasource_customizer 1.0.0.pre.beta.87 → 1.0.0.pre.beta.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 427568d30553834fb7bc1f0728505c6ba7f75e72e74e9640672d0c2217d1e573
-  data.tar.gz: 1561de136ccf71999933f3eb57c2b82424671999cb43a043b898e3fb426f750b
+  metadata.gz: d7e91993e1b735852ac34b459c724148edc5a3f2233f3bbb689740c1c8d2e5a4
+  data.tar.gz: 1791a150215a1a7f5f71337f9a7a6e8c98bd751e8a68a005dd1fee13002ab28c
 SHA512:
-  metadata.gz: f9c582e66908f4aeabfbdd1de5d40b0ef6b79286530567d6077c8784af802dc06dd390a7835a12c21328abc94bd1ea2b6a72a47e781a69d8805b57156a64b971
-  data.tar.gz: 2336895e724b81fa17e1f4c2c589d88b151c636c843daea2735148864edfe9f81a88dfa59709ebbe95998322ceab690b81dbaae111162c372c135791e5b32d5c
+  metadata.gz: 1582b606c627d2c3892f8f4ace39afa32cb213559a2f306296601000549c901a4cfeed752b38faf54efb60eca0d473bf5797b9d157630be72b3a41f0c6e1905e
+  data.tar.gz: c925fd3de6a66c317f0296059b16d77fbd22f3ea9462a3597bac0cb6b8df9f33917551ec48bdef1a1aad04122dc1a729c9845a300808e4db79d7869b4e4ec07f

data/lib/forest_admin_datasource_customizer/decorators/decorators_stack.rb

@@ -5,7 +5,7 @@ module ForestAdminDatasourceCustomizer
 
       attr_reader :datasource, :schema, :search, :early_computed, :late_computed, :action, :relation, :late_op_emulate,
                   :early_op_emulate, :validation, :sort, :rename_field, :publication, :write, :chart, :hook, :segment,
-                  :binary, :override
+                  :binary, :override, :lazy_join
 
       def initialize(datasource)
         @customizations = []
@@ -19,6 +19,8 @@ module ForestAdminDatasourceCustomizer
         last = @early_op_emulate = DatasourceDecorator.new(last, OperatorsEmulate::OperatorsEmulateCollectionDecorator)
         last = DatasourceDecorator.new(last, OperatorsEquivalence::OperatorsEquivalenceCollectionDecorator)
         last = @relation = DatasourceDecorator.new(last, Relation::RelationCollectionDecorator)
+        # lazy join is just before relation, to avoid relations to do useless stuff
+        last = @lazy_join = DatasourceDecorator.new(last, LazyJoin::LazyJoinCollectionDecorator)
         last = @late_computed = DatasourceDecorator.new(last, Computed::ComputeCollectionDecorator)
         last = @late_op_emulate = DatasourceDecorator.new(last, OperatorsEmulate::OperatorsEmulateCollectionDecorator)
         last = DatasourceDecorator.new(last, OperatorsEquivalence::OperatorsEquivalenceCollectionDecorator)

data/lib/forest_admin_datasource_customizer/decorators/lazy_join/lazy_join_collection_decorator.rb

@@ -0,0 +1,129 @@
+module ForestAdminDatasourceCustomizer
+  module Decorators
+    module LazyJoin
+      class LazyJoinCollectionDecorator < ForestAdminDatasourceToolkit::Decorators::CollectionDecorator
+        include ForestAdminDatasourceToolkit::Decorators
+        include ForestAdminDatasourceToolkit::Components::Query
+        include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
+
+        def list(caller, filter, projection)
+          simplified_projection = get_projection_without_useless_joins(projection)
+          refined_filter = refine_filter(caller, filter)
+          records = child_collection.list(caller, refined_filter, simplified_projection)
+
+          apply_joins_on_records(projection, simplified_projection, records)
+        end
+
+        def aggregate(caller, filter, aggregation, limit = nil)
+          refined_filter = refine_filter(caller, filter)
+          replaced = {}
+          refined_aggregation = aggregation.replace_fields do |field_name|
+            if useless_join?(field_name.split(':')[0], aggregation.projection)
+              new_field_name = get_foreign_key_for_projection(field_name)
+              replaced[new_field_name] = field_name
+
+              new_field_name
+            else
+              field_name
+            end
+          end
+
+          results = child_collection.aggregate(caller, refined_filter, refined_aggregation, limit)
+
+          apply_joins_on_aggregate_result(aggregation, refined_aggregation, results, replaced)
+        end
+
+        def refine_filter(_caller, filter = nil)
+          filter&.override(
+            condition_tree: filter.condition_tree&.replace_leafs do |leaf|
+              if useless_join?(leaf.field.split(':')[0], filter.condition_tree.projection)
+                leaf.override(field: get_foreign_key_for_projection(leaf.field))
+              else
+                leaf
+              end
+            end
+          )
+        end
+
+        private
+
+        def get_foreign_key_for_projection(field_name)
+          relation_name = field_name.split(':')[0]
+          relation_schema = schema[:fields][relation_name]
+
+          relation_schema.foreign_key
+        end
+
+        def useless_join?(relation_name, projection)
+          relation_schema = schema[:fields][relation_name]
+          sub_projection = projection.relations[relation_name]
+
+          relation_schema.type == 'ManyToOne' &&
+            sub_projection.size == 1 &&
+            sub_projection[0] == relation_schema.foreign_key_target
+        end
+
+        def get_projection_without_useless_joins(projection)
+          new_projection = Projection.new(projection)
+
+          projection.relations.each do |relation_name, relation_projection|
+            next unless useless_join?(relation_name, projection)
+
+            # remove foreign key target from projection
+            new_projection.delete("#{relation_name}:#{relation_projection[0]}")
+
+            # add foreign keys to projection
+            fk_field = get_foreign_key_for_projection("#{relation_name}:#{relation_projection[0]}")
+            new_projection << fk_field
+          end
+
+          new_projection
+        end
+
+        def apply_joins_on_records(initial_projection, requested_projection, records)
+          return records if initial_projection == requested_projection
+
+          projections_to_add = Projection.new(initial_projection.reject do |field|
+            requested_projection.include?(field)
+          end)
+          projections_to_rm = Projection.new(requested_projection.reject { |field| initial_projection.include?(field) })
+
+          records.each do |record|
+            # add to record relation:id
+            projections_to_add.relations.each do |relation_name, relation_projection|
+              relation_schema = schema[:fields][relation_name]
+
+              if relation_schema && relation_schema.type == 'ManyToOne'
+                fk_value = record[get_foreign_key_for_projection("#{relation_name}:#{relation_projection[0]}")]
+                record[relation_name] = fk_value.nil? ? nil : { relation_projection[0] => fk_value }
+              end
+            end
+
+            # remove foreign keys
+            projections_to_rm.each { |field| record.delete(field) }
+          end
+
+          records
+        end
+
+        def apply_joins_on_aggregate_result(initial_aggregation, requested_aggregation, results, fields_to_replace)
+          return result if initial_aggregation == requested_aggregation
+
+          results.each do |result|
+            group = {}
+            result['group'].each do |field, value|
+              if fields_to_replace.include?(field)
+                group[fields_to_replace[field]] = value
+              else
+                group[field] = value
+              end
+            end
+            result['group'] = group
+          end
+
+          results
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_datasource_customizer/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceCustomizer
-  VERSION = "1.0.0-beta.87"
+  VERSION = "1.0.0-beta.89"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_customizer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.87
+  version: 1.0.0.pre.beta.89
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,6 +116,7 @@ files:
 - lib/forest_admin_datasource_customizer/decorators/hook/context/hook_context.rb
 - lib/forest_admin_datasource_customizer/decorators/hook/hook_collection_decorator.rb
 - lib/forest_admin_datasource_customizer/decorators/hook/hooks.rb
+- lib/forest_admin_datasource_customizer/decorators/lazy_join/lazy_join_collection_decorator.rb
 - lib/forest_admin_datasource_customizer/decorators/operators_emulate/operators_emulate_collection_decorator.rb
 - lib/forest_admin_datasource_customizer/decorators/operators_equivalence/operators_equivalence_collection_decorator.rb
 - lib/forest_admin_datasource_customizer/decorators/override/context/create_override_customization_context.rb