antv/thankcard-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

m

Browse Source
This commit is contained in:
antv
2026-07-21 10:16:06 +07:00
parent f8385185c9
commit 781a0f8aa7
17 changed files with 436 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/User/UserController.php
+47 -12
View File
@@ -31,22 +31,52 @@ class UserController extends Controller
$user = Auth::user();
$administrations = $this->userService->getDashboard($user, $selectedMonth);
$stats = $this->userService->getPersonalStats($user, $selectedMonth);
$receivedRanking = $this->userService->getRankingList('received', $selectedMonth, $user);
$sentRanking = $this->userService->getRankingList('sent', $selectedMonth, $user);
$isAdmin = $user->role == config('constants.ROLE_ADMIN');
if ($isAdmin) {
$stats = $this->userService->getPersonalStats($user, $selectedMonth);
$receivedRanking = $this->userService->getRankingList('received', $selectedMonth, $user);
$sentRanking = $this->userService->getRankingList('sent', $selectedMonth, $user);
$receivedCount = (int) $stats['receivedCount'];
$sentCount = (int) $stats['sentCount'];
$currentRank = (int) $stats['currentRank'];
$receivedRankers = $receivedRanking['rankers'];
$receivedCurrentUserRankItem = $receivedRanking['currentUserRankItem'];
$sentRankers = $sentRanking['rankers'];
$sentCurrentUserRankItem = $sentRanking['currentUserRankItem'];
} else {
// For member, do NOT fetch ranking lists or calculate rank to ensure security and improve DB performance
$startOfMonth = Carbon::parse($selectedMonth)->startOfMonth();
$endOfMonth = Carbon::parse($selectedMonth)->endOfMonth();
$receivedCount = (int) \App\Models\Administration::where('msnv', $user->msnv)
->whereBetween('date', [$startOfMonth, $endOfMonth])
->sum('received');
$sentCount = (int) \App\Models\Administration::where('msnv', $user->msnv)
->whereBetween('date', [$startOfMonth, $endOfMonth])
->sum('sent');
$currentRank = 0;
$receivedRankers = [];
$receivedCurrentUserRankItem = null;
$sentRankers = [];
$sentCurrentUserRankItem = null;
}
$dashboardData = new DashboardDataDto(
administrations: $administrations,
selectedMonth: $selectedMonth,
user: $user,
receivedRankers: $receivedRanking['rankers'],
receivedCurrentUserRankItem: $receivedRanking['currentUserRankItem'],
sentRankers: $sentRanking['rankers'],
sentCurrentUserRankItem: $sentRanking['currentUserRankItem'],
receivedCount: (int) $stats['receivedCount'],
sentCount: (int) $stats['sentCount'],
currentRank: (int) $stats['currentRank']
receivedRankers: $receivedRankers,
receivedCurrentUserRankItem: $receivedCurrentUserRankItem,
sentRankers: $sentRankers,
sentCurrentUserRankItem: $sentCurrentUserRankItem,
receivedCount: $receivedCount,
sentCount: $sentCount,
currentRank: $currentRank
);
return view('user.dashboard', $dashboardData->toArray());
@@ -86,7 +116,8 @@ class UserController extends Controller
$this->userService->sendThankcards(
Auth::user(),
(string) $request->input('receiver'),
(int) $request->input('amount')
(int) $request->input('amount'),
(int) $request->input('template_id', 1)
);
} catch (ThankCardException $e) {
return response()->json(['success' => false, 'message' => $e->getMessage()], 422);
@@ -175,8 +206,12 @@ class UserController extends Controller
}
// New page: ranking (both received and sent) with tabs
public function ranking(Request $request): View
public function ranking(Request $request): \Illuminate\View\View
{
if (Auth::user()->role !== config('constants.ROLE_ADMIN')) {
abort(404);
}
$selectedMonth = $request->input('month', Carbon::now()->format('Y-m'));
$user = Auth::user();
$receivedRanking = $this->userService->getRankingList('received', $selectedMonth, $user);