move Join data passing from Model

Author: mvorisek

src/Model.php

@@ -1510,9 +1510,7 @@ public function save(array $data = [])
                         continue;
                     }
 
-                    if ($field->hasJoin()) {
-                        $field->getJoin()->setSaveBufferValue($this, $name, $value);
-                    } else {
+                    if (!$field->hasJoin()) {
                         $data[$name] = $value;
                     }
                 }
@@ -1542,7 +1540,6 @@ public function save(array $data = [])
 
                     if ($field->hasJoin()) {
                         $dirtyJoin = true;
-                        $field->getJoin()->setSaveBufferValue($this, $name, $value);
                     } else {
                         $data[$name] = $value;
                     }

src/Model/Join.php

@@ -453,7 +453,7 @@ protected function getAndUnsetReindexedSaveBuffer(Model $entity): array
     /**
      * @param mixed $value
      */
-    public function setSaveBufferValue(Model $entity, string $fieldName, $value): void
+    protected function setSaveBufferValue(Model $entity, string $fieldName, $value): void
     {
         $entity->assertIsEntity($this->getOwner());
 
@@ -476,6 +476,22 @@ protected function afterLoad(Model $entity): void
     {
     }
 
+    protected function initSaveBuffer(Model $entity, bool $fromUpdate): void
+    {
+        foreach ($entity->get() as $name => $value) {
+            $field = $entity->getField($name);
+            if (!$field->hasJoin() || $field->getJoin()->shortName !== $this->shortName || $field->readOnly || $field->neverPersist || $field->neverSave) {
+                continue;
+            }
+
+            if ($fromUpdate && !$entity->isDirty($name)) { // TODO double check no action is really taken when the save buffer is unset
+                continue;
+            }
+
+            $field->getJoin()->setSaveBufferValue($entity, $name, $value);
+        }
+    }
+
     /**
      * @param array<string, mixed> $data
      */
@@ -485,6 +501,8 @@ protected function beforeInsert(Model $entity, array &$data): void
             return;
         }
 
+        $this->initSaveBuffer($entity, false);
+
         // the value for the masterField is set, so we are going to use existing record anyway
         if ($entity->get($this->masterField) !== null) {
             return;
@@ -512,6 +530,8 @@ protected function afterInsert(Model $entity): void
             return;
         }
 
+        $this->initSaveBuffer($entity, false);
+
         $id = $entity->getId();
         $this->assertReferenceIdNotNull($id);
 
@@ -531,6 +551,8 @@ protected function beforeUpdate(Model $entity, array &$data): void
             return;
         }
 
+        $this->initSaveBuffer($entity, true);
+
         if (!$this->issetSaveBuffer($entity)) {
             return;
         }