Merge pull request #79 from alexjoffroy/master

Access data in updateResourceCallable (fix #77)

Author: nilportugues

src/NilPortugues/Laravel5/JsonApi/Controller/JsonApiTrait.php

@@ -171,7 +171,7 @@ protected function putAction(Request $request, $id)
      */
     protected function updateResourceCallable()
     {
-        return function (Model $model, array $values, ErrorBag $errorBag) {
+        return function (Model $model, array $data, array $values, ErrorBag $errorBag) {
             foreach ($values as $attribute => $value) {
                 $model->$attribute = $value;
             }

tests/NilPortugues/App/Controller/EmployeesController.php

@@ -37,9 +37,9 @@ public function getDataModel()
     /**
      * @return callable
      */
-    protected function createResourceCallable()
+    private function createOrderResourceCallable()
     {
-        $createOrderResource = function (Model $model, array $data) {
+        return function (Model $model, array $data) {
             if (!empty($data['relationships']['order']['data'])) {
                 $orderData = $data['relationships']['order']['data'];
 
@@ -53,6 +53,14 @@ protected function createResourceCallable()
                 }
             }
         };
+    }
+
+    /**
+     * @return callable
+     */
+    protected function createResourceCallable()
+    {
+        $createOrderResource = $this->createOrderResourceCallable();
 
         return function (array $data, array $values, ErrorBag $errorBag) use ($createOrderResource) {
 
@@ -81,6 +89,35 @@ protected function createResourceCallable()
         };
     }
 
+    /**
+     * @return callable
+     */
+    protected function updateResourceCallable()
+    {
+        $createOrderResource = $this->createOrderResourceCallable();
+
+        return function (Model $model, array $data, array $values, ErrorBag $errorBag) use ($createOrderResource) {
+
+            foreach ($values as $attribute => $value) {
+                $model->$attribute = $value;
+            }
+
+            DB::beginTransaction();
+            try {
+                $model->update();
+                $createOrderResource($model, $data);
+                DB::commit();
+
+                return $model;
+            } catch (\Exception $e) {
+                DB::rollback();
+                $errorBag[] = new Error('update_error', 'Resource could not be updated');
+                throw new \Exception();
+            }
+
+        };
+    }
+
     /**
      * @param $id
      *

tests/NilPortugues/Laravel5/JsonApi/JsonApiControllerTest.php

@@ -58,6 +58,62 @@ public function testGetAction()
         $this->assertEquals('application/vnd.api+json', $response->headers->get('Content-type'));
     }
 
+    public function testPatchAction()
+    {
+        $this->createNewEmployee();
+
+        $content = <<<JSON
+{
+    "data": {
+        "type": "employee",
+        "attributes": {
+            "job_title": "Senior Web Developer"
+        }
+    }
+}
+JSON;
+        $response = $this->call('PATCH', 'http://localhost/employees/1', json_decode($content, true), [], [], [], '');
+        
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('application/vnd.api+json', $response->headers->get('Content-type'));
+    }
+
+    public function testPutAction()
+    {
+        $this->createNewEmployee();
+
+        $content = <<<JSON
+{
+    "data": {
+        "type": "employee",
+        "attributes": {
+            "company": "NilPortugues.com",
+            "surname": "Portugués",
+            "first_name": "Nil",
+            "email_address": "nilportugues@localhost",
+            "job_title": "Senior Web Developer",
+            "business_phone": "(123)555-0100",
+            "home_phone": "(123)555-0102",
+            "mobile_phone": null,
+            "fax_number": "(123)555-0103",
+            "address": "Plaça Catalunya 1",
+            "city": "Barcelona",
+            "state_province": "Barcelona",
+            "zip_postal_code": "08028",
+            "country_region": "Spain",
+            "web_page": "http://nilportugues.com",
+            "notes": null,
+            "attachments": null
+        }
+    }
+}
+JSON;
+        $response = $this->call('PUT', 'http://localhost/employees/1', json_decode($content, true), [], [], [], '');
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('application/vnd.api+json', $response->headers->get('Content-type'));
+    }
+
     public function testDeleteAction()
     {
         $this->createNewEmployee();