forest_admin_datasource_active_record 1.0.0.pre.beta.59 → 1.0.0.pre.beta.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc828978458b7c1566d7f61d007df24401281c115bc54a551fbedde6e6cf3783
-  data.tar.gz: 3fbea7107c9ffbb8442f01b47fc58bb23bccf47513e34d6b7caec47516098742
+  metadata.gz: c9ce7a6a32ae3e985c64e2c9458165de5d24e8d7a532ca6a405aac048ef5ede8
+  data.tar.gz: 65ba39d8d70775cbb98e4b0f0d85888a5946fda8e34bd88bb8e7e3b52004fe2c
 SHA512:
-  metadata.gz: 0ec4a0787f25fc01d5de4a3afaa320962bdb78716d5db67e05fc195d30eacf386b9f4ea571e57e7fd663415727b2ed75c84d4bf2f05486b7286d9bb4d2a66f5a
-  data.tar.gz: 4b201a38b1543eb8a528eab862e653ca5316173c841b426024b5de56632920a7cec966e5687914b8108d261d906920a3a9b1d990996318ba8ed1c28fe2184437
+  metadata.gz: 2a1fcf17fd734b4275c86f82ac5afb4ff03bb4ac5a52b556b2df3ef1407f38076b37c94d650923711e0fe56fb63455e80ad1713c403592a93501b54e088b595b
+  data.tar.gz: 112af29e8fab7793768607f64e5f51c97183623cf461f8fcd24f332267d40d5bb62b04e2cc73115e2c0b7f10f239a1d97cc82023cf09646d78de40c5c0cfaff2

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)
@@ -30,7 +30,7 @@ module ForestAdminDatasourceActiveRecord
     end
 
     def create(_caller, data)
-      Utils::ActiveRecordSerializer.new(@model.create(data)).to_hash
+      Utils::ActiveRecordSerializer.new(@model.create(data)).to_hash(ProjectionFactory.all(self))
     end
 
     def update(_caller, filter, data)
@@ -63,49 +63,75 @@ module ForestAdminDatasourceActiveRecord
       end
     end
 
+    def association_primary_key?(association)
+      !association.association_primary_key.empty?
+    rescue StandardError
+      false
+    end
+
     def fetch_associations
       associations(@model).each do |association|
         case association.macro
         when :has_one
-          add_field(
-            association.name.to_s,
-            ForestAdminDatasourceToolkit::Schema::Relations::OneToOneSchema.new(
-              foreign_collection: association.class_name.demodulize.underscore,
-              origin_key: association.foreign_key,
-              origin_key_target: association.association_primary_key
-            )
-          )
+          if association_primary_key?(association)
+            if association.through_reflection?
+              add_field(
+                association.name.to_s,
+                ForestAdminDatasourceToolkit::Schema::Relations::ManyToManySchema.new(
+                  foreign_collection: association.class_name.demodulize.underscore,
+                  origin_key: association.through_reflection.foreign_key,
+                  origin_key_target: association.through_reflection.join_foreign_key,
+                  foreign_key: association.join_foreign_key,
+                  foreign_key_target: association.association_primary_key,
+                  through_collection: association.through_reflection.class_name.demodulize.underscore
+                )
+              )
+            else
+              add_field(
+                association.name.to_s,
+                ForestAdminDatasourceToolkit::Schema::Relations::OneToOneSchema.new(
+                  foreign_collection: association.class_name.demodulize.underscore,
+                  origin_key: association.foreign_key,
+                  origin_key_target: association.association_primary_key
+                )
+              )
+            end
+          end
         when :belongs_to
-          add_field(
-            association.name.to_s,
-            ForestAdminDatasourceToolkit::Schema::Relations::ManyToOneSchema.new(
-              foreign_collection: association.class_name.demodulize.underscore,
-              foreign_key: association.foreign_key,
-              foreign_key_target: association.association_primary_key
-            )
-          )
-        when :has_many
-          if association.through_reflection?
+          if association_primary_key?(association)
             add_field(
               association.name.to_s,
-              ForestAdminDatasourceToolkit::Schema::Relations::ManyToManySchema.new(
+              ForestAdminDatasourceToolkit::Schema::Relations::ManyToOneSchema.new(
                 foreign_collection: association.class_name.demodulize.underscore,
-                origin_key: association.through_reflection.foreign_key,
-                origin_key_target: association.through_reflection.join_foreign_key,
-                foreign_key: association.join_foreign_key,
-                foreign_key_target: association.association_primary_key,
-                through_collection: association.through_reflection.class_name.demodulize.underscore
+                foreign_key: association.foreign_key,
+                foreign_key_target: association.association_primary_key
               )
             )
-          else
-            add_field(
-              association.name.to_s,
-              ForestAdminDatasourceToolkit::Schema::Relations::OneToManySchema.new(
-                foreign_collection: association.class_name.demodulize.underscore,
-                origin_key: association.foreign_key,
-                origin_key_target: association.association_primary_key
+          end
+        when :has_many
+          if association_primary_key?(association)
+            if association.through_reflection?
+              add_field(
+                association.name.to_s,
+                ForestAdminDatasourceToolkit::Schema::Relations::ManyToManySchema.new(
+                  foreign_collection: association.class_name.demodulize.underscore,
+                  origin_key: association.through_reflection.foreign_key,
+                  origin_key_target: association.through_reflection.join_foreign_key,
+                  foreign_key: association.join_foreign_key,
+                  foreign_key_target: association.association_primary_key,
+                  through_collection: association.through_reflection.class_name.demodulize.underscore
+                )
               )
-            )
+            else
+              add_field(
+                association.name.to_s,
+                ForestAdminDatasourceToolkit::Schema::Relations::OneToManySchema.new(
+                  foreign_collection: association.class_name.demodulize.underscore,
+                  origin_key: association.foreign_key,
+                  origin_key_target: association.association_primary_key
+                )
+              )
+            end
           end
         end
       end

data/lib/forest_admin_datasource_active_record/datasource.rb

@@ -19,11 +19,20 @@ module ForestAdminDatasourceActiveRecord
       end
     end
 
+    def primary_key?(model)
+      !model.primary_key.empty?
+    rescue StandardError
+      false
+    end
+
     def fetch_model(model)
       if model.name.start_with?('HABTM_')
         build_habtm(model)
       else
-        @models << model unless model.abstract_class? || @models.include?(model) || !model.table_exists?
+        @models << model unless model.abstract_class? ||
+                                @models.include?(model) ||
+                                !model.table_exists? ||
+                                !primary_key?(model)
       end
     end
 

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.59"
+  VERSION = "1.0.0-beta.61"
 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.59
+  version: 1.0.0.pre.beta.61
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-01 00:00:00.000000000 Z
+date: 2024-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord