forest_admin_datasource_active_record 1.0.0.pre.beta.58 → 1.0.0.pre.beta.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f2eaef8a89cf8ecc94aeb3f8308109a1eb975b0d407651a3e92f9dd39682fdc
-  data.tar.gz: 4498babbc445ddad40e54a676e1a2e252740c97c598c136a80ebf2a6a1386039
+  metadata.gz: 06eb4e50d70ed020e78c247129d24f1a514efcc8e3150864ac00e2a420d715ed
+  data.tar.gz: e11b2afab09fbf5ac3e9555a288f70638e2c01e5d2135a983b8601324d701916
 SHA512:
-  metadata.gz: 343d2c7753100824bed032f8ea060a059b3f684af87b84d3d6fa2f115913a9e4e78779912afa81db64e1c1d4bbf7813a2366be05f08eca3acaeb32a16378f4fc
-  data.tar.gz: ae84c0e2d70bd24e514030381c23ccefc6732112fee86053a70f8ecb4f20ec3c51bf8f5f2d7776845e7f6029298995835f08312f2de1c689c298212637bd5db5
+  metadata.gz: 895ce913914b2400d39f09b197ef29e25524bcd524e75749a206cb5be6797665f026eac1ab0f99bceff4b11d9546c56edd3e92155c90a68434705faba6b411ec
+  data.tar.gz: 5afa4e3d45800cce7d9f1a274eba8ccaf78d5c473460e1ccc56dada1064319d7e5d4b1a81b53ccadf293a64f61a1d607021665c6fdee7d95f1f143af4051d29f

data/lib/forest_admin_datasource_active_record/collection.rb

@@ -22,7 +22,7 @@ module ForestAdminDatasourceActiveRecord
     def list(_caller, filter, projection)
       query = Utils::Query.new(self, projection, filter)
 
-      query.get.map { |record| Utils::ActiveRecordSerializer.new(record).to_hash }
+      query.get.map { |record| Utils::ActiveRecordSerializer.new(record).to_hash(projection) }
     end
 
     def aggregate(_caller, filter, aggregation, limit = nil)

data/lib/forest_admin_datasource_active_record/utils/active_record_serializer.rb

@@ -1,20 +1,24 @@
 module ForestAdminDatasourceActiveRecord
   module Utils
     ActiveRecordSerializer = Struct.new(:object) do
-      def to_hash
-        hash_object(object)
+      def to_hash(projection)
+        hash_object(object, projection)
       end
 
-      def hash_object(object, with_associations: true)
+      def hash_object(object, projection = nil, with_associations: true)
         hash = {}
 
-        return {} if object.nil?
+        return if object.nil?
 
         hash.merge! object.attributes
 
         if with_associations
           each_association_collection(object) do |association_name, item|
-            hash[association_name] = hash_object(item, with_associations: false)
+            hash[association_name] = hash_object(
+              item,
+              projection.relations[association_name],
+              with_associations: projection.relations.key?(association_name)
+            )
           end
         end
 

data/lib/forest_admin_datasource_active_record/utils/query.rb

@@ -109,7 +109,8 @@ module ForestAdminDatasourceActiveRecord
       def apply_select
         unless @projection.nil?
           @query = @query.select(@select.join(', '))
-          @query = @query.includes(@projection.relations.keys.map(&:to_sym))
+
+          @query = @query.includes(format_relation_projection(@projection))
         end
 
         @query
@@ -144,6 +145,16 @@ module ForestAdminDatasourceActiveRecord
           @query.send(aggregator, query)
         end
       end
+
+      def format_relation_projection(projection)
+        result = {}
+        projection&.relations&.each do |relation, projection_relation|
+          formatted_relations = format_relation_projection(projection_relation)
+
+          result[relation.to_sym] = formatted_relations
+        end
+        result
+      end
     end
   end
 end

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.0.0-beta.58"
+  VERSION = "1.0.0-beta.60"
 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.58
+  version: 1.0.0.pre.beta.60
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord