From c6eaf2f12b4265041c5e9f15651aa294afdf3d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 14 Dec 2023 17:12:19 +0100 Subject: [PATCH] MediaController refactor getMediaOtherInfos --- app/Http/Controllers/MediaController.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php index 0c625c0..a2434c4 100644 --- a/app/Http/Controllers/MediaController.php +++ b/app/Http/Controllers/MediaController.php @@ -34,12 +34,12 @@ use App\Models\Sujet; use App\Models\Tag; use App\Models\TypeMedia; use App\Traits\Http\HandlesMedia; +use Illuminate\Contracts\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Arr; -use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Storage; @@ -757,15 +757,16 @@ class MediaController extends Controller */ public function getMediaOtherInfos(Media $media): JsonResponse { - if (!($user = Auth::user())) { + if (!auth()->check()) { abort(401, 'Cette action n\'est pas autorisée.'); } - $history = Historique::whereHas('media', function ($q) use ($media) { - $q->whereId($media->id); - })->with('user') + $history = Historique::query() + ->whereHas('media', fn (Builder $q) => $q->where('id', $media->id)) + ->with('user') ->orderBy('created_date', 'DESC') ->get(); + return \response()->json([ 'history' => $history, 'vignettes' => $this->getVignettesByMedia($media)