Add handlePOST viewCallback parameter

phramework · Feb 7, 2016 · f528578 · f528578
1 parent 14e6724
commit f528578
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 13 deletions.
diff --git a/src/Controller/POST.php b/src/Controller/POST.php
@@ -55,7 +55,8 @@ protected static function handlePOST(
         $modelClass,
         $primaryDataParameters = [],
         $relationshipParameters = [],
-        $validationCallbacks = []
+        $validationCallbacks = [],
+        $viewCallback = null
     ) {
         $queue = new \SplQueue();
 
@@ -72,7 +73,7 @@ protected static function handlePOST(
             }
 
             $requestAttributes = (
-                isset($resource->attributes) && $resource->attributes
+            isset($resource->attributes) && $resource->attributes
                 ? $resource->attributes
                 : new \stdClass()
             );
@@ -135,7 +136,17 @@ protected static function handlePOST(
             $ids[] = $id;
         }
 
-        return $ids; //TODO REMOVE
+
+        if ($viewCallback !== null) {
+            if (!is_callable($viewCallback)) {
+                throw new \Exception('View callback is not callable!');
+            }
+
+            return call_user_func(
+                $viewCallback,
+                $ids
+            );
+        }
 
         if (count($ids) === 1) {
             //Prepare response with 201 Created status code
@@ -184,7 +195,7 @@ private static function handlePOSTResource(
         $validator = $modelClass::getValidationModel();
 
         $attributesValidator = (
-            isset($validator->attributes) && $validator->attributes
+        isset($validator->attributes) && $validator->attributes
             ? $validator->attributes
             : new ObjectValidator()
         );
@@ -318,13 +329,13 @@ private static function handlePOSTResource(
 
         //Parse attributes using relationship's validation model
         $parsedRelationshipAttributes =
-        (
+            (
             isset($validator->relationships)
-            ? $validator->relationships->parse(
+                ? $validator->relationships->parse(
                 $relationshipAttributes
             )
-            : new \stdClass()
-        );
+                : new \stdClass()
+            );
 
         /**
          * Foreach request relationship
@@ -341,7 +352,7 @@ private static function handlePOSTResource(
             $parsedRelationshipValue = $parsedRelationshipAttributes->{$relationshipKey};
 
             $tempIds = (
-                is_array($parsedRelationshipValue)
+            is_array($parsedRelationshipValue)
                 ? $parsedRelationshipValue
                 : [$parsedRelationshipValue]
             );

diff --git a/src/Resource.php b/src/Resource.php
@@ -279,7 +279,6 @@ public static function parseFromRecord(
                     return call_user_func(
                         $relationshipObject->dataCallback,
                         $resource->id,
-                        $relationshipKey,
                         $fields,
                         $flags // use $flagRelationshipsAttributes to enable/disable parsing of relationship attributes
                     );

diff --git a/tests/APP/Controllers/ArticleController.php b/tests/APP/Controllers/ArticleController.php
@@ -55,7 +55,13 @@ public static function POST($params, $method, $headers)
             $params,
             $method,
             $headers,
-            Article::class
+            Article::class,
+            [],
+            [],
+            [],
+            function ($ids) {
+                self::viewData(new \stdClass());
+            }
         );
     }
 

diff --git a/tests/APP/Models/Tag.php b/tests/APP/Models/Tag.php
@@ -133,7 +133,6 @@ public static function postRelationshipByArticle(
      */
     public static function getRelationshipByArticle(
         $articleId,
-        //$relationshipKey,
         Fields $fields = null,
         $flags = Resource::PARSE_DEFAULT
     ) {

diff --git a/tests/src/Model/RelationshipTest.php b/tests/src/Model/RelationshipTest.php
@@ -38,7 +38,6 @@ public function testGetRelationshipData()
 
         $relationship = Tag::getRelationshipByArticle(
             '1',
-            'tag',
             null
         );