missing $model->timestamps value in condition

nilportugues · Jul 6, 2016 · 85c24fb · 85c24fb
1 parent 1b24b2e
commit 85c24fb
Show file tree

Hide file tree

Showing 9 changed files with 755 additions and 3 deletions.
diff --git a/.idea/blade.xml b/.idea/blade.xml
diff --git a/.idea/composerJson.xml b/.idea/composerJson.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/laravel5-jsonapi.iml b/.idea/laravel5-jsonapi.iml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/NilPortugues/Laravel5/JsonApi/Controller/JsonApiController.php b/src/NilPortugues/Laravel5/JsonApi/Controller/JsonApiController.php
@@ -102,8 +102,10 @@ public function store(Request $request)
 
         $model = $this->getDataModel();
         $data = (array) $request->get('data');
-        $data['attributes'][$model::CREATED_AT] = Carbon::now()->toDateTimeString();
-        $data['attributes'][$model::UPDATED_AT] = Carbon::now()->toDateTimeString();
+        if (array_key_exists('attributes', $data) && $model->timestamps) {
+            $data['attributes'][$model::CREATED_AT] = Carbon::now()->toDateTimeString();
+            $data['attributes'][$model::UPDATED_AT] = Carbon::now()->toDateTimeString();
+        }
 
         return $this->addHeaders(
           $resource->get($data, get_class($this->getDataModel()), $createResource)

diff --git a/src/NilPortugues/Laravel5/JsonApi/Controller/JsonApiTrait.php b/src/NilPortugues/Laravel5/JsonApi/Controller/JsonApiTrait.php
@@ -10,6 +10,7 @@
 
 namespace NilPortugues\Laravel5\JsonApi\Controller;
 
+use Carbon\Carbon;
 use Illuminate\Container\Container;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
@@ -197,10 +198,16 @@ protected function patchAction(Request $request, $id)
 
         $resource = new PatchResource($this->serializer);
 
+        $model = $this->getDataModel();
+        $data = (array) $request->get('data');
+        if (array_key_exists('attributes', $data) && $model->timestamps) {
+            $data['attributes'][$model::UPDATED_AT] = Carbon::now()->toDateTimeString();
+        }
+
         return $this->addHeaders(
             $resource->get(
                 $id,
-                (array) $request->get('data'),
+                $data,
                 get_class($this->getDataModel()),
                 $find,
                 $update