Refactor methods in JsonApiController

Author: huntie

src/Http/Controllers/JsonApiController.php

@@ -123,8 +123,8 @@ public function updateAction(Request $request, $record)
         $record->fill((array) $request->input('data.attributes'));
         $record->save();
 
-        if ($relationships = $request->input('data.relationships')) {
-            $this->updateRecordRelationships($record, (array) $relationships);
+        if ($request->has('data.relationships')) {
+            $this->updateRecordRelationships($record, (array) $request->input('data.relationships'));
         }
 
         return new JsonApiResponse(new ResourceSerializer($record));
@@ -140,8 +140,7 @@ public function updateAction(Request $request, $record)
      */
     public function destroyAction(Request $request, $record)
     {
-        $record = $this->findModelInstance($record);
-        $record->delete();
+        $this->findModelInstance($record)->delete();
 
         return new JsonApiResponse(null, Response::HTTP_NO_CONTENT);
     }
@@ -159,7 +158,7 @@ public function destroyAction(Request $request, $record)
      */
     public function relationshipAction(Request $request, $record, $relation)
     {
-        abort_if(!array_key_exists($relation, $this->getModelRelationships()), Response::HTTP_NOT_FOUND);
+        abort_unless(array_key_exists($relation, $this->getModelRelationships()), Response::HTTP_NOT_FOUND);
 
         $record = $this->findModelInstance($record);
 
@@ -180,14 +179,15 @@ public function relationshipAction(Request $request, $record, $relation)
      */
     public function updateToOneRelationshipAction(Request $request, $record, $relation)
     {
-        abort_if(!array_key_exists($relation, $this->getModelRelationships()), Response::HTTP_NOT_FOUND);
+        abort_unless(array_key_exists($relation, $this->getModelRelationships()), Response::HTTP_NOT_FOUND);
 
         $record = $this->findModelInstance($record);
         $relation = $this->getModelRelationships()[$relation];
-        $data = (array) $request->input('data');
 
-        $record->{$relation->getForeignKey()} = $data['id'];
-        $record->save();
+        if ($relatedRecord = $relation->getRelated()->find($request->input('data.id'))) {
+            $record->associate($relatedRecord);
+            $record->save();
+        }
 
         return new JsonApiResponse(new RelationshipSerializer($record, $relation));
     }
@@ -206,13 +206,12 @@ public function updateToOneRelationshipAction(Request $request, $record, $relati
      */
     public function updateToManyRelationshipAction(Request $request, $record, $relation)
     {
-        abort_if(!array_key_exists($relation, $this->getModelRelationships()), Response::HTTP_NOT_FOUND);
+        abort_unless(array_key_exists($relation, $this->getModelRelationships()), Response::HTTP_NOT_FOUND);
 
         $record = $this->findModelInstance($record);
-        $relationships = (array) $request->input('data');
         $items = [];
 
-        foreach ($relationships as $item) {
+        foreach ((array) $request->input('data') as $item) {
             if (isset($item['attributes'])) {
                 $items[$item['id']] = $item['attributes'];
             } else {