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

@@ -0,0 +1,92 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models\Video;
use App\Models\Workshop;
class DashboardController extends Controller
{
public function index()
{
$user = auth()->user();
if (!$user) {
return response()->json([
'message' => 'Utilizador não autenticado',
'data' => null,
'errors' => null,
], 404);
}
$userId = $user->id;
$role = $user->role_id;
$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();
$workshops = 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()
->map(function ($workshop) {
return [
'id' => $workshop->id,
'title' => $workshop->title,
'image' => $workshop->image,
'date' => $workshop->date,
'time_start' => $workshop->time_start,
'time_end' => $workshop->time_end,
'status' => $workshop->status,
'users' => $workshop->users->pluck('id'),
];
});
$workshopsInscribed = Workshop::select('id')
->where('status', 'pending')
->whereHas('users', function ($query) use ($user) {
$query->where('user_id', $user->id);
})->count();
$workshopsCount = Workshop::select('id')->where('status', 'pending')->count();
return response()->json([
'videos' => $videos,
'videosWatched' => $videosWatched,
'videosCount' => $videosCount,
'workshops' => $workshops,
'workshopsCount' => $workshopsCount,
'workshopsInscribed' => $workshopsInscribed,
'userId' => $userId,
'role' => $role,
], 200);
}
}

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);

View File

@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
use App\Http\Requests\CreateVideoRequest;
use App\Http\Requests\UpdateVideoRequest;
use Illuminate\Support\Facades\Storage;
use App\Models\Category;
class VideosController extends Controller
{
@@ -25,60 +26,63 @@ class VideosController extends Controller
public function index(Request $request)
{
$user = auth()->user();
if (!$user) {
return response()->json([
'message' => 'Utilizador não autenticado',
'data' => null,
], 401);
}
$userId = $user->id;
$role = $user->role_id;
$search = trim((string) $request->query('search', ''));
$categoryId = $request->query('category');
$watched = $request->query('watched');
$perPage = $request->query('per_page', 9);
$query = Video::select(['id', 'title', 'thumbnail', 'is_active'])
->with([
'categories:id,name',
'views' => function ($q) use ($user) {
$q->select('id', 'video_id', 'user_id')
->where('user_id', $user->id);
->where('user_id', $user->id);
}
])
->when($search !== '', function ($q) use ($search) {
$q->where(function ($sub) use ($search) {
$sub->where('title', 'like', "%{$search}%")
->orWhere('tags', 'like', "%{$search}%");
});
})
->when($categoryId, function ($q) use ($categoryId) {
$q->whereHas('categories', function ($c) use ($categoryId) {
$c->where('categories.id', $categoryId);
});
})
->when($user->role_id !== 1, function ($q) {
$q->where('is_active', true);
})
->when($watched !== null, function ($q) use ($watched, $user) {
if ((int) $watched === 1) {
$q->whereHas('views', function ($v) use ($user) {
$v->where('user_id', $user->id);
});
}
if ((int) $watched === 0) {
$q->whereDoesntHave('views', function ($v) use ($user) {
$v->where('user_id', $user->id);
});
}
})
->orderByRaw('
CASE WHEN EXISTS (
SELECT 1 FROM video_views
@@ -88,7 +92,7 @@ class VideosController extends Controller
videos.order ASC
', [$user->id])
->paginate($perPage);
$query->getCollection()->transform(function ($video) {
return [
'id' => $video->id,
@@ -99,7 +103,13 @@ class VideosController extends Controller
'watched' => $video->views->isNotEmpty(),
];
});
$categories = Category::select('id', 'name')
->where('is_active', true)
->whereHas('videos')
->orderBy('name', 'asc')
->get();
return response()->json([
'message' => 'Vídeos obtidos com sucesso',
'data' => $query->items(),
@@ -109,6 +119,9 @@ class VideosController extends Controller
'per_page' => $query->perPage(),
'total' => $query->total(),
],
'userId' => $userId,
'role' => $role,
'categories' => $categories,
]);
}
@@ -121,20 +134,20 @@ class VideosController extends Controller
'message' => 'Não autenticado',
], 401);
}
$videos = Video::select(['id', 'title', 'thumbnail', 'is_active', 'order'])
->with(['categories:id,name'])
// 👇 regra base: vídeos não vistos
->whereDoesntHave('views', function ($q) use ($user) {
$q->where('user_id', $user->id);
})
// 👇 users normais não veem inativos
->when($user->role_id !== 1, function ($q) {
$q->where('is_active', true);
})
->orderBy('order', 'asc')
->limit(3)
->get()
@@ -148,19 +161,20 @@ class VideosController extends Controller
'watched' => false, // aqui já sabes que não foram vistos
];
});
return response()->json([
'message' => 'Dashboard videos',
'data' => $videos,
]);
}
public function search(Request $request)
{
$user = auth()->user();
$search = trim((string) $request->query('search', ''));
$videos = Video::select(['id', 'title', 'thumbnail', 'is_active'])
->with([
'categories:id,name',
@@ -174,7 +188,7 @@ class VideosController extends Controller
})
->where(function ($query) use ($search) {
$query->where('title', 'like', "%{$search}%")
->orWhere('tags', 'like', "%{$search}%");
->orWhere('tags', 'like', "%{$search}%");
})
->limit(20)
->get()
@@ -188,7 +202,7 @@ class VideosController extends Controller
'watched' => $video->views->isNotEmpty(),
];
});
return response()->json([
'message' => 'Resultados obtidos com sucesso',
'data' => $videos,
@@ -319,9 +333,7 @@ class VideosController extends Controller
'order' => $validated['order'],
]);
if ($request->filled('category_ids')) {
$video->categories()->sync($request->input('category_ids'));
}
$video->categories()->sync($request->input('category_ids', []));
$baseUrl = $request->getSchemeAndHttpHost();
@@ -386,9 +398,7 @@ class VideosController extends Controller
'order' => $validated['order'] ?? $videoToUpdate->order,
]);
if ($request->has('category_ids')) {
$videoToUpdate->categories()->sync($request->input('category_ids'));
}
$videoToUpdate->categories()->sync($request->input('category_ids', []));
return response()->json([
'message' => 'Dados do vídeo atualizados com sucesso',

View File

@@ -22,6 +22,8 @@ class WorkshopsController extends Controller
], 404);
}
$role = $user->role_id;
$search = trim((string) $request->query('search', ''));
$status = trim((string) $request->query('status', ''));
$perPage = $request->query('per_page', 9);
@@ -73,13 +75,15 @@ class WorkshopsController extends Controller
'per_page' => $query->perPage(),
'total' => $query->total(),
],
'userId' => $user->id,
'role' => $role,
]);
}
public function search(Request $request)
{
$user = auth()->user();
$search = trim((string) $request->query('search', ''));
$workshops = Workshop::select(['id', 'title', 'image', 'date', 'time_start', 'time_end', 'status'])
@@ -144,6 +148,8 @@ class WorkshopsController extends Controller
'message' => 'Não autenticado',
], 401);
}
$role = $user->role_id;
$workshops = Workshop::select(['id', 'title', 'image', 'date', 'time_start', 'time_end', 'status'])
->with(['users:id'])
@@ -168,6 +174,7 @@ class WorkshopsController extends Controller
return response()->json([
'message' => 'Dashboard workshops',
'data' => $workshops,
'role' => $role,
]);
}
@@ -175,6 +182,9 @@ class WorkshopsController extends Controller
{
$workshop = Workshop::with('users')->find($id);
$user = auth()->user();
$role = $user->role_id;
if (!$workshop) {
return response()->json([
'message' => 'Workshop não encontrado',
@@ -186,6 +196,7 @@ class WorkshopsController extends Controller
'message' => 'Workshop obtido com sucesso',
'data' => $workshop,
'errors' => null,
'role' => $role,
], 200);
}