Merge pull request #43 from tuyakhov/clear_relationships

Allow to clear relationships

Author: tuyakhov

src/JsonApiParser.php

@@ -34,13 +34,16 @@ class JsonApiParser extends JsonParser
     public function parse($rawBody, $contentType)
     {
         $array = parent::parse($rawBody, $contentType);
-        $data =  ArrayHelper::getValue($array, 'data', []);
-        if (empty($data)) {
+        if (!ArrayHelper::keyExists('data', $array)) {
             if ($this->throwException) {
                 throw new BadRequestHttpException('The request MUST include a single resource object as primary data.');
             }
             return [];
         }
+        $data =  ArrayHelper::getValue($array, 'data', []);
+        if (empty($data)) {
+            return [];
+        }
         if (ArrayHelper::isAssociative($data)) {
             $result = $this->parseResource($data);
 
@@ -109,12 +112,14 @@ protected function parseRelationships(array $relObjects = [])
     {
         $relationships = [];
         foreach ($relObjects as $name => $relationship) {
-            if (!$relData = ArrayHelper::getValue($relationship, 'data')) {
+            if (!ArrayHelper::keyExists('data', $relationship)) {
                 continue;
             }
+            $relData = ArrayHelper::getValue($relationship, 'data', []);
             if (!ArrayHelper::isIndexed($relData)) {
                 $relData = [$relData];
             }
+            $relationships[$name] = [];
             foreach ($relData as $identifier) {
                 if (isset($identifier['type']) && isset($identifier['id'])) {
                     $formName = $this->typeToFormName($identifier['type']);

src/ResourceTrait.php

@@ -87,6 +87,7 @@ public function setResourceRelationship($name, $relationship)
         if (!is_array($relationship)) {
             $relationship = [$relationship];
         }
+        $this->unlinkAll($name);
         foreach ($relationship as $key => $value) {
             if ($value instanceof ActiveRecordInterface) {
                 $this->link($name, $value);

src/actions/Action.php

@@ -55,14 +55,10 @@ protected function linkRelationships($model, array $data = [])
                 $ids[] = $relObject['id'];
             }
 
-            if (!$records = $relatedClass::find()->andWhere(['in', $relatedClass::primaryKey(), $ids])->all()) {
-                continue;
-            }
-
             if ($related->multiple && !$this->allowFullReplacement) {
                 continue;
             }
-            $model->unlinkAll($name);
+            $records = $relatedClass::find()->andWhere(['in', $relatedClass::primaryKey(), $ids])->all();
             $model->setResourceRelationship($name, $records);
         }
     }

tests/data/ResourceModel.php

@@ -81,9 +81,9 @@ public function getPrimaryKey($asArray = false)
         return $asArray ? [$this->getId()] : $this->getId();
     }
 
-    public function unlinkAll()
+    public function unlinkAll($name)
     {
-        return;
+        $this->$name = null;
     }
 
     public function save()