forest_admin_datasource_active_record 1.0.0.pre.beta.60 → 1.0.0.pre.beta.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06eb4e50d70ed020e78c247129d24f1a514efcc8e3150864ac00e2a420d715ed
-  data.tar.gz: e11b2afab09fbf5ac3e9555a288f70638e2c01e5d2135a983b8601324d701916
+  metadata.gz: c9ce7a6a32ae3e985c64e2c9458165de5d24e8d7a532ca6a405aac048ef5ede8
+  data.tar.gz: 65ba39d8d70775cbb98e4b0f0d85888a5946fda8e34bd88bb8e7e3b52004fe2c
 SHA512:
-  metadata.gz: 895ce913914b2400d39f09b197ef29e25524bcd524e75749a206cb5be6797665f026eac1ab0f99bceff4b11d9546c56edd3e92155c90a68434705faba6b411ec
-  data.tar.gz: 5afa4e3d45800cce7d9f1a274eba8ccaf78d5c473460e1ccc56dada1064319d7e5d4b1a81b53ccadf293a64f61a1d607021665c6fdee7d95f1f143af4051d29f
+  metadata.gz: 2a1fcf17fd734b4275c86f82ac5afb4ff03bb4ac5a52b556b2df3ef1407f38076b37c94d650923711e0fe56fb63455e80ad1713c403592a93501b54e088b595b
+  data.tar.gz: 112af29e8fab7793768607f64e5f51c97183623cf461f8fcd24f332267d40d5bb62b04e2cc73115e2c0b7f10f239a1d97cc82023cf09646d78de40c5c0cfaff2

data/lib/forest_admin_datasource_active_record/collection.rb

@@ -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/version.rb

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