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
21 changes: 10 additions & 11 deletions routes/api.php
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
<?php

use Binaryk\LaravelRestify\Http\Controllers\GlobalSearchController;
use Binaryk\LaravelRestify\Http\Controllers\RepositoryAttachController;
use Binaryk\LaravelRestify\Http\Controllers\RepositoryDestroyController;
use Binaryk\LaravelRestify\Http\Controllers\RepositoryFilterController;
use Binaryk\LaravelRestify\Http\Controllers\RepositoryIndexController;
use Binaryk\LaravelRestify\Http\Controllers\RepositoryAttachController;
use Binaryk\LaravelRestify\Http\Controllers\RepositoryShowController;
use Binaryk\LaravelRestify\Http\Controllers\RepositoryStoreController;
use Binaryk\LaravelRestify\Http\Controllers\RepositoryUpdateController;
use Illuminate\Support\Facades\Route;

// Global Search...
Route::get('/search', '\\' . GlobalSearchController::class);
Route::get('/search', '\\'.GlobalSearchController::class);

// Filters
Route::get('/{repository}/filters', '\\' . RepositoryFilterController::class);
Route::get('/{repository}/filters', '\\'.RepositoryFilterController::class);

// API CRUD
Route::get('/{repository}', '\\' . RepositoryIndexController::class);
Route::post('/{repository}', '\\' . RepositoryStoreController::class);
Route::get('/{repository}/{repositoryId}', '\\' . RepositoryShowController::class);
Route::patch('/{repository}/{repositoryId}', '\\' . RepositoryUpdateController::class);
Route::put('/{repository}/{repositoryId}', '\\' . RepositoryUpdateController::class);
Route::delete('/{repository}/{repositoryId}', '\\' . RepositoryDestroyController::class);

Route::get('/{repository}', '\\'.RepositoryIndexController::class);
Route::post('/{repository}', '\\'.RepositoryStoreController::class);
Route::get('/{repository}/{repositoryId}', '\\'.RepositoryShowController::class);
Route::patch('/{repository}/{repositoryId}', '\\'.RepositoryUpdateController::class);
Route::put('/{repository}/{repositoryId}', '\\'.RepositoryUpdateController::class);
Route::delete('/{repository}/{repositoryId}', '\\'.RepositoryDestroyController::class);

// Attach related repository id
Route::post('/{repository}/{repositoryId}/attach/{relatedRepository}', '\\' . RepositoryAttachController::class);
Route::post('/{repository}/{repositoryId}/attach/{relatedRepository}', '\\'.RepositoryAttachController::class);
3 changes: 1 addition & 2 deletions src/Http/Controllers/RepositoryAttachController.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public function __invoke(RepositoryAttachRequest $request)
return $repository->attach(
$request, $request->repositoryId,
collect(Arr::wrap($request->input($request->relatedRepository)))
->map(fn($relatedRepositoryId) => $this->initializePivot(
->map(fn ($relatedRepositoryId) => $this->initializePivot(
$request, $model->{$request->viaRelationship ?? $request->relatedRepository}(), $relatedRepositoryId
))
);
Expand Down Expand Up @@ -61,5 +61,4 @@ protected function initializePivot(RestifyRequest $request, $relationship, $rela

return $pivot;
}

}
10 changes: 3 additions & 7 deletions src/Http/Requests/InteractWithRepositories.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function repository($key = null): ?Repository
]), 404);
}

if (!$repository::authorizedToUseRepository($this)) {
if (! $repository::authorizedToUseRepository($this)) {
throw new UnauthorizedException(__('Unauthorized to view repository :name. See "allowRestify" policy.', [
'name' => $repository,
]), 403);
Expand Down Expand Up @@ -114,7 +114,7 @@ public function newRepositoryWith($model, $uriKey = null)
*/
public function newQueryWithoutScopes($uriKey = null)
{
if (!$this->isViaRepository()) {
if (! $this->isViaRepository()) {
return $this->model($uriKey)->newQueryWithoutScopes();
}

Expand Down Expand Up @@ -170,15 +170,13 @@ public function findRelatedModelOrFail()
});
}


public function findRelatedQuery($relatedRepository = null, $relatedRepositoryId = null)
{
return $this->repository($relatedRepository ?? request('relatedRepository'))::newModel()
->newQueryWithoutScopes()
->whereKey($relatedRepositoryId ?? request('relatedRepositoryId'));
}


protected function findPivot(RestifyRequest $request, $model)
{
$pivot = $model->{$request->relatedRepository}()->getPivotAccessor();
Expand All @@ -193,7 +191,7 @@ public function viaParentModel()
{
$parent = $this->repository($this->viaRepository);

return once(fn() => $parent::newModel()->newQueryWithoutScopes()->whereKey($this->viaRepositoryId)->firstOrFail());
return once(fn () => $parent::newModel()->newQueryWithoutScopes()->whereKey($this->viaRepositoryId)->firstOrFail());
}

public function viaQuery()
Expand All @@ -217,6 +215,4 @@ public function relatedRepository()
{
return Restify::repositoryForKey($this->relatedRepository);
}


}
1 change: 0 additions & 1 deletion src/Http/Requests/RepositoryAttachRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@

class RepositoryAttachRequest extends RestifyRequest
{

}
5 changes: 2 additions & 3 deletions src/Repositories/Repository.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Binaryk\LaravelRestify\Fields\Field;
use Binaryk\LaravelRestify\Fields\FieldCollection;
use Binaryk\LaravelRestify\Filter;
use Binaryk\LaravelRestify\Http\Requests\RepositoryAttachRequest;
use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
use Binaryk\LaravelRestify\Restify;
use Binaryk\LaravelRestify\Services\Search\RepositorySearchService;
Expand Down Expand Up @@ -578,8 +577,8 @@ public function update(RestifyRequest $request, $repositoryId)
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 Down
6 changes: 3 additions & 3 deletions tests/Controllers/RepositoryPivotControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public function test_attach_a_user_to_a_company()
$user = $this->mockUsers(2)->first();
$company = factory(Company::class)->create();

$response = $this->postJson('restify-api/companies/' . $company->id . '/attach/users', [
$response = $this->postJson('restify-api/companies/'.$company->id.'/attach/users', [
'users' => $user->id,
'is_admin' => true,
])
Expand All @@ -32,7 +32,7 @@ public function test_attach_multiple_users_to_a_company()
$usersFromCompany = $this->getJson('/restify-api/users?viaRepository=companies&viaRepositoryId=1&viaRelationship=users');
$this->assertCount(0, $usersFromCompany->json('data'));

$response = $this->postJson('restify-api/companies/' . $company->id . '/attach/users', [
$response = $this->postJson('restify-api/companies/'.$company->id.'/attach/users', [
'users' => [1, 2],
'is_admin' => true,
])
Expand All @@ -56,7 +56,7 @@ public function test_after_attach_a_user_to_company_number_of_users_increased()
$usersFromCompany = $this->getJson('/restify-api/users?viaRepository=companies&viaRepositoryId=1&viaRelationship=users');
$this->assertCount(0, $usersFromCompany->json('data'));

$this->postJson('restify-api/companies/' . $company->id . '/attach/users', [
$this->postJson('restify-api/companies/'.$company->id.'/attach/users', [
'users' => $user->id,
]);

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/Company/Company.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public function users()
{
return $this->belongsToMany(User::class, 'company_user', 'company_id', 'user_id')
->withPivot([
'is_admin'
'is_admin',
])
->withTimestamps();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/User/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function posts()
public function companies()
{
return $this->belongsToMany(Company::class, 'company_user', 'user_id', 'company_id')->withPivot([
'is_admin'
'is_admin',
])->withTimestamps();
}

Expand Down