Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/Models/CreationAware.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Binaryk\LaravelRestify\Models;


interface CreationAware
{
public static function createWithAttributes(array $attributes): ?self;
Expand Down
54 changes: 27 additions & 27 deletions src/Repositories/Repository.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public static function newModel(): Model

public static function query(RestifyRequest $request)
{
if (!$request->isViaRepository()) {
if (! $request->isViaRepository()) {
return static::newModel()->query();
}

Expand Down Expand Up @@ -279,8 +279,8 @@ public function collectFields(RestifyRequest $request)

if ($this instanceof Mergeable) {
$fillable = collect($this->resource->getFillable())
->filter(fn($attribute) => $fields->contains('attribute', $attribute) === false)
->map(fn($attribute) => Field::new($attribute));
->filter(fn ($attribute) => $fields->contains('attribute', $attribute) === false)
->map(fn ($attribute) => Field::new($attribute));

$fields = $fields->merge($fillable);
}
Expand All @@ -291,14 +291,14 @@ public function collectFields(RestifyRequest $request)
private function indexFields(RestifyRequest $request): Collection
{
return $this->collectFields($request)
->filter(fn(Field $field) => !$field->isHiddenOnIndex($request, $this))
->filter(fn (Field $field) => ! $field->isHiddenOnIndex($request, $this))
->values();
}

private function showFields(RestifyRequest $request): Collection
{
return $this->collectFields($request)
->filter(fn(Field $field) => !$field->isHiddenOnShow($request, $this))
->filter(fn (Field $field) => ! $field->isHiddenOnShow($request, $this))
->values();
}

Expand Down Expand Up @@ -412,10 +412,10 @@ public static function routes(Router $router, $attributes, $wrap = false)
public function resolveShowAttributes(RestifyRequest $request)
{
$fields = $this->showFields($request)
->filter(fn(Field $field) => $field->authorize($request))
->each(fn(Field $field) => $field->resolveForShow($this))
->map(fn(Field $field) => $field->serializeToValue($request))
->mapWithKeys(fn($value) => $value)
->filter(fn (Field $field) => $field->authorize($request))
->each(fn (Field $field) => $field->resolveForShow($this))
->map(fn (Field $field) => $field->serializeToValue($request))
->mapWithKeys(fn ($value) => $value)
->all();

if ($this instanceof Mergeable) {
Expand All @@ -433,7 +433,7 @@ public function resolveShowAttributes(RestifyRequest $request)
return false;
}

if (!$field->authorize($request)) {
if (! $field->authorize($request)) {
return false;
}

Expand All @@ -454,10 +454,10 @@ public function resolveIndexAttributes($request)
{
// Resolve the show method, and attach the value to the array
$fields = $this->indexFields($request)
->filter(fn(Field $field) => $field->authorize($request))
->each(fn(Field $field) => $field->resolveForIndex($this))
->map(fn(Field $field) => $field->serializeToValue($request))
->mapWithKeys(fn($value) => $value)
->filter(fn (Field $field) => $field->authorize($request))
->each(fn (Field $field) => $field->resolveForIndex($this))
->map(fn (Field $field) => $field->serializeToValue($request))
->mapWithKeys(fn ($value) => $value)
->all();

if ($this instanceof Mergeable) {
Expand All @@ -475,7 +475,7 @@ public function resolveIndexAttributes($request)
return false;
}

if (!$field->authorize($request)) {
if (! $field->authorize($request)) {
return false;
}

Expand Down Expand Up @@ -542,7 +542,7 @@ public function resolveRelationships($request): array
}

$withs[$relation] = $paginator instanceof Collection
? $paginator->map(fn(Model $item) => [
? $paginator->map(fn (Model $item) => [
'attributes' => $item->toArray(),
])
: $paginator;
Expand Down Expand Up @@ -599,10 +599,10 @@ public function index(RestifyRequest $request)

return $this->response([
'meta' => $this->resolveIndexMainMeta(
$request, $items->map(fn(self $repository) => $repository->resource), RepositoryCollection::meta($paginator->toArray())
$request, $items->map(fn (self $repository) => $repository->resource), RepositoryCollection::meta($paginator->toArray())
) ?? RepositoryCollection::meta($paginator->toArray()),
'links' => RepositoryCollection::paginationLinks($paginator->toArray()),
'data' => $items->map(fn(self $repository) => $repository->serializeForIndex($request)),
'data' => $items->map(fn (self $repository) => $repository->serializeForIndex($request)),
]);
}

Expand Down Expand Up @@ -640,7 +640,7 @@ public function store(RestifyRequest $request)
}
}

$this->storeFields($request)->each(fn(Field $field) => $field->invokeAfter($request, $this->resource));
$this->storeFields($request)->each(fn (Field $field) => $field->invokeAfter($request, $this->resource));
});

static::stored($this->resource, $request);
Expand All @@ -664,7 +664,7 @@ public function storeBulk(RepositoryStoreBulkRequest $request)

$this->resource->save();

$this->storeBulkFields($request)->each(fn(Field $field) => $field->invokeAfter($request, $this->resource));
$this->storeBulkFields($request)->each(fn (Field $field) => $field->invokeAfter($request, $this->resource));

return $this->resource;
});
Expand Down Expand Up @@ -711,8 +711,8 @@ public function updateBulk(RestifyRequest $request, $repositoryId, int $row)
public function attach(RestifyRequest $request, $repositoryId, Collection $pivots)
{
DB::transaction(function () use ($request, $pivots) {
return $pivots->map(fn($pivot) => $pivot->forceFill($request->except($request->relatedRepository)))
->map(fn($pivot) => $pivot->save());
return $pivots->map(fn ($pivot) => $pivot->forceFill($request->except($request->relatedRepository)))
->map(fn ($pivot) => $pivot->save());
});

return $this->response()
Expand All @@ -723,7 +723,7 @@ public function attach(RestifyRequest $request, $repositoryId, Collection $pivot
public function detach(RestifyRequest $request, $repositoryId, Collection $pivots)
{
$deleted = DB::transaction(function () use ($pivots) {
return $pivots->map(fn($pivot) => $pivot->delete());
return $pivots->map(fn ($pivot) => $pivot->delete());
});

return $this->response()
Expand Down Expand Up @@ -833,7 +833,7 @@ public function response($content = '', $status = 200, array $headers = []): Res
public function serializeForShow(RestifyRequest $request): array
{
return $this->filter([
'id' => $this->when($this->resource->id, fn() => $this->getShowId($request)),
'id' => $this->when($this->resource->id, fn () => $this->getShowId($request)),
'type' => $this->when($type = $this->getType($request), $type),
'attributes' => $request->isShowRequest() ? $this->resolveShowAttributes($request) : $this->resolveIndexAttributes($request),
'relationships' => $this->when(value($related = $this->resolveRelationships($request)), $related),
Expand All @@ -846,7 +846,7 @@ public function serializeForIndex(RestifyRequest $request): array
return $this->filter([
'id' => $this->when($id = $this->getShowId($request), $id),
'type' => $this->when($type = $this->getType($request), $type),
'attributes' => $this->when((bool)$attrs = $this->resolveIndexAttributes($request), $attrs),
'attributes' => $this->when((bool) $attrs = $this->resolveIndexAttributes($request), $attrs),
'relationships' => $this->when(value($related = $this->resolveRelationships($request)), $related),
'meta' => $this->when(value($meta = $this->resolveIndexMeta($request)), $meta),
]);
Expand Down Expand Up @@ -896,12 +896,12 @@ protected static function fillBulkFields(RestifyRequest $request, Model $model,

public static function uriTo(Model $model)
{
return Restify::path() . '/' . static::uriKey() . '/' . $model->getKey();
return Restify::path().'/'.static::uriKey().'/'.$model->getKey();
}

public function availableFilters(RestifyRequest $request)
{
return collect($this->filter($this->filters($request)))->each(fn(Filter $filter) => $filter->authorizedToSee($request))
return collect($this->filter($this->filters($request)))->each(fn (Filter $filter) => $filter->authorizedToSee($request))
->values();
}

Expand Down