diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 0c97cb4..32792c2 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -151,4 +151,14 @@ class UserController extends Controller return response()->json(['message' => "Server error"], 500); } } + + public function getUserTasks(Request $request): JsonResponse { + + try { + return response()->json(['data' => $request->user()->tasks]); + } catch (\Exception $e) { + Log::info($e->getMessage()); + return response()->json(['message' => "Server error"], 500); + } + } } diff --git a/routes/api.php b/routes/api.php index 399bb5f..2b74a08 100644 --- a/routes/api.php +++ b/routes/api.php @@ -18,7 +18,7 @@ Route::post("/users/register", [UserController::class, "create"]); Route::middleware('web')->post('/users/login', [AuthController::class, 'login']); -Route::middleware(['web', 'auth:sanctum'])->get('/me', function (Request $request) { +Route::middleware(['web', 'auth:sanctum'])->get('/users/me', function (Request $request) { return $request->user(); }); @@ -26,15 +26,19 @@ Route::middleware(['web', 'auth:sanctum'])->post('/users/logout', [AuthControlle Route::middleware(['web', 'auth:sanctum'])->delete('/users', [UserController::class, "delete"]); -Route::middleware(['web', 'auth:sanctum'])->delete('/users/{id}', [UserController::class, "deleteById"]); +Route::middleware(['web', 'auth:sanctum'])->delete('/users/{id}', [UserController::class, "deleteById"]) + ->whereNumber('id'); -Route::middleware(['web', 'auth:sanctum'])->get('/users/{id}', [UserController::class, "getUser"]); +Route::middleware(['web', 'auth:sanctum'])->get('/users/{id}', [UserController::class, "getUser"]) + ->whereNumber('id'); Route::middleware(['web', 'auth:sanctum'])->post('/users/update', [UserController::class, "update"]); -Route::middleware(['web', 'auth:sanctum'])->post('/users/{id}/validate', [UserController::class, "validate"]); +Route::middleware(['web', 'auth:sanctum'])->post('/users/{id}/validate', [UserController::class, "validate"]) + ->whereNumber('id'); -Route::middleware(['web', 'auth:sanctum'])->post('/users/{id}/role', [UserController::class, "addRole"]); +Route::middleware(['web', 'auth:sanctum'])->post('/users/{id}/role', [UserController::class, "addRole"]) + ->whereNumber('id'); Route::middleware(['web', 'auth:sanctum'])->get('/users', [UserController::class, "getUsers"]); @@ -44,9 +48,13 @@ Route::middleware(['web', 'auth:sanctum'])->post('/events/task', [TasksControlle Route::middleware(['web', 'auth:sanctum'])->post('/events/task/assign', [TasksController::class, "assignSelf"]); -Route::middleware(['web', 'auth:sanctum'])->post('/events/task/assign/{id}', [TasksController::class, "assignUser"]); +Route::middleware(['web', 'auth:sanctum'])->post('/events/task/assign/{id}', [TasksController::class, "assignUser"]) + ->whereNumber('id'); -Route::post("/users/{id}/create/notification", [NotificationsController::class, "create"]); +Route::post("/users/{id}/create/notification", [NotificationsController::class, "create"]) + ->whereNumber('id'); -Route::middleware(['web', 'auth:sanctum'])->get('/users/{id}/notifications', [NotificationsController::class, "getNotifications"]); +Route::middleware(['web', 'auth:sanctum'])->get('/users/{id}/notifications', [NotificationsController::class, "getNotifications"]) + ->whereNumber('id'); +Route::middleware(['web', 'auth:sanctum'])->get('/users/tasks', [UserController::class, "getUserTasks"]); diff --git a/tests/Events/tasks/Assign task to user.bru b/tests/Events/tasks/Assign task to user.bru index 9b4dd97..15cf31b 100644 --- a/tests/Events/tasks/Assign task to user.bru +++ b/tests/Events/tasks/Assign task to user.bru @@ -10,10 +10,6 @@ post { auth: inherit } -headers { - X-XSRF-TOKEN: eyJpdiI6Im9TOXR2dG96amtTazVlRDh0dkRLZGc9PSIsInZhbHVlIjoiaWgyNG13UXpMRnRVRlRTVTFmOVN5b20rWjhSOEdhUEFRUEo5Qm9ZUDYybTZhSnJxWjEzNWN1cEhVRm9yc3c2UE1tNkZnNFpJZHZUTXVkSC92VnFvZ0ZXT3dLNGRrT2FIRzdvdFZyTFV4M3VlMlM5MmlOc2FkVGhDeUJQczBLdS8iLCJtYWMiOiIyYWY5NjBiZjJlOTZhM2UxNGU5MDg1YTIwNTIzZjFjNzQyNDAzODYwMDI4MzFkOGM2ZWQyNTlkZWVkZjg3MzhhIiwidGFnIjoiIn0= -} - body:json { { "task_id": "{{task_id}}" @@ -21,8 +17,8 @@ body:json { } vars:pre-request { - id: 2 - task_id: 2 + id: 1 + task_id: 3 } settings { diff --git a/tests/Events/tasks/Assign task.bru b/tests/Events/tasks/Assign task.bru index f8a4143..74cda3e 100644 --- a/tests/Events/tasks/Assign task.bru +++ b/tests/Events/tasks/Assign task.bru @@ -10,10 +10,6 @@ post { auth: inherit } -headers { - X-XSRF-TOKEN: -} - body:json { { "task_id": "{{taskId}}" diff --git a/tests/Events/tasks/create event task.bru b/tests/Events/tasks/create event task.bru index 6bcc342..4f00dd7 100644 --- a/tests/Events/tasks/create event task.bru +++ b/tests/Events/tasks/create event task.bru @@ -10,16 +10,12 @@ post { auth: inherit } -headers { - X-XSRF-TOKEN: -} - body:json { { "event_id": 1, - "name": "test", - "location": "location test", - "description": "desc test", + "name": "test12", + "location": "blahhhhh", + "description": "blouuuuuuuuuuh", "start": "2025-11-09 15:30:00", "end": "2025-11-09 15:30:00", "max_participants": 10 diff --git a/tests/Users/Get user tasks.bru b/tests/Users/Get user tasks.bru new file mode 100644 index 0000000..0b7f05e --- /dev/null +++ b/tests/Users/Get user tasks.bru @@ -0,0 +1,16 @@ +meta { + name: Get user tasks + type: http + seq: 9 +} + +get { + url: {{url}}/api/users/tasks + body: none + auth: inherit +} + +settings { + encodeUrl: true + timeout: 0 +}