From 01b5ec80a623b9cccf82ad2a6e7df43cca15c280 Mon Sep 17 00:00:00 2001 From: AVMG20 Date: Tue, 12 Oct 2021 21:37:11 +0200 Subject: [PATCH] cleanup --- app/Http/Controllers/Api/NotificationController.php | 11 ++++++----- app/Http/Controllers/Api/ServerController.php | 8 ++------ app/Http/Controllers/Api/UserController.php | 3 +-- app/Http/Controllers/Api/VoucherController.php | 3 +-- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Api/NotificationController.php b/app/Http/Controllers/Api/NotificationController.php index 9f187e9d..9fe61c79 100644 --- a/app/Http/Controllers/Api/NotificationController.php +++ b/app/Http/Controllers/Api/NotificationController.php @@ -57,6 +57,7 @@ class NotificationController extends Controller * * @param Request $request * @return JsonResponse + * @throws ValidationException */ public function send(Request $request) { @@ -89,11 +90,11 @@ class NotificationController extends Controller } else { $userIds = explode(",", $data["users"]); $users = User::query() - ->whereIn("id", $userIds) - ->orWhereHas('discordUser' , function (Builder $builder) use ($userIds) { - $builder->whereIn('id' , $userIds); - }) - ->get(); + ->whereIn("id", $userIds) + ->orWhereHas('discordUser', function (Builder $builder) use ($userIds) { + $builder->whereIn('id', $userIds); + }) + ->get(); } if ($users->count() == 0) { diff --git a/app/Http/Controllers/Api/ServerController.php b/app/Http/Controllers/Api/ServerController.php index 17e2be74..566bec71 100644 --- a/app/Http/Controllers/Api/ServerController.php +++ b/app/Http/Controllers/Api/ServerController.php @@ -14,7 +14,7 @@ use Spatie\QueryBuilder\QueryBuilder; class ServerController extends Controller { const ALLOWED_INCLUDES = ['product', 'user']; - const ALLOWED_FILTERS = ['name', 'suspended', 'identifier', 'pterodactyl_id', 'user_id' , 'product_id']; + const ALLOWED_FILTERS = ['name', 'suspended', 'identifier', 'pterodactyl_id', 'user_id', 'product_id']; /** * Display a listing of the resource. @@ -31,9 +31,6 @@ class ServerController extends Controller return $query->paginate($request->input('per_page') ?? 50); } - - - /** * Display the specified resource. * @@ -43,13 +40,12 @@ class ServerController extends Controller public function show(Server $server) { $query = QueryBuilder::for(Server::class) - ->where('id' ,'=' , $server->id) + ->where('id', '=', $server->id) ->allowedIncludes(self::ALLOWED_INCLUDES); return $query->get(); } - /** * Remove the specified resource from storage. * diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index f01abf67..fbf0c0e8 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -13,7 +13,6 @@ use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Contracts\Routing\ResponseFactory; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; -use Illuminate\Http\Client\RequestException; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\App; @@ -166,7 +165,7 @@ class UserController extends Controller } /** - * @throws RequestException + * @throws ValidationException */ public function store(Request $request) { diff --git a/app/Http/Controllers/Api/VoucherController.php b/app/Http/Controllers/Api/VoucherController.php index 3e005219..69f0176f 100644 --- a/app/Http/Controllers/Api/VoucherController.php +++ b/app/Http/Controllers/Api/VoucherController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Api; use App\Http\Controllers\Controller; -use App\Models\Server; use App\Models\Voucher; use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Database\Eloquent\Collection; @@ -69,7 +68,7 @@ class VoucherController extends Controller public function show(int $id) { $query = QueryBuilder::for(Voucher::class) - ->where('id' ,'=' , $id) + ->where('id', '=', $id) ->allowedIncludes(self::ALLOWED_INCLUDES); return $query->get();