Merge 297b3c1 into 79deb94

src/SaveRelationsBehavior.php

@@ -9,6 +9,7 @@
 use yii\base\Exception;
 use yii\base\InvalidArgumentException;
 use yii\base\InvalidConfigException;
+use yii\base\Model;
 use yii\base\ModelEvent;
 use yii\base\UnknownPropertyException;
 use yii\db\ActiveQuery;
@@ -162,8 +163,15 @@ protected function setSingleRelation($relationName, $value)
         $owner = $this->owner;
         /** @var ActiveQuery $relation */
         $relation = $owner->getRelation($relationName);
+
         if (!($value instanceof $relation->modelClass)) {
-            $value = $this->processModelAsArray($value, $relation, $relationName);
+            //we have an existing hasone relation model
+            if(is_array($value) && $this->_getRelatedFks($value, $relation, $relation->modelClass) && $owner->{$relationName} instanceof $relation->modelClass && !$owner->{$relationName}->getIsNewRecord()) {
+                $this->_loadRelationModel($value, $relationName, $owner->{$relationName});
+                $value = $owner->{$relationName};
+            } else {
+                $value = $this->processModelAsArray($value, $relation, $relationName);
+            }
         }
         $this->_newRelationValue[$relationName] = $value;
         $owner->populateRelation($relationName, $value);
@@ -283,17 +291,7 @@ private function _loadOrCreateRelationModel($data, $fks, $modelClass, $relationN
         if (!($relationModel instanceof BaseActiveRecord) && !empty($data)) {
             $relationModel = new $modelClass;
         }
-        // If a custom scenario is set, apply it here to correctly be able to set the model attributes
-        if (array_key_exists($relationName, $this->_relationsScenario)) {
-            $relationModel->setScenario($this->_relationsScenario[$relationName]);
-        }
-        if (($relationModel instanceof BaseActiveRecord) && is_array($data)) {
-            $relationModel->setAttributes($data);
-            if ($relationModel->hasMethod('loadRelations')) {
-                $relationModel->loadRelations($data);
-            }
-
-        }
+        $this->_loadRelationModel($data, $relationName, $relationModel);
         return $relationModel;
     }
 
@@ -833,4 +831,28 @@ public function markRelationDirty($relationName)
         }
         return false;
     }
+
+    /**
+     * @param $data
+     * @param $relationName
+     * @param $relationModel
+     */
+    private function _loadRelationModel($data, $relationName, ?Model $relationModel): void
+    {
+        if($relationModel === null) {
+            return;
+        }
+
+        // If a custom scenario is set, apply it here to correctly be able to set the model attributes
+        if (array_key_exists($relationName, $this->_relationsScenario)) {
+            $relationModel->setScenario($this->_relationsScenario[$relationName]);
+        }
+        if (($relationModel instanceof BaseActiveRecord) && is_array($data)) {
+            $relationModel->setAttributes($data);
+            if ($relationModel->hasMethod('loadRelations')) {
+                $relationModel->loadRelations($data);
+            }
+
+        }
+    }
 }

src/SaveRelationsTrait.php

@@ -2,15 +2,57 @@
 
 namespace lhs\Yii2SaveRelationsBehavior;
 
+/**
+ * Trait SaveRelationsTrait
+ * @package lhs\Yii2SaveRelationsBehavior
+ *
+ * @mixin SaveRelationsBehavior
+ */
 trait SaveRelationsTrait
 {
 
     public function load($data, $formName = null)
     {
         $loaded = parent::load($data, $formName);
         if ($loaded && $this->hasMethod('loadRelations')) {
+            $this->_prepareLoadData($data);
+
             $this->loadRelations($data);
         }
         return $loaded;
     }
-}
+
+    /**
+     * @param $data
+     */
+    private function _prepareLoadData(&$data) {
+        $scope = $formName === null ? $this->formName() : $formName;
+
+        foreach ($this->relations as $key => $value) {
+            if (is_int($key)) {
+                $relationName = $value;
+            } else {
+                $relationName = $key;
+            }
+
+            if(!isset($data[$scope][$relationName])) {
+                continue;
+            }
+
+            $relation = $this->getRelation($relationName);
+
+            if(!$relation) {
+                continue;
+            }
+
+            $modelClass = $relation->modelClass;
+            /** @var ActiveQuery $relationalModel */
+            $relationalModel = new $modelClass;
+            $keyName = $relationalModel->formName();
+
+            $data[$keyName] = $data[$scope][$relationName];
+
+            unset($data[$scope][$relationName]);
+        }
+    }
+}