A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: subtask api and controller are poorly laid out and have redundant code
aminnausin36e248fb03c9
diff --git a/app/Http/Controllers/Api/V1/SubTaskController.php b/app/Http/Controllers/Api/V1/SubTaskController.phpindex e5c25566..1c538af1 100644--- a/app/Http/Controllers/Api/V1/SubTaskController.php+++ b/app/Http/Controllers/Api/V1/SubTaskController.php@@ -7,80 +7,37 @@ use App\Http\Resources\SubTasksResource;use App\Models\SubTask;use App\Models\Task;use App\Traits\HttpResponses;-use Illuminate\Http\Request;use Illuminate\Support\Facades\Auth;+use Illuminate\Support\Facades\Log;class SubTaskController extends Controller {use HttpResponses;- /**- * Display a listing of the resource.- */- public function index() {- //- }-- /**- * Show the form for creating a new resource.- */- public function create() {- //- }-- /**- * Store a newly created resource in storage.- */- public function store(Request $request) {- //- }-/*** Display the specified resource.*/- public function show(Request $request, Task $task) {- if (Auth::id() !== 1) {- return $this->forbidden();- }-- try {- return- SubTasksResource::collection(- SubTask::where('task_id', $task->id)->get()->sortBy('id')- );- } catch (\Throwable $th) {- return $this->error(null, 'Unable to get related subtasks. Error: ' . $th->getMessage(), 500);- }- }-- /**- * Show the form for editing the specified resource.- */- public function edit(string $id) {- //- }-- /**- * Update the specified resource in storage.- */- public function update(Request $request, string $id) {- //+ public function show(Task $task) {+ return SubTasksResource::collection(+ SubTask::where('task_id', $task->id)->orderBy('id')->get()+ );}/*** Remove the specified resource from storage.*- * @param int $id* @return \Illuminate\Http\Response*/public function destroy(SubTask $subTask) {- return $this->isNotAuthorised() ?? $subTask->delete() ? $this->success('', 'Success', 200) : $this->error($subTask, 'Not found', 404);- }+ $taskId = $subTask->task_id;+ $subTaskId = $subTask->id;+ $subTask->delete();- private function isNotAuthorised() {- if (Auth::id() != 1) {- return $this->error('', 'Unauthorised request.', 403);- }+ Log::info('Subtask deleted', [+ 'subtask_id' => $subTaskId,+ 'task_id' => $taskId,+ 'user_id' => Auth::id(),+ ]);- return null;+ return response()->noContent();}}diff --git a/routes/api.php b/routes/api.phpindex 8581e642..e95212c8 100755--- a/routes/api.php+++ b/routes/api.php@@ -122,12 +122,13 @@ Route::group(['middleware' => ['auth:sanctum']], function () {Route::get('/user-view-count/{metadata}', [RecordController::class, 'userViewCount']);// Server- Route::resource('/tasks', TaskController::class)->only(['index', 'destroy']);- Route::resource('/sub-tasks', SubTaskController::class)->only(['show', 'destroy']);Route::resource('/analytics', AnalyticsController::class)->only(['index']);+ Route::prefix('sub-tasks')->middleware('can:admin')->group(function () {+ Route::get('/{task}', [SubTaskController::class, 'show']);+ Route::delete('/{subTask}', [SubTaskController::class, 'destroy']);+ });- Route::post('/sub-tasks/{task}', [SubTaskController::class, 'show']);-+ Route::resource('/tasks', TaskController::class)->only(['index', 'destroy']);Route::prefix('tasks')->group(function () {Route::get('/stats', [TaskController::class, 'stats']);Route::get('/wait-times', [TaskController::class, 'waitTimes']);