XavierOliveira/Plataforma-de-Tutoriais
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: Organize videos by sector

Browse Source
This commit is contained in:
Xavier Oliveira
2026-06-16 12:25:58 +01:00
parent c5ed77945e
commit 84e9bf7307
21 changed files with 477 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
plataforma-tutorias/app/Http/Controllers/UserController.php
View File

@@ -74,12 +74,27 @@ class UserController extends Controller
], 404);
}
$sectorName = $user->sector?->name;
$userSector = $user->sector_id;
$role = $user->role_id;
$videosWatched = Video::select('id')
->whereHas('views', function ($query) use ($user) {
$query->where('user_id', $user->id);
})->count();
})
->when($role !== 1, fn($q) => $q->whereHas('sectors', function ($s) use ($userSector) {
$s->where('sectors.id', $userSector)
->orWhere('sectors.slug', "global");
}))
->count();
$videosCount = Video::select('id')->where('is_active', true)->count();
$videosCount = Video::select('id')
->when($role !== 1, fn($q) => $q->where('is_active', true))
->whereHas('sectors', function ($s) use ($userSector) {
$s->where('sectors.id', $userSector)
->orWhere('sectors.slug', "global");
})
->count();
$workshopsCount = Workshop::select('id')->where('status', 'pending')->count();
@@ -98,6 +113,7 @@ class UserController extends Controller
return response()->json([
'message' => 'Utilizador obtido com sucesso',
'data' => $user,
'sectorName' => $sectorName,
'errors' => null,
'videosWatched' => $videosWatched,
'videosCount' => $videosCount,
@@ -122,6 +138,7 @@ class UserController extends Controller
$role = $user->role_id;
$userId = $user->id;
$userSector = $user->sector_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();
@@ -144,6 +161,10 @@ class UserController extends Controller
->whereDoesntHave('views', function ($q) use ($user) {
$q->where('user_id', $user->id);
})
->when($role !== 1, fn($q) => $q->whereHas('sectors', function ($s) use ($userSector) {
$s->where('sectors.id', $userSector)
->orWhere('sectors.slug', "global");
}))
->orderBy('order', 'asc')
->limit(3)
->get()
@@ -157,20 +178,26 @@ class UserController extends Controller
];
});
$videosCount = Video::select('id')->where('is_active', true)->count();
$videosCount = Video::select('id')->where('is_active', true)->when($role !== 1, fn($q) => $q->whereHas('sectors', function ($s) use ($userSector) {
$s->where('sectors.id', $userSector)
->orWhere('sectors.slug', "global");
}))->count();
$videosWatched = Video::select('id')
->where('is_active', true)
->whereHas('views', function ($query) use ($user) {
$query->where('user_id', $user->id);
})->count();
})->when($role !== 1, fn($q) => $q->whereHas('sectors', function ($s) use ($userSector) {
$s->where('sectors.id', $userSector)
->orWhere('sectors.slug', "global");
}))->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);
})
->orderBy('date', 'asc')
->orderBy('time_start', 'asc')
->get();
->orderBy('date', 'asc')
->orderBy('time_start', 'asc')
->get();
$workshopsCount = Workshop::select('id')->where('status', 'pending')->count();
}
@@ -200,6 +227,7 @@ class UserController extends Controller
'email' => $validated['email'],
'password' => Hash::make($validated['password']),
'role_id' => $validated['role_id'],
'sector_id' => $validated['sector_id'],
]);
return response()->json([
@@ -253,6 +281,7 @@ class UserController extends Controller
'name' => $request->name ?: $userToUpdate->name,
'email' => $request->email ?: $userToUpdate->email,
'role_id' => $request->role_id ?: $userToUpdate->role_id,
'sector_id' => $request->sector_id ?: $userToUpdate->sector_id,
];
if ($request->filled('novaPassword')) {