removed comments
This commit is contained in:
@@ -12,10 +12,6 @@ use Illuminate\Validation\Rule;
|
||||
|
||||
class UserController extends Controller
|
||||
{
|
||||
/**
|
||||
* GET /api/users
|
||||
* Lista todos os utilizadores (Apenas para Admins)
|
||||
*/
|
||||
public function index(Request $request)
|
||||
{
|
||||
$this->authorize("viewAny", User::class);
|
||||
@@ -41,10 +37,6 @@ class UserController extends Controller
|
||||
return response()->json($query->paginate(15));
|
||||
}
|
||||
|
||||
/**
|
||||
* POST /api/users
|
||||
* Registar um novo utilizador (Admin only)
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$this->authorize("create", User::class);
|
||||
@@ -63,25 +55,15 @@ class UserController extends Controller
|
||||
return response()->json($user, 201);
|
||||
}
|
||||
|
||||
/**
|
||||
* GET /api/users/me
|
||||
* Retorna o perfil do utilizador autenticado atual.
|
||||
* Usado pelo VueJS para saber quem está logado.
|
||||
*/
|
||||
public function me(Request $request)
|
||||
{
|
||||
return response()->json($request->user());
|
||||
}
|
||||
|
||||
/**
|
||||
* GET /api/users/{user}
|
||||
* Mostra um perfil específico.
|
||||
*/
|
||||
public function show(User $user)
|
||||
{
|
||||
$currentUser = Auth::user();
|
||||
|
||||
// Admins and owners get full profile, others get limited view
|
||||
if ($currentUser->type === "A" || $currentUser->id === $user->id) {
|
||||
return response()->json($user);
|
||||
} else {
|
||||
@@ -95,10 +77,6 @@ class UserController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* PUT/PATCH /api/users/{user}
|
||||
* Atualizar perfil (Nome, Nickname, Password, Foto)
|
||||
*/
|
||||
public function update(Request $request, User $user)
|
||||
{
|
||||
$this->authorize("update", $user);
|
||||
@@ -119,12 +97,6 @@ class UserController extends Controller
|
||||
"password" => "sometimes|string|min:3",
|
||||
]);
|
||||
|
||||
// Lógica de Upload de Foto (Exemplo Básico)
|
||||
// if ($request->hasFile('photo_avatar')) {
|
||||
// $path = $request->file('photo_avatar')->store('avatars', 'public');
|
||||
// $validated['photo_avatar_filename'] = basename($path);
|
||||
// }
|
||||
|
||||
$user->update($validated);
|
||||
|
||||
return response()->json($user);
|
||||
@@ -139,7 +111,6 @@ class UserController extends Controller
|
||||
"new_password" => "required|string|min:3|confirmed",
|
||||
]);
|
||||
|
||||
// Verificar se a password atual está correta
|
||||
if (!Hash::check($validated["current_password"], $user->password)) {
|
||||
return response()->json(
|
||||
["message" => "Current password is incorrect"],
|
||||
@@ -147,22 +118,16 @@ class UserController extends Controller
|
||||
);
|
||||
}
|
||||
|
||||
// Atualizar para a nova password
|
||||
$user->password = Hash::make($validated["new_password"]);
|
||||
$user->save();
|
||||
|
||||
return response()->json(["message" => "Password updated successfully"]);
|
||||
}
|
||||
|
||||
/**
|
||||
* DELETE /api/users/{user}
|
||||
* Apagar conta (Soft Delete)
|
||||
*/
|
||||
public function destroy(User $user)
|
||||
{
|
||||
$this->authorize("delete", $user);
|
||||
|
||||
// Check if user has transactions or games - if so, soft delete
|
||||
$hasTransactions = $user->transactions()->exists();
|
||||
$hasGames = Game::where(function ($q) use ($user) {
|
||||
$q->where("player1_user_id", $user->id)->orWhere(
|
||||
@@ -172,26 +137,21 @@ class UserController extends Controller
|
||||
})->exists();
|
||||
|
||||
if ($hasTransactions || $hasGames) {
|
||||
$user->delete(); // Soft delete
|
||||
$user->delete();
|
||||
$message =
|
||||
"User account deactivated (soft-deleted due to transaction/game history)";
|
||||
} else {
|
||||
$user->forceDelete(); // Hard delete
|
||||
$user->forceDelete();
|
||||
$message = "User permanently deleted";
|
||||
}
|
||||
|
||||
return response()->json(["message" => $message]);
|
||||
}
|
||||
|
||||
/**
|
||||
* GET /api/users/{user}/games
|
||||
* Histórico de Partidas Individuais (Cartas)
|
||||
*/
|
||||
public function getGames(Request $request, User $user)
|
||||
{
|
||||
$this->authorize("view", $user);
|
||||
|
||||
// Define a query base para GAMES
|
||||
$query = \App\Models\Game::query()
|
||||
->where(function ($q) use ($user) {
|
||||
$q->where("player1_user_id", $user->id)->orWhere(
|
||||
@@ -209,7 +169,6 @@ class UserController extends Controller
|
||||
$query->where("status", $request->status);
|
||||
}
|
||||
|
||||
// Date filtering
|
||||
if ($request->has("date_from")) {
|
||||
$query->whereDate("began_at", ">=", $request->date_from);
|
||||
}
|
||||
@@ -218,11 +177,9 @@ class UserController extends Controller
|
||||
$query->whereDate("began_at", "<=", $request->date_to);
|
||||
}
|
||||
|
||||
// Flexible sorting
|
||||
$sortColumn = $request->get("sort_by", "began_at");
|
||||
$sortDirection = $request->get("sort_direction", "desc");
|
||||
|
||||
// Whitelist sortable columns for security
|
||||
$allowedColumns = [
|
||||
"began_at",
|
||||
"ended_at",
|
||||
@@ -251,10 +208,6 @@ class UserController extends Controller
|
||||
return response()->json($games);
|
||||
}
|
||||
|
||||
/**
|
||||
* GET /api/users/{user}/matches
|
||||
* Histórico de Matches (Apostas / Marcas)
|
||||
*/
|
||||
public function getMatches(Request $request, User $user)
|
||||
{
|
||||
$this->authorize("view", $user);
|
||||
@@ -276,7 +229,6 @@ class UserController extends Controller
|
||||
$query->where("status", $request->status);
|
||||
}
|
||||
|
||||
// Date filtering
|
||||
if ($request->has("date_from")) {
|
||||
$query->whereDate("began_at", ">=", $request->date_from);
|
||||
}
|
||||
@@ -285,11 +237,9 @@ class UserController extends Controller
|
||||
$query->whereDate("began_at", "<=", $request->date_to);
|
||||
}
|
||||
|
||||
// Flexible sorting
|
||||
$sortColumn = $request->get("sort_by", "began_at");
|
||||
$sortDirection = $request->get("sort_direction", "desc");
|
||||
|
||||
// Whitelist sortable columns for security
|
||||
$allowedColumns = ["began_at", "ended_at", "stake", "total_time"];
|
||||
if (in_array($sortColumn, $allowedColumns)) {
|
||||
$query->orderBy($sortColumn, $sortDirection);
|
||||
@@ -308,7 +258,7 @@ class UserController extends Controller
|
||||
) {
|
||||
$match->outcome = "loss";
|
||||
} else {
|
||||
$match->outcome = "interrupted"; // Matches geralmente não empatam (alguém chega a 4 marcas)
|
||||
$match->outcome = "interrupted";
|
||||
}
|
||||
return $match;
|
||||
});
|
||||
@@ -323,7 +273,6 @@ class UserController extends Controller
|
||||
$user->blocked = true;
|
||||
$user->save();
|
||||
|
||||
// Revoke all active tokens for immediate effect
|
||||
$user->tokens()->delete();
|
||||
|
||||
return response()->json(["message" => "User blocked successfully"]);
|
||||
|
||||
Reference in New Issue
Block a user