forest_admin_agent 1.38.0 → 1.38.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5455a6164932af84cf535d72cd896814fcb24a83106cae4c6efbf94d3f15f650
-  data.tar.gz: f31a0a6cde3793cd7bc2f5bfc1c2462a0001d4e80e414e7433064f2907dff45d
+  metadata.gz: 948a67317152cf955d6e7ff512b20b810d136ff9ab89e8ad87cbb2a09e9b80e2
+  data.tar.gz: 3984557e91f84b405857a45debf12c7ec2d39377575be0a645ad9c4c7c1de872
 SHA512:
-  metadata.gz: 929f4669e1b73c51b615f0259a6b34e6cfa59cb89c7e9dde693c7c47238b4c5b2fe608d5a3eceb73d6ed025fe5d5a83a33759920187c61bb1eddd3b0ab239bf1
-  data.tar.gz: 638dd7596eae9fde1b272e5389d3da042e0aaf3e12080fbdf449866a61a8535a75ae8d46cbf39c5c3eed56792f249c7146d770179a976fe0961b5e6c6b445b02
+  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/routes/resources/store.rb

@@ -17,9 +17,10 @@ module ForestAdminAgent
         def handle_request(args = {})
           context = build(args)
           context.permissions.can?(:add, context.collection)
+          relations = authorized_linked_one_to_one_relations(args, context)
           data = format_attributes(args, context.collection)
           record = context.collection.create(context.caller, data)
-          link_one_to_one_relations(args, record, context)
+          link_one_to_one_relations(relations, record, context)
           id = ForestAdminDatasourceToolkit::Utils::Record.primary_keys(context.collection, record)
           filter = ForestAdminDatasourceToolkit::Components::Query::Filter.new(
             condition_tree: ConditionTree::ConditionTreeFactory.match_ids(context.collection, [id])
@@ -37,24 +38,63 @@ module ForestAdminAgent
           }
         end
 
-        def link_one_to_one_relations(args, record, context)
-          args[:params][:data][:relationships]&.map do |field, value|
-            schema = context.collection.schema[:fields][field]
-            next unless %w[OneToOne PolymorphicOneToOne].include?(schema.type)
+        private
 
-            primary_key_values = Utils::Id.unpack_id(context.collection, value['data']['id'], with_key: true)
-            foreign_collection = context.datasource.get_collection(schema.foreign_collection)
-            # Load the value that will be used as origin_key
-            origin_value = record[schema.origin_key_target]
+        def authorized_linked_one_to_one_relations(args, context)
+          linked_one_to_one_relations(args, context).map do |relation|
+            foreign_collection = relation[:foreign_collection]
 
-            # update new relation (may update zero or one records).
-            patch = { schema.origin_key => origin_value }
+            context.permissions.can?(:edit, foreign_collection)
+
+            relation.merge(
+              scope: context.permissions.get_scope(foreign_collection),
+              primary_key_values: Utils::Id.unpack_id(foreign_collection, relation[:id], with_key: true)
+            )
+          end
+        end
+
+        def linked_one_to_one_relations(args, context)
+          relationships = args.dig(:params, :data, :relationships) || {}
+
+          relationships.filter_map { |field, value| linked_one_to_one_relation(field, value, context) }
+        end
+
+        def linked_one_to_one_relation(field, value, context)
+          schema = context.collection.schema[:fields][field]
+          return unless %w[OneToOne PolymorphicOneToOne].include?(schema.type)
+
+          id = value.dig('data', 'id')
+          return if id.nil?
+
+          {
+            schema: schema,
+            foreign_collection: context.datasource.get_collection(schema.foreign_collection),
+            id: id
+          }
+        end
+
+        def link_one_to_one_relations(relations, record, context)
+          relations.each do |relation|
+            schema = relation[:schema]
+            foreign_collection = relation[:foreign_collection]
+
+            patch = { schema.origin_key => record[schema.origin_key_target] }
             if schema.type == 'PolymorphicOneToOne'
               patch[schema.origin_type_field] =
                 context.collection.name.gsub('__', '::')
             end
-            condition_tree = ConditionTree::ConditionTreeFactory.match_records(foreign_collection, [primary_key_values])
-            filter = Filter.new(condition_tree: condition_tree)
+
+            new_fk_owner = ConditionTree::ConditionTreeFactory.match_records(
+              foreign_collection, [relation[:primary_key_values]]
+            )
+            filter = Filter.new(
+              condition_tree: ConditionTree::ConditionTreeFactory.intersect(
+                [
+                  relation[:scope],
+                  new_fk_owner
+                ]
+              )
+            )
             foreign_collection.update(context.caller, filter, patch)
           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.0"
+        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.0"
+  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.0
+  version: 1.38.2
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-12 00:00:00.000000000 Z
+date: 2026-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport