feat: request optimizations

This commit is contained in:
Xavier Oliveira
2026-05-28 11:23:57 +01:00
parent 68f99798ce
commit 996d44f33d
38 changed files with 1258 additions and 1116 deletions

View File

@@ -7,6 +7,8 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use App\Http\Requests\CreateUserRequest;
use App\Http\Requests\UpdateUserRequest;
use App\Models\Workshop;
use App\Models\Video;
class UserController extends Controller
{
@@ -22,7 +24,9 @@ class UserController extends Controller
], 404);
}
if ($user->role_id === 1) {
$role = $user->role_id;
if ($role === 1) {
$search = trim((string) $request->query('search', ''));
$filter = $request->query('filter', 'all');
$usersQuery = User::query();
@@ -30,7 +34,7 @@ class UserController extends Controller
if ($search !== '') {
$usersQuery->where(function ($q) use ($search) {
$q->where('name', 'like', "%{$search}%")
->orWhere('email', 'like', "%{$search}%");
->orWhere('email', 'like', "%{$search}%");
});
}
@@ -45,6 +49,7 @@ class UserController extends Controller
return response()->json([
'message' => 'Utilizadores obtidos com sucesso',
'data' => $users,
'role' => $role,
'errors' => null,
], 200);
} else {
@@ -58,6 +63,7 @@ class UserController extends Controller
public function getUser($id)
{
$user = User::find($id);
if (!$user) {
@@ -68,10 +74,116 @@ class UserController extends Controller
], 404);
}
$videosWatched = Video::select('id')
->whereHas('views', function ($query) use ($user) {
$query->where('user_id', $user->id);
})->count();
$videosCount = Video::select('id')->where('is_active', true)->count();
$workshopsCount = Workshop::select('id')->where('status', 'pending')->count();
$workshopsInscribed = Workshop::select('id')
->where('status', 'pending')
->whereHas('users', function ($query) use ($user) {
$query->where('users.id', $user->id);
})->count();
$nextWorkshops = Workshop::select('id', 'title', 'image', 'date', 'time_start', 'time_end', 'status')->with('users:id')->where('status', 'pending')->orderBy('date', 'asc')->orderBy('time_start', 'asc')->limit(3)->get();
$workshopsParticipated = Workshop::select('id', 'title', 'image', 'date', 'time_start', 'time_end', 'status')->with('users:id')->whereHas('users', function ($query) use ($user) {
$query->where('users.id', $user->id);
})->get();
return response()->json([
'message' => 'Utilizador obtido com sucesso',
'data' => $user,
'errors' => null,
'videosWatched' => $videosWatched,
'videosCount' => $videosCount,
'workshopsInscribed' => $workshopsInscribed,
'nextWorkshops' => $nextWorkshops,
'workshopsCount' => $workshopsCount,
'workshopsParticipated' => $workshopsParticipated,
], 200);
}
public function profile()
{
$user = auth()->user();
if (!$user) {
return response()->json([
'message' => 'Utilizador não autenticado',
'data' => null,
'errors' => null,
], 404);
}
$role = $user->role_id;
$userId = $user->id;
if ($role === 1) {
$nextWorkshops = Workshop::select('id', 'title', 'image', 'date', 'time_start', 'time_end', 'status')->where('status', 'pending')->orderBy('date', 'asc')->orderBy('time_start', 'asc')->limit(3)->get();
$workshopsCount = Workshop::select('id')->where('status', 'pending')->count();
$videos = Video::select('id', 'title', 'thumbnail', 'is_active', 'order')->where('is_active', true)->orderBy('order', 'asc')->limit(3)->get()->map(function ($video) {
return [
'id' => $video->id,
'title' => $video->title,
'thumbnail' => $video->thumbnail,
'is_active' => $video->is_active,
'order' => $video->order,
];
});
$videosCount = Video::select('id')->where('is_active', true)->count();
} else {
$videos = Video::select('id', 'title', 'thumbnail', 'is_active', 'order')
->where('is_active', true)
->whereDoesntHave('views', function ($q) use ($user) {
$q->where('user_id', $user->id);
})
->orderBy('order', 'asc')
->limit(3)
->get()
->map(function ($video) {
return [
'id' => $video->id,
'title' => $video->title,
'thumbnail' => $video->thumbnail,
'is_active' => $video->is_active,
'watched' => false,
];
});
$videosCount = Video::select('id')->where('is_active', true)->count();
$videosWatched = Video::select('id')
->where('is_active', true)
->whereHas('views', function ($query) use ($user) {
$query->where('user_id', $user->id);
})->count();
$workshopsInscribed = Workshop::select('id', 'title', 'image', 'date', 'time_start', 'time_end', 'status')->with('users:id')->where('status', 'pending')->whereHas('users', function ($query) use ($user) {
$query->where('users.id', $user->id);
})->get();
$workshopsCount = Workshop::select('id')->where('status', 'pending')->count();
}
return response()->json([
'message' => 'Utilizador obtido com sucesso',
'data' => $user,
'videos' => $videos,
'videosCount' => $videosCount ?? 0,
'videosWatched' => $videosWatched ?? 0,
'workshopsInscribed' => $workshopsInscribed ?? [],
'workshopsCount' => $workshopsCount ?? 0,
'nextWorkshops' => $nextWorkshops ?? [],
'userId' => $userId,
'role' => $role,
'errors' => null,
], 200);
}
@@ -169,7 +281,7 @@ class UserController extends Controller
$userUpdated = User::find($id);
return response()->json([
'message' => 'Utilizador atualizado com sucesso',
'message' => 'Dados atualizados com sucesso',
'data' => $userUpdated,
'errors' => null,
], 201);