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

31
plataforma-tutorias/app/Http/Controllers/AuthController.php
View File

@@ -105,16 +105,33 @@ class AuthController extends Controller
$user = auth()->user();
$userId = $user->id;
$role = $user->role_id;
$userSector = $user->sector_id;
if ($role !== 1) {
$stats = Video::query()
->where('is_active', true)
->whereHas('sectors', function ($s) use ($userSector) {
$s->where('sectors.id', $userSector)
->orWhere('sectors.slug', "global");
})
->selectRaw('
COUNT(*) as active_count,
COUNT(CASE WHEN EXISTS (
SELECT 1 FROM video_views
WHERE video_views.video_id = videos.id
AND video_views.user_id = ?
) THEN 1 END) as watched_count
', [$userId])
->first();
} else {
$stats = Video::selectRaw('
COUNT(CASE WHEN is_active = 1 THEN 1 END) as active_count,
COUNT(CASE WHEN is_active = 1 AND EXISTS (
SELECT 1 FROM video_views
WHERE video_views.video_id = videos.id
AND video_views.user_id = ?
) THEN 1 END) as watched_count
', [$userId])
COUNT(CASE WHEN is_active = 1 THEN 1 END) as active_count,
COUNT(CASE WHEN is_active = 1 AND EXISTS (
SELECT 1 FROM video_views
WHERE video_views.video_id = videos.id
AND video_views.user_id = ?
) THEN 1 END) as watched_count
', [$userId])
->first();
}

45
plataforma-tutorias/app/Http/Controllers/DashboardController.php
View File

@@ -22,12 +22,17 @@ class DashboardController extends Controller
$userId = $user->id;
$role = $user->role_id;
$userSector = $user->sector_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);
})
->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()
@@ -41,19 +46,33 @@ class DashboardController extends Controller
];
});
if ($role === 1) {
$stats = Video::selectRaw('COUNT(CASE WHEN is_active = 1 THEN 1 END) as active_count')->first();
} else {
$stats = Video::selectRaw('
COUNT(CASE WHEN is_active = 1 THEN 1 END) as active_count,
COUNT(CASE WHEN is_active = 1 AND EXISTS (
SELECT 1 FROM video_views
WHERE video_views.video_id = videos.id
AND video_views.user_id = ?
) THEN 1 END) as watched_count
', [$userId])
->first();
}
if ($role !== 1) {
$stats = Video::query()
->where('is_active', true)
->whereHas('sectors', function ($s) use ($userSector) {
$s->where('sectors.id', $userSector)
->orWhere('sectors.slug', "global");
})
->selectRaw('
COUNT(*) as active_count,
COUNT(CASE WHEN EXISTS (
SELECT 1 FROM video_views
WHERE video_views.video_id = videos.id
AND video_views.user_id = ?
) THEN 1 END) as watched_count
', [$userId])
->first();
} else {
$stats = Video::selectRaw('
COUNT(CASE WHEN is_active = 1 THEN 1 END) as active_count,
COUNT(CASE WHEN is_active = 1 AND EXISTS (
SELECT 1 FROM video_views
WHERE video_views.video_id = videos.id
AND video_views.user_id = ?
) THEN 1 END) as watched_count
', [$userId])
->first();
}
$workshops = Workshop::select(['id', 'title', 'image', 'date', 'time_start', 'time_end', 'status'])
->with(['users:id'])

31
plataforma-tutorias/app/Http/Controllers/SectorController.php Normal file
View File

@@ -0,0 +1,31 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models\Sector;
use App\Http\Requests\CreateSectorRequest;
class SectorController extends Controller
{
public function index()
{
$sectors = Sector::select('id', 'name', 'slug', 'is_active')->get();
return response()->json([
'message' => 'Setores obtidos com sucesso',
'data' => $sectors,
'errors' => null,
], 200);
}
public function create(CreateSectorRequest $request)
{
$sector = Sector::create($request->validated());
return response()->json([
'message' => 'Setor criado com sucesso',
'data' => $sector,
'errors' => null,
], 201);
}
}

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')) {

244
plataforma-tutorias/app/Http/Controllers/VideosController.php
View File

@@ -36,6 +36,7 @@ class VideosController extends Controller
$userId = $user->id;
$role = $user->role_id;
$userSector = $user->sector_id;
$search = trim((string) $request->query('search', ''));
$categoryId = $request->query('category');
@@ -45,9 +46,7 @@ class VideosController extends Controller
$query = Video::select(['id', 'title', 'thumbnail', 'is_active'])
->with('categories:id,name')
->withCount([
'views as watched' => fn($q) => $q->where('user_id', $userId)
])
->with('sectors:id')
->when($search !== '', function ($q) use ($search) {
$q->where(function ($sub) use ($search) {
@@ -64,6 +63,11 @@ class VideosController extends Controller
->when($role !== 1, fn($q) => $q->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");
}))
->when(
$role === 1 && $status === 'active',
fn($q) =>
@@ -85,25 +89,43 @@ class VideosController extends Controller
// left join para trazer os vídeos vistos pelo utilizador
->leftJoin('video_views as vv', function ($join) use ($userId) {
$join->on('vv.video_id', '=', 'videos.id')
->where('vv.user_id', '=', $userId);
->where('vv.user_id', '=', $userId);
})
->orderByRaw('CASE WHEN vv.id IS NOT NULL THEN 1 ELSE 0 END ASC')
->orderBy('videos.order', 'ASC')
->select(['videos.id', 'videos.title', 'videos.thumbnail', 'videos.is_active'])
->select(['videos.id', 'videos.title', 'videos.thumbnail', 'videos.is_active', 'vv.id as user_view_id'])
->paginate($perPage);
// 1 única query para obter o número de vídeos ativos e vistos
$stats = Video::selectRaw('
COUNT(CASE WHEN is_active = 1 THEN 1 END) as active_count,
COUNT(CASE WHEN is_active = 1 AND EXISTS (
SELECT 1 FROM video_views
WHERE video_views.video_id = videos.id
AND video_views.user_id = ?
) THEN 1 END) as watched_count
', [$userId])
->first();
if ($role !== 1) {
$stats = Video::query()
->where('is_active', true)
->whereHas('sectors', function ($s) use ($userSector) {
$s->where('sectors.id', $userSector)
->orWhere('sectors.slug', "global");
})
->selectRaw('
COUNT(*) as active_count,
COUNT(CASE WHEN EXISTS (
SELECT 1 FROM video_views
WHERE video_views.video_id = videos.id
AND video_views.user_id = ?
) THEN 1 END) as watched_count
', [$userId])
->first();
} else {
$stats = Video::selectRaw('
COUNT(CASE WHEN is_active = 1 THEN 1 END) as active_count,
COUNT(CASE WHEN is_active = 1 AND EXISTS (
SELECT 1 FROM video_views
WHERE video_views.video_id = videos.id
AND video_views.user_id = ?
) THEN 1 END) as watched_count
', [$userId])
->first();
}
$query->getCollection()->transform(function ($video) {
return [
@@ -112,21 +134,38 @@ class VideosController extends Controller
'thumbnail' => $video->thumbnail,
'is_active' => $video->is_active,
'categories' => $video->categories,
'watched' => $video->views->isNotEmpty(),
'watched' => $video->user_view_id !== null,
];
});
// Guarda as categorias em cache durante 1 minuto para evitar consultas repetidas
$categories = cache()->remember(
'active_categories_with_videos',
60,
fn() =>
Category::select('id', 'name')
->where('is_active', true)
->whereHas('videos')
->orderBy('name')
->get()
);
if ($role !== 1) {
$categories = cache()->remember(
'active_categories_with_videos',
60,
fn() =>
Category::select('id', 'name')
->where('is_active', true)
->whereHas('videos')
->whereHas('videos.sectors', function ($s) use ($userSector) {
$s->where('sectors.id', $userSector)
->orWhere('sectors.slug', "global");
})
->orderBy('name')
->get()
);
} else {
$categories = cache()->remember(
'active_categories_with_videos_admin',
60,
fn() =>
Category::select('id', 'name')
->where('is_active', true)
->whereHas('videos')
->orderBy('name')
->get()
);
}
return response()->json([
'message' => 'Vídeos obtidos com sucesso',
@@ -148,6 +187,7 @@ class VideosController extends Controller
public function search(Request $request)
{
$user = auth()->user();
$userSector = $user->sector_id;
$search = trim((string) $request->query('search', ''));
@@ -159,8 +199,12 @@ class VideosController extends Controller
->where('user_id', $user->id);
}
])
->when($user->role_id !== 1, function ($query) {
$query->where('is_active', true);
->when($user->role_id !== 1, function ($query) use ($userSector) {
$query->where('is_active', true)
->whereHas('sectors', function ($s) use ($userSector) {
$s->where('sectors.id', $userSector)
->orWhere('sectors.slug', "global");
});
})
->where(function ($query) use ($search) {
$query->where('title', 'like', "%{$search}%")
@@ -198,67 +242,106 @@ class VideosController extends Controller
}
$userID = $user->id;
$userSector = $user->sector_id;
$isAdmin = $user->role_id === 1;
if ($user->role_id !== 1) {
/* $video = Video::with('categories')->where('is_active', true)->find($id); */
$video = Video::with([
'categories' => function ($query) use ($userID) {
$video = Video::with([
'categories' => function ($query) use ($isAdmin) {
if (!$isAdmin) {
$query->where('is_active', true);
},
'views' => function ($query) use ($userID) {
$query->where('user_id', $userID);
}
])->find($id);
},
'sectors',
'views' => function ($query) use ($userID) {
$query->where('user_id', $userID);
},
])->find($id);
$nextVideo = Video::select('id')->where('order', '>', $video->order)->where('is_active', true)->orderBy('order', 'asc')->first();
$previousVideo = Video::select('id')->where('order', '<', $video->order)->where('is_active', true)->orderBy('order', 'desc')->first();
/* Para não mostrar vídeos inactivos para utilizadores não administradores */
if (!$video || $video->is_active === false) {
return response()->json([
'message' => 'Acesso negado',
'data' => null,
'errors' => null,
], 404);
}
}
$video = Video::with('categories')->find($id);
if ($video) {
$video->url = Storage::url($video->url);
$video->thumbnail = Storage::url($video->thumbnail);
return response()->json([
'message' => 'Vídeo obtido com sucesso',
'data' => [
'id' => $video->id,
'title' => $video->title,
'description' => $video->description,
'url' => $video->url,
'thumbnail' => $video->thumbnail,
'duration' => $video->duration,
'tags' => $video->tags,
'order' => $video->order,
'categories' => $video->categories->map(function ($category) {
return [
'id' => $category->id,
'name' => $category->name,
];
})->values(),
'is_active' => $video->is_active,
'watched' => $video->views->isNotEmpty(),
],
'errors' => null,
'nextVideo' => $nextVideo->id ?? null,
'previousVideo' => $previousVideo->id ?? null,
], 200);
} else {
if (!$video) {
return response()->json([
'message' => 'Vídeo não encontrado',
'data' => null,
'errors' => null,
], 404);
}
if (!$isAdmin) {
if (!$video->is_active) {
return response()->json([
'message' => 'Acesso negado',
'data' => null,
'errors' => null,
], 404);
}
if (!$video->sectors->contains(fn ($sector) => $sector->id === $userSector || $sector->slug === 'global')) {
return response()->json([
'message' => 'Acesso negado',
'data' => null,
'errors' => null,
], 404);
}
$nextVideo = Video::select('id')
->where('order', '>', $video->order)
->where('is_active', true)
->whereHas('sectors', fn($s) => $s->where('sectors.id', $userSector)
->orWhere('sectors.slug', "global"))
->orderBy('order', 'asc')
->first();
$previousVideo = Video::select('id')
->where('order', '<', $video->order)
->where('is_active', true)
->whereHas('sectors', fn($s) => $s->where('sectors.id', $userSector)
->orWhere('sectors.slug', "global"))
->orderBy('order', 'desc')
->first();
} else {
$nextVideo = Video::select('id')
->where('order', '>', $video->order)
->orderBy('order', 'asc')
->first();
$previousVideo = Video::select('id')
->where('order', '<', $video->order)
->orderBy('order', 'desc')
->first();
}
$video->url = Storage::url($video->url);
$video->thumbnail = Storage::url($video->thumbnail);
return response()->json([
'message' => 'Vídeo obtido com sucesso',
'data' => [
'id' => $video->id,
'title' => $video->title,
'description' => $video->description,
'url' => $video->url,
'thumbnail' => $video->thumbnail,
'duration' => $video->duration,
'tags' => $video->tags,
'order' => $video->order,
'categories' => $video->categories->map(function ($category) {
return [
'id' => $category->id,
'name' => $category->name,
];
})->values(),
'sectors' => $video->sectors->map(function ($sector) {
return [
'id' => $sector->id,
'name' => $sector->name,
];
})->values(),
'is_active' => $video->is_active,
'watched' => $video->views->isNotEmpty(),
],
'errors' => null,
'nextVideo' => $nextVideo->id ?? null,
'previousVideo' => $previousVideo->id ?? null,
], 200);
}
@@ -290,6 +373,7 @@ class VideosController extends Controller
]);
$video->categories()->sync($request->input('category_ids', []));
$video->sectors()->sync($request->input('sector_ids', []));
$baseUrl = $request->getSchemeAndHttpHost();
@@ -305,6 +389,7 @@ class VideosController extends Controller
'tags' => $video->tags,
'order' => $video->order,
'categories' => $video->categories->pluck('name'),
'sectors' => $video->sectors->pluck('name'),
'is_active' => $video->is_active,
],
'errors' => null,
@@ -355,10 +440,11 @@ class VideosController extends Controller
]);
$videoToUpdate->categories()->sync($request->input('category_ids', []));
$videoToUpdate->sectors()->sync($request->input('sector_ids', []));
return response()->json([
'message' => 'Dados do vídeo atualizados com sucesso',
'data' => $videoToUpdate->load('categories'),
'data' => $videoToUpdate->load(['categories', 'sectors']),
'errors' => null,
], 200);
} catch (\Throwable $th) {