feature: keep sidebar and add service layer
This commit is contained in:
@@ -2,53 +2,23 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Models\User;
|
||||
use App\Models\Administration;
|
||||
use App\Models\AddCard;
|
||||
use App\Services\Admin\Contracts\AdminServiceInterface;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class AdminController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private AdminServiceInterface $adminService
|
||||
) {}
|
||||
|
||||
public function index(Request $request)
|
||||
{
|
||||
$selectedMonth = $request->input('month', Carbon::now()->format('Y-m'));
|
||||
$startOfMonth = Carbon::parse($selectedMonth)->startOfMonth();
|
||||
$endOfMonth = Carbon::parse($selectedMonth)->endOfMonth();
|
||||
|
||||
// 1. Calculate top stats from all active users
|
||||
$allActiveUsers = User::where('status', User::STATUS_ACTIVE)->get()->map(function($user) use ($startOfMonth, $endOfMonth) {
|
||||
$user->total_received = Administration::where('receiver', $user->msnv)
|
||||
->whereBetween('date', [$startOfMonth, $endOfMonth])
|
||||
->sum('received');
|
||||
|
||||
$user->total_sent = Administration::where('sender', $user->msnv)
|
||||
->whereBetween('date', [$startOfMonth, $endOfMonth])
|
||||
->sum('sent');
|
||||
|
||||
return $user;
|
||||
});
|
||||
|
||||
$topReceivedUser = $allActiveUsers->sortByDesc('total_received')->first();
|
||||
$topSentUser = $allActiveUsers->sortByDesc('total_sent')->first();
|
||||
|
||||
// 2. Paginate users for the list table (10 per page)
|
||||
$users = User::where('status', User::STATUS_ACTIVE)->paginate(10)->withQueryString();
|
||||
|
||||
// 3. Compute stats only for the paginated users (to display in the table)
|
||||
$users->getCollection()->transform(function($user) use ($startOfMonth, $endOfMonth) {
|
||||
$user->total_received = Administration::where('receiver', $user->msnv)
|
||||
->whereBetween('date', [$startOfMonth, $endOfMonth])
|
||||
->sum('received');
|
||||
|
||||
$user->total_sent = Administration::where('sender', $user->msnv)
|
||||
->whereBetween('date', [$startOfMonth, $endOfMonth])
|
||||
->sum('sent');
|
||||
|
||||
return $user;
|
||||
});
|
||||
['users' => $users, 'topReceivedUser' => $topReceivedUser, 'topSentUser' => $topSentUser]
|
||||
= $this->adminService->getUserListWithStats($selectedMonth);
|
||||
|
||||
return view('admin.users.index', compact('users', 'selectedMonth', 'topReceivedUser', 'topSentUser'));
|
||||
}
|
||||
@@ -61,83 +31,50 @@ class AdminController extends Controller
|
||||
public function store(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'msnv' => 'required|unique:user,msnv',
|
||||
'mail' => 'required|email|unique:user,mail',
|
||||
'msnv' => 'required|unique:user,msnv',
|
||||
'mail' => 'required|email|unique:user,mail',
|
||||
'password' => 'required|min:6',
|
||||
'role' => 'required|in:' . User::ROLE_MEMBER . ',' . User::ROLE_ADMIN
|
||||
'role' => 'required|in:' . User::ROLE_MEMBER . ',' . User::ROLE_ADMIN,
|
||||
]);
|
||||
|
||||
User::create([
|
||||
'msnv' => $request->msnv,
|
||||
'mail' => $request->mail,
|
||||
'pass' => Hash::make($request->password),
|
||||
'role' => $request->role,
|
||||
'status' => User::STATUS_ACTIVE,
|
||||
'card' => 0,
|
||||
'flag_send' => User::FLAG_SEND_DISABLED,
|
||||
'first_login' => User::FIRST_LOGIN_TRUE
|
||||
]);
|
||||
$this->adminService->createUser($request->only('msnv', 'mail', 'password', 'role'));
|
||||
|
||||
return redirect()->route('admin.users.index')->with('success', 'Tạo user thành công!');
|
||||
return redirect()->route('admin.users.index')->with('success', __('messages.user_create_success'));
|
||||
}
|
||||
|
||||
public function edit(Request $request, $msnv)
|
||||
{
|
||||
$user = User::where('msnv', $msnv)->firstOrFail();
|
||||
|
||||
$user = User::where('msnv', $msnv)->firstOrFail();
|
||||
$selectedMonth = $request->input('month', Carbon::now()->format('Y-m'));
|
||||
$startOfMonth = Carbon::parse($selectedMonth)->startOfMonth();
|
||||
$endOfMonth = Carbon::parse($selectedMonth)->endOfMonth();
|
||||
|
||||
$administrations = Administration::where(function($q) use ($msnv) {
|
||||
$q->where('sender', $msnv)->orWhere('receiver', $msnv);
|
||||
})
|
||||
->whereBetween('date', [$startOfMonth, $endOfMonth])
|
||||
->orderBy('date', 'desc')
|
||||
->get();
|
||||
$administrations = $this->adminService->getUserTransactions($msnv, $selectedMonth);
|
||||
|
||||
return view('admin.users.edit', compact('user', 'administrations', 'selectedMonth'));
|
||||
}
|
||||
|
||||
public function update(Request $request, $msnv)
|
||||
{
|
||||
$user = User::where('msnv', $msnv)->firstOrFail();
|
||||
|
||||
$request->validate([
|
||||
'num_card' => 'nullable|integer|min:1',
|
||||
'flag_send' => 'nullable|boolean'
|
||||
'num_card' => 'nullable|integer|min:1',
|
||||
'flag_send' => 'nullable|boolean',
|
||||
]);
|
||||
|
||||
DB::transaction(function () use ($request, $user) {
|
||||
if ($request->filled('num_card')) {
|
||||
AddCard::create([
|
||||
'buyer' => $user->msnv,
|
||||
'num_card' => $request->num_card,
|
||||
'seller' => auth()->user()->msnv,
|
||||
'date' => Carbon::today()
|
||||
]);
|
||||
$user->card += $request->num_card;
|
||||
}
|
||||
$this->adminService->updateUser($msnv, $request->only('num_card', 'flag_send'));
|
||||
|
||||
$user->flag_send = $request->has('flag_send') ? User::FLAG_SEND_ENABLED : User::FLAG_SEND_DISABLED;
|
||||
$user->save();
|
||||
});
|
||||
|
||||
return redirect()->back()->with('success', 'Cập nhật thành công!');
|
||||
return redirect()->back()->with('success', __('messages.user_update_success'));
|
||||
}
|
||||
|
||||
public function destroy($msnv)
|
||||
{
|
||||
$user = User::where('msnv', $msnv)->firstOrFail();
|
||||
$user->status = User::STATUS_INACTIVE;
|
||||
$user->save();
|
||||
$this->adminService->deactivateUser($msnv);
|
||||
|
||||
return redirect()->route('admin.users.index')->with('success', 'Đã đánh dấu nhân viên nghỉ việc thành công!');
|
||||
return redirect()->route('admin.users.index')->with('success', __('messages.user_deactivate_success'));
|
||||
}
|
||||
|
||||
public function resetCards()
|
||||
{
|
||||
User::where('status', User::STATUS_ACTIVE)->update(['card' => 0]);
|
||||
return redirect()->back()->with('success', 'Reset thẻ toàn hệ thống thành công!');
|
||||
$this->adminService->resetAllCards();
|
||||
|
||||
return redirect()->back()->with('success', __('messages.cards_reset_success'));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user