forest_admin_agent 1.38.1 → 1.38.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbec2d5605e6d383151f61a3b58c602b0c65099685c03cd7e2f910146a563058
-  data.tar.gz: 53f010f4b995181820015c7bda91ef07a7d84bd8a7ee66fa9887f4e933bcbbbc
+  metadata.gz: 948a67317152cf955d6e7ff512b20b810d136ff9ab89e8ad87cbb2a09e9b80e2
+  data.tar.gz: 3984557e91f84b405857a45debf12c7ec2d39377575be0a645ad9c4c7c1de872
 SHA512:
-  metadata.gz: a34d395d4eab6ad9a034e9ef0b93b6737740a7a832da40e10ceab61787e5e3c2949776eb1c7bbefdd91cfdc175312e0e954e090c63804403e83e151080c6e16c
-  data.tar.gz: 18058de101b452b870c8ef90a2be2990ba07c197b2d64347e4e229d4f37156b26eaaf9cc96ab885911f5144e06ee939e9108044b85333eb8e97a6f442e22d2f7
+  metadata.gz: d051b8008198eb80152b4e542ce4c570f0e3215c46a6e9cdbe05405d395c9760fc7176318a4eb0533e1ca91443c7c3be17ac9d51176094910e6fe3230f77bf43
+  data.tar.gz: a103408031a613a2061036ca066502f72752f2138d22e526cb5706bd7b703b415297cf9aba273d3976dc1a2bf52b6ed948d9f768e6c74d2f99031d9397dbd809

data/lib/forest_admin_agent/routes/resources/related/associate_related.rb

@@ -22,7 +22,7 @@ module ForestAdminAgent
 
           def handle_request(args = {})
             context = build(args)
-            context.permissions.can?(:edit, context.collection)
+            context.permissions.can?(:edit, context.child_collection)
 
             parent_primary_key_values = Utils::Id.unpack_id(context.collection, args[:params]['id'], with_key: true)
             target_primary_key_values = Utils::Id.unpack_id(context.child_collection, args[:params]['data'][0]['id'],
@@ -44,16 +44,7 @@ module ForestAdminAgent
           private
 
           def associate_one_to_many(relation, parent_primary_key_values, target_primary_key_values, context)
-            id = Schema.primary_keys(context.child_collection)[0]
-            value = Collection.get_value(context.child_collection, context.caller, target_primary_key_values, id)
-            filter = Filter.new(
-              condition_tree: ConditionTree::ConditionTreeFactory.intersect(
-                [
-                  ConditionTree::Nodes::ConditionTreeLeaf.new(id, 'Equal', value),
-                  context.permissions.get_scope(context.child_collection)
-                ]
-              )
-            )
+            filter = target_in_scope_filter(target_primary_key_values, context)
             value = Collection.get_value(context.collection, context.caller, parent_primary_key_values,
                                          relation.origin_key_target)
 
@@ -61,17 +52,7 @@ module ForestAdminAgent
           end
 
           def associate_polymorphic_one_to_many(relation, parent_primary_key_values, target_primary_key_values, context)
-            id = Schema.primary_keys(context.child_collection)[0]
-            value = Collection.get_value(context.child_collection, context.caller, target_primary_key_values, id)
-            filter = Filter.new(
-              condition_tree: ConditionTree::ConditionTreeFactory.intersect(
-                [
-                  ConditionTree::Nodes::ConditionTreeLeaf.new(id, 'Equal', value),
-                  context.permissions.get_scope(context.child_collection)
-                ]
-              )
-            )
-
+            filter = target_in_scope_filter(target_primary_key_values, context)
             value = Collection.get_value(context.collection, context.caller, parent_primary_key_values,
                                          relation.origin_key_target)
 
@@ -83,16 +64,39 @@ module ForestAdminAgent
           end
 
           def associate_many_to_many(relation, parent_primary_key_values, target_primary_key_values, context)
-            id = Schema.primary_keys(context.child_collection)[0]
-            foreign_value = Collection.get_value(context.child_collection, context.caller, target_primary_key_values,
-                                                 id)
-            id = Schema.primary_keys(context.collection)[0]
-            origin_value = Collection.get_value(context.collection, context.caller, parent_primary_key_values, id)
-            record = { relation.origin_key => origin_value, relation.foreign_key => foreign_value }
+            target = find_target_in_scope(target_primary_key_values, relation.foreign_key_target, context)
+            return if target.nil?
+
+            origin_value = Collection.get_value(context.collection, context.caller, parent_primary_key_values,
+                                                relation.origin_key_target)
+            record = {
+              relation.origin_key => origin_value,
+              relation.foreign_key => target[relation.foreign_key_target]
+            }
 
             through_collection = context.datasource.get_collection(relation.through_collection)
             through_collection.create(context.caller, record)
           end
+
+          def find_target_in_scope(target_primary_key_values, foreign_key_target, context)
+            context.child_collection.list(
+              context.caller,
+              target_in_scope_filter(target_primary_key_values, context),
+              Projection.new([foreign_key_target])
+            ).first
+          end
+
+          def target_in_scope_filter(target_primary_key_values, context)
+            Filter.new(
+              condition_tree: ConditionTree::ConditionTreeFactory.intersect(
+                [
+                  ConditionTree::ConditionTreeFactory.match_ids(context.child_collection,
+                                                                [target_primary_key_values]),
+                  context.permissions.get_scope(context.child_collection)
+                ]
+              )
+            )
+          end
         end
       end
     end

data/lib/forest_admin_agent/utils/schema/schema_emitter.rb

@@ -6,7 +6,7 @@ module ForestAdminAgent
     module Schema
       class SchemaEmitter
         LIANA_NAME = "agent-ruby"
-        LIANA_VERSION = "1.38.1"
+        LIANA_VERSION = "1.38.2"
 
         def self.generate(datasource)
           datasource.collections

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.38.1"
+  VERSION = "1.38.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_agent
 version: !ruby/object:Gem::Version
-  version: 1.38.1
+  version: 1.38.2
 platform: ruby
 authors:
 - Matthieu