wip

Author: tobyzerner

src/Adapter/AdapterInterface.php

@@ -34,6 +34,8 @@ public function saveHasMany($model, HasMany $relationship, array $related);
 
     public function delete($model);
 
+    public function filterByIds($query, array $ids);
+
     public function filterByAttribute($query, Attribute $attribute, $value);
 
     public function filterByHasOne($query, HasOne $relationship, array $ids);

src/Adapter/EloquentAdapter.php

@@ -117,6 +117,13 @@ public function delete($model)
         $model->delete();
     }
 
+    public function filterByIds($query, array $ids)
+    {
+        $key = $query->getModel()->getQualifiedKeyName();
+
+        $query->whereIn($key, $ids);
+    }
+
     public function filterByAttribute($query, Attribute $field, $value)
     {
         $property = $this->getAttributeProperty($field);
@@ -145,8 +152,9 @@ public function filterByAttribute($query, Attribute $field, $value)
 
     public function filterByHasOne($query, HasOne $field, array $ids)
     {
-        $property = $this->getRelationshipProperty($field);
-        $foreignKey = $query->getModel()->{$property}()->getQualifiedForeignKey();
+        $relation = $query->getModel()->{$this->getRelationshipProperty($field)}();
+
+        $foreignKey = $relation->getQualifiedForeignKeyName();
 
         $query->whereIn($foreignKey, $ids);
     }

src/Exception/ResourceNotFoundException.php

@@ -25,12 +25,17 @@ public function getJsonApiErrors(): array
         return [
             new Error(
                 new Error\Title('Resource Not Found'),
-                new Error\Status('404'),
+                new Error\Status($this->getJsonApiStatus()),
                 new Error\Detail($this->getMessage())
             )
         ];
     }
 
+    public function getJsonApiStatus(): string
+    {
+        return '404';
+    }
+
     public function getType(): string
     {
         return $this->type;

src/Handler/Create.php

@@ -32,11 +32,31 @@ public function handle(Request $request): Response
 
         $model = $this->resource->getAdapter()->create();
 
+        $data = $this->parseData($request->getParsedBody());
+
+        $adapter = $this->resource->getAdapter();
+
+        $this->assertFieldsExist($data);
+
+        $this->assertFieldsWritable($data, $model, $request);
+
+        $this->fillDefaultValues($data, $request);
+
+        $this->loadRelatedResources($data, $request);
+
+        $this->assertDataValid($data, $model, $request, true);
+
+        $this->applyValues($data, $model, $request);
+
         foreach ($schema->creatingCallbacks as $callback) {
             $callback($request, $model);
         }
 
-        $this->save($model, $request, true);
+        $adapter->save($model);
+
+        $this->saveFields($data, $model, $request);
+
+        $this->runSavedCallbacks($data, $model, $request);
 
         foreach ($schema->createdCallbacks as $callback) {
             $callback($request, $model);

src/Handler/Index.php

@@ -40,11 +40,11 @@ public function handle(Request $request): Response
         $query = $adapter->query();
 
         foreach ($schema->scopes as $scope) {
-            $scope($request, $query);
+            $request = $scope($request, $query) ?: $request;
         }
 
         foreach ($schema->indexScopes as $scope) {
-            $scope($request, $query);
+            $request = $scope($request, $query) ?: $request;
         }
 
         if ($filter = $request->getAttribute('jsonApiFilter')) {
@@ -57,7 +57,9 @@ public function handle(Request $request): Response
 
         $paginationLinks = [];
         $members = [
-            new Link\SelfLink($this->buildUrl($request))
+            new Link\SelfLink($this->buildUrl($request)),
+            new Meta('offset', $offset),
+            new Meta('limit', $limit),
         ];
 
         if ($offset > 0) {
@@ -197,9 +199,7 @@ private function extractQueryParams(Request $request): Request
             }
 
             foreach ($filter as $name => $value) {
-                if (! isset($schema->fields[$name])
-                    || ! $schema->fields[$name]->filterable
-                ) {
+                if ($name !== 'id' && (! isset($schema->fields[$name]) || ! $schema->fields[$name]->filterable)) {
                     throw new BadRequestException("Invalid filter [$name]", "filter[$name]");
                 }
             }
@@ -261,6 +261,11 @@ private function filter($query, $filter, Request $request)
         $adapter = $this->resource->getAdapter();
 
         foreach ($filter as $name => $value) {
+            if ($name === 'id') {
+                $adapter->filterByIds($query, explode(',', $value));
+                continue;
+            }
+
             $field = $schema->fields[$name];
 
             if ($field->filter) {