Skip to content

Commit 213f639

Browse files
phpsacraigAtCD
andauthored
Feature/scoped get delete (#79)
* Get / update / Delete should be retrievable via scopes * mismatched record identifier * Apply fixes from StyleCI (#80) Co-authored-by: Craig Smith <[email protected]> * unused parameter Co-authored-by: Craig Smith <[email protected]> Co-authored-by: Craig Smith <[email protected]>
1 parent 5484c48 commit 213f639

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/Http/Api/Controller.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Phpsa\LaravelApiController\Contracts\Parser;
1212
use Phpsa\LaravelApiController\Contracts\Relationships;
1313
use Phpsa\LaravelApiController\Events\Created;
14-
use Phpsa\LaravelApiController\Events\Deleted;
1514
use Phpsa\LaravelApiController\Events\Updated;
1615
use Phpsa\LaravelApiController\Exceptions\ApiException;
1716
use Phpsa\LaravelApiController\Http\Api\Contracts\HasModel;
@@ -208,11 +207,10 @@ public function handleUpdateAction($id, $request, array $extraParams = [])
208207
$this->validateRequestType($request);
209208

210209
$this->handleCommonActions($request);
211-
$fields = $this->parseFieldParams();
212210

213211
try {
214212
$item = $this->repository->find($id);
215-
$this->authoriseUserAction('update', self::$model::find($id));
213+
$this->authoriseUserAction('update', $item);
216214
} catch (ModelNotFoundException $exception) {
217215
return $this->errorNotFound('Record does not exist');
218216
}

src/Http/Resources/ApiResource.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
namespace Phpsa\LaravelApiController\Http\Resources;
44

5-
use Phpsa\LaravelApiController\Helpers;
65
use Illuminate\Http\Resources\Json\JsonResource;
7-
use Phpsa\LaravelApiController\Http\Resources\Contracts\CaseFormat;
86
use Phpsa\LaravelApiController\Http\Resources\Contracts\AllowableFields;
7+
use Phpsa\LaravelApiController\Http\Resources\Contracts\CaseFormat;
98

109
class ApiResource extends JsonResource
1110
{

src/Http/Resources/Contracts/AllowableFields.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ protected function getResourceFields(): array
124124
return is_array($this->resource) ? $this->resource : $this->resource->getAttributes();
125125
}
126126

127-
/**
127+
/**
128128
* Return default fields for this collection.
129129
*
130130
* @return array
@@ -133,8 +133,10 @@ public static function getDefaultFields($request): array
133133
{
134134
if (method_exists(get_called_class(), 'defaultFields')) {
135135
$c = get_called_class();
136+
136137
return $c::defaultFields($request);
137138
}
139+
138140
return static::$defaultFields ?? ['*'];
139141
}
140142

@@ -148,8 +150,10 @@ public static function getAllowedScopes($request): array
148150
{
149151
if (method_exists(get_called_class(), 'defaultScopes')) {
150152
$c = get_called_class();
153+
151154
return $c::defaultScopes($request);
152155
}
156+
153157
return static::$allowedScopes ?? [];
154158
}
155159
}

0 commit comments

Comments
 (0)