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

refactor: refactor controllers, services, validation and introduce DTOs, FormRequests and domain exceptions

Browse Source
This commit is contained in:
antv
2026-07-09 10:27:47 +07:00
parent 54048bb4ff
commit 326e1f1028
15 changed files with 501 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/AdminController.php
+60 -82
View File
@@ -3,25 +3,29 @@
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Models\User;
use App\Http\Requests\Admin\StoreUserRequest;
use App\Http\Requests\Admin\UpdateUserRequest;
use App\Http\Requests\Admin\UpdateAddCardRequest;
use App\DTOs\UserFilterDto;
use App\Services\Admin\Contracts\AdminServiceInterface;
use Carbon\Carbon;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
class AdminController extends Controller
{
public function __construct(
private AdminServiceInterface $adminService
private readonly AdminServiceInterface $adminService
) {}
public function index(Request $request)
/**
* Display a listing of the users with statistics.
*/
public function index(Request $request): View|JsonResponse
{
$selectedMonth = $request->input('month', Carbon::now()->format('Y-m'));
$search = $request->input('search');
$status = $request->input('status', (string)config('constants.STATUS_ACTIVE'));
$role = $request->input('role');
$department = $request->input('department');
$flagSend = $request->input('flag_send');
$filters = UserFilterDto::fromRequest($request);
[
'users' => $users,
@@ -29,11 +33,11 @@ class AdminController extends Controller
'topSentUser' => $topSentUser,
'topReceivedUsers' => $topReceivedUsers,
'topSentUsers' => $topSentUsers
] = $this->adminService->getUserListWithStats($selectedMonth, $search, $status, $role, $department, $flagSend);
] = $this->adminService->getUserListWithStats($filters);
if ($request->ajax() || $request->wantsJson()) {
return response()->json([
'title' => view('admin.users.partials.title', compact('selectedMonth'))->render(),
'title' => view('admin.users.partials.title', ['selectedMonth' => $filters->selectedMonth])->render(),
'stats' => view('admin.users.partials.stats', compact('topReceivedUser', 'topSentUser', 'topReceivedUsers', 'topSentUsers'))->render(),
'table' => view('admin.users.partials.table', compact('users'))->render(),
]);
@@ -41,117 +45,91 @@ class AdminController extends Controller
return view('admin.users.index', compact(
'users',
'selectedMonth',
'topReceivedUser',
'topSentUser',
'topReceivedUsers',
'topSentUsers',
'search',
'status',
'role',
'department',
'flagSend'
));
'topSentUsers'
))->with([
'selectedMonth' => $filters->selectedMonth,
'search' => $filters->search,
'status' => $filters->status,
'role' => $filters->role,
'department' => $filters->department,
'flagSend' => $filters->flagSend,
]);
}
public function create()
/**
* Show the form for creating a new user.
*/
public function create(): View
{
return view('admin.users.create');
}
public function store(Request $request)
/**
* Store a newly created user in storage.
*/
public function store(StoreUserRequest $request): RedirectResponse
{
$request->validate([
'msnv' => 'required|integer|unique:user,msnv',
'name' => 'required|string|max:255',
'mail' => 'required|email|unique:user,mail',
'departments' => 'required|string|in:' . implode(',', config('constants.DEPARTMENTS')),
'password' => 'required|string',
'role' => 'required|in:' . config('constants.ROLE_MEMBER') . ',' . config('constants.ROLE_ADMIN'),
]);
$this->adminService->createUser($request->only('msnv', 'name', 'mail', 'departments', 'password', 'role'));
$this->adminService->createUser($request->validated());
return redirect()->route('admin.users.index')->with('success', __('messages.user_create_success'));
}
public function edit(Request $request, $msnv)
/**
* Show the form for editing the specified user.
*/
public function edit(Request $request, string $msnv): View
{
$user = User::where('msnv', $msnv)->firstOrFail();
$selectedMonth = $request->input('month', Carbon::now()->format('Y-m'));
$user = $this->adminService->getUserByMsnv($msnv);
$selectedMonth = (string) $request->input('month', Carbon::now()->format('Y-m'));
$administrations = $this->adminService->getUserTransactions($msnv, $selectedMonth);
$addCards = \App\Models\AddCard::with('sellerUser')
->where('buyer', $user->msnv)
->orderBy('date', 'desc')
->orderBy('id', 'desc')
->get();
$admins = User::where('role', config('constants.ROLE_ADMIN'))
->where('status', config('constants.STATUS_ACTIVE'))
->get();
$addCards = $this->adminService->getAddCardsHistory($user->msnv);
$admins = $this->adminService->getActiveAdmins();
return view('admin.users.edit', compact('user', 'administrations', 'selectedMonth', 'addCards', 'admins'));
}
public function update(Request $request, $msnv)
/**
* Update the specified user in storage.
*/
public function update(UpdateUserRequest $request, string $msnv): RedirectResponse
{
$user = User::where('msnv', $msnv)->firstOrFail();
$user = $this->adminService->getUserByMsnv($msnv);
$request->validate([
'card' => 'nullable|integer|min:0',
'num_card' => 'nullable|integer|min:1',
'role' => 'nullable|in:' . config('constants.ROLE_MEMBER') . ',' . config('constants.ROLE_ADMIN'),
'status' => 'nullable|in:' . config('constants.STATUS_INACTIVE') . ',' . config('constants.STATUS_ACTIVE'),
'flag_send' => 'nullable|in:0,1',
'first_login' => 'nullable|in:' . config('constants.FIRST_LOGIN_FALSE') . ',' . config('constants.FIRST_LOGIN_TRUE'),
]);
$cardValue = $user->card;
if ($request->has('num_card') && !is_null($request->num_card)) {
$cardValue = $user->card + intval($request->num_card);
} elseif ($request->has('card')) {
$cardValue = intval($request->card);
}
$data = [
'card' => $cardValue,
'role' => $request->input('role', $user->role),
'status' => $request->input('status', $user->status),
'flag_send' => $request->has('flag_send') ? config('constants.FLAG_SEND_ENABLED') : config('constants.FLAG_SEND_DISABLED'),
'first_login' => $request->input('first_login', $user->first_login),
];
$this->adminService->updateUser($msnv, $data);
$this->adminService->updateUser($user, $request->validated());
return redirect()->back()->with('success', __('messages.user_update_success'));
}
public function destroy($msnv)
/**
* Remove (deactivate) the specified user from storage.
*/
public function destroy(string $msnv): RedirectResponse
{
$this->adminService->deactivateUser($msnv);
return redirect()->route('admin.users.index')->with('success', __('messages.user_deactivate_success'));
}
public function updateAddCard(Request $request, $id)
/**
* Update card allocation history record.
*/
public function updateAddCard(UpdateAddCardRequest $request, int $id): RedirectResponse
{
$request->validate([
'num_card' => 'required|integer|min:1',
'seller' => 'required|exists:user,msnv',
'date' => 'required|date',
]);
try {
$this->adminService->updateAddCard(intval($id), $request->only('num_card', 'seller', 'date'));
$this->adminService->updateAddCard($id, $request->validated());
return redirect()->back()->with('success', 'Cập nhật lịch sử cấp phát thẻ thành công.');
} catch (\Exception $e) {
return redirect()->back()->withErrors(['error' => $e->getMessage()]);
}
}
public function resetCards()
/**
* Reset all cards for active users.
*/
public function resetCards(): RedirectResponse
{
$this->adminService->resetAllCards();
app/Http/Controllers/User/UserController.php
+70 -50
View File
@@ -3,102 +3,122 @@
namespace App\Http\Controllers\User;
use App\Http\Controllers\Controller;
use App\Models\Administration;
use App\Http\Requests\User\SendThankCardRequest;
use App\Http\Requests\User\UpdateProfileRequest;
use App\Http\Requests\User\UpdatePasswordRequest;
use App\DTOs\DashboardDataDto;
use App\Exceptions\ThankCardException;
use App\Services\User\Contracts\UserServiceInterface;
use Carbon\Carbon;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\View\View;
class UserController extends Controller
{
public function __construct(
private UserServiceInterface $userService
private readonly UserServiceInterface $userService
) {}
public function index(Request $request)
/**
* Display the user dashboard with transaction history, stats, and rankings.
*/
public function index(Request $request): View
{
$selectedMonth = $request->input('month', Carbon::now()->format('Y-m'));
$selectedMonth = (string) $request->input('month', Carbon::now()->format('Y-m'));
$user = Auth::user();
$administrations = $this->userService->getDashboard($user, $selectedMonth);
$stats = $this->userService->getPersonalStats($user, $selectedMonth);
$stats = $this->userService->getPersonalStats($user, $selectedMonth);
$receivedRanking = $this->userService->getRankingList('received', $selectedMonth, $user);
$sentRanking = $this->userService->getRankingList('sent', $selectedMonth, $user);
$sentRanking = $this->userService->getRankingList('sent', $selectedMonth, $user);
return view('user.dashboard', array_merge([
'administrations' => $administrations,
'selectedMonth' => $selectedMonth,
'user' => $user,
'receivedRankers' => $receivedRanking['rankers'],
'receivedCurrentUserRankItem' => $receivedRanking['currentUserRankItem'],
'sentRankers' => $sentRanking['rankers'],
'sentCurrentUserRankItem' => $sentRanking['currentUserRankItem']
], $stats));
$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']
);
return view('user.dashboard', $dashboardData->toArray());
}
public function sendThankcards()
/**
* Show the form to send thank cards.
*/
public function sendThankcards(): View
{
$users = $this->userService->getOtherActiveUsers(Auth::user());
return view('user.send', compact('users'));
}
public function storeThankcards(Request $request)
/**
* Store and execute sending thank cards to another user.
*/
public function storeThankcards(SendThankCardRequest $request): JsonResponse
{
$request->validate([
'receiver' => [
'required',
\Illuminate\Validation\Rule::exists('user', 'msnv')->where('status', config('constants.STATUS_ACTIVE'))
],
'amount' => 'required|integer|min:1|max:' . Administration::MAX_SEND_CARD_PER_MONTH,
]);
try {
$this->userService->sendThankcards(
Auth::user(),
$request->receiver,
(int) $request->amount
(string) $request->input('receiver'),
(int) $request->input('amount')
);
} catch (\RuntimeException $e) {
} catch (ThankCardException $e) {
return response()->json(['success' => false, 'message' => $e->getMessage()], 422);
}
return response()->json(['success' => true, 'message' => __('messages.thank_card_send_success')]);
}
public function changePasswordForm()
/**
* Show the change password form.
*/
public function changePasswordForm(): View
{
return view('user.change_password');
}
// Show edit profile page (avatar & password)
public function editProfile()
/**
* Handle user password change.
*/
public function updatePassword(UpdatePasswordRequest $request): RedirectResponse
{
$user = Auth::user();
$this->userService->updatePassword($user, $request->input('password'));
$route = $user->role == config('constants.ROLE_ADMIN') ? 'admin.dashboard' : 'user.dashboard';
return redirect()->route($route)->with('success', __('messages.password_change_success'));
}
/**
* Show the edit profile page (avatar & password).
*/
public function editProfile(): View
{
return view('user.edit');
}
// Handle avatar upload and optional password change
public function updateProfile(Request $request)
/**
* Handle avatar upload and optional password change.
*/
public function updateProfile(UpdateProfileRequest $request): RedirectResponse
{
$request->validate([
'avatar' => 'nullable|image|max:2048', // 2MB max
'new_password' => 'nullable|min:6|confirmed',
]);
$user = Auth::user();
// Avatar handling
if ($request->hasFile('avatar')) {
$path = $request->file('avatar')->store('avatars', 'public');
$user->avatar = 'storage/' . $path;
}
// Password handling (optional)
if ($request->filled('new_password')) {
$this->userService->updatePassword($user, $request->new_password);
}
$user->save();
$this->userService->updateProfile(
$user,
$request->file('avatar'),
$request->filled('new_password') ? $request->input('new_password') : null
);
return redirect()->route('user.edit')->with('success', 'Cập nhật hồ sơ thành công');
}