From 5fb43dd159b1af02c82f2b3a3f3530c9ca6612ec Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Sep 2024 16:55:56 +0100 Subject: [PATCH] Handle `audit` *and* `audits` for urls Signed-off-by: snipe --- app/Http/Controllers/Api/AssetsController.php | 16 ++++++++++++++-- routes/api.php | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 9cd05b49ca..882126f665 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -56,6 +56,11 @@ class AssetsController extends Controller public function index(Request $request, $action = null, $upcoming_status = null) : JsonResponse | array { + + // This handles the legacy audit endpoints :( + if ($action == 'audit') { + $action = 'audits'; + } $filter_non_deprecable_assets = false; /** @@ -155,30 +160,37 @@ class AssetsController extends Controller */ switch ($action) { // Audit (singular) is left over from earlier legacy APIs - case ('audit' || 'audits'): - + case 'audits' : + \Log::error('audit/audits'); switch ($upcoming_status) { case 'due': + \Log::error('due'); $assets->DueForAudit($settings); break; case 'overdue': + \Log::error('overdue'); $assets->OverdueForAudit(); break; case 'due-or-overdue': + \Log::error('due-or-overdue'); $assets->DueOrOverdueForAudit($settings); break; } break; case 'checkins': + \Log::error('checkins'); switch ($upcoming_status) { case 'due': + \Log::error('due'); $assets->DueForCheckin($settings); break; case 'overdue': + \Log::error('overdue'); $assets->OverdueForCheckin(); break; case 'due-or-overdue': + \Log::error('due-or-overdue'); $assets->DueOrOverdueForCheckin($settings); break; } diff --git a/routes/api.php b/routes/api.php index 8e3c02af04..0581a04682 100644 --- a/routes/api.php +++ b/routes/api.php @@ -498,7 +498,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi - // This gets the "due or overdue" API endpoints for audits and checkins + // This gets the "due or overdue" API endpoints for audit/audits and checkins Route::get('{action}/{upcoming_status}', [ Api\AssetsController::class,