diff --git a/app/backoffice/dashboard.py b/app/backoffice/dashboard.py index cd39693..d423260 100644 --- a/app/backoffice/dashboard.py +++ b/app/backoffice/dashboard.py @@ -15,15 +15,19 @@ async def get_dashboard_context() -> dict: async with AsyncSessionLocal() as session: today_start = datetime.now(TIMEZONE).replace(hour=0, minute=0, second=0, microsecond=0) - total_users = (await session.execute( - select(func.count()).select_from(User).where(User.is_deleted == False) - )).scalar() - pending_charge_requests_count = (await session.execute( select(func.count()).select_from(CreditChargeRequest) .where(CreditChargeRequest.status == ChargeRequestStatus.PENDING) )).scalar() + today_charge = (await session.execute( + select(func.count()).select_from(CreditTransaction) + .where( + CreditTransaction.type == CreditTransactionType.CHARGE, + CreditTransaction.created_at >= today_start, + ) + )).scalar() + today_consume = (await session.execute( select(func.count()).select_from(CreditTransaction) .where( @@ -32,11 +36,13 @@ async def get_dashboard_context() -> dict: ) )).scalar() - today_charge = (await session.execute( - select(func.count()).select_from(CreditTransaction) + month_start = datetime.now(TIMEZONE).replace(day=1, hour=0, minute=0, second=0, microsecond=0) + month_consume = (await session.execute( + select(func.coalesce(func.sum(func.abs(CreditTransaction.amount)), 0)) + .select_from(CreditTransaction) .where( - CreditTransaction.type == CreditTransactionType.CHARGE, - CreditTransaction.created_at >= today_start, + CreditTransaction.type == CreditTransactionType.CONSUME, + CreditTransaction.created_at >= month_start, ) )).scalar() @@ -62,10 +68,10 @@ async def get_dashboard_context() -> dict: return { "stats": { - "total_users": total_users, "pending_charge_requests": pending_charge_requests_count, - "today_consume": today_consume, "today_charge": today_charge, + "today_consume": today_consume, + "month_consume": month_consume, }, "pending_requests": pending_requests, "recent_transactions": recent_transactions, diff --git a/app/backoffice/frontend/templates/sqladmin/index.html b/app/backoffice/frontend/templates/sqladmin/index.html index d6fe8e6..ffbea24 100644 --- a/app/backoffice/frontend/templates/sqladmin/index.html +++ b/app/backoffice/frontend/templates/sqladmin/index.html @@ -7,15 +7,7 @@
-
전체 사용자
-
{{ stats.total_users }}
-
-
-
-
-
-
-
대기 중 충전 요청
+
대기 중인 요청
{{ stats.pending_charge_requests }}
@@ -23,7 +15,15 @@
-
오늘 크레딧 소모
+
오늘 승인한 요청
+
{{ stats.today_charge }}
+
+
+
+
+
+
+
오늘 소모 크레딧
{{ stats.today_consume }}
@@ -31,19 +31,19 @@
-
오늘 충전 승인
-
{{ stats.today_charge }}
+
이번 달 소모 크레딧
+
{{ stats.month_consume }}
- +
-

대기 중 충전 요청

+

대기 중인 요청

전체 보기
diff --git a/app/user/api/user_admin.py b/app/user/api/user_admin.py index 9c20972..dadea04 100644 --- a/app/user/api/user_admin.py +++ b/app/user/api/user_admin.py @@ -56,8 +56,6 @@ class UserAdmin(SuperAdminEditable, ModelView, model=User): "last_login_at", "created_at", "updated_at", - "credit_requests", - "credit_transactions", ] form_columns = [ @@ -119,61 +117,60 @@ class UserAdmin(SuperAdminEditable, ModelView, model=User): } @action( - name="block_user", + name="01_block_user", label="계정 차단", confirmation_message="선택한 사용자를 차단하시겠습니까?", add_in_list=True, ) - async def block_user_action(self, request: Request) -> RedirectResponse: + async def seq_f_block_user_action(self, request: Request) -> RedirectResponse: return await handle_block_users(request, self.identity, block=True) @action( - name="unblock_user", + name="02_unblock_user", label="차단 해제", confirmation_message="선택한 사용자의 차단을 해제하시겠습니까?", add_in_list=True, ) - async def unblock_user_action(self, request: Request) -> RedirectResponse: + async def seq_e_unblock_user_action(self, request: Request) -> RedirectResponse: return await handle_block_users(request, self.identity, block=False) - @action( - name="grant_credits_1", + name="03_grant_credits_1", label="크레딧 +1", confirmation_message="선택한 사용자에게 크레딧 1개를 충전하시겠습니까?", add_in_list=True, ) - async def grant_credits_1_action(self, request: Request) -> RedirectResponse: + async def seq_d_grant_credits_1_action(self, request: Request) -> RedirectResponse: admin_id = request.session.get("admin_id") return await handle_grant_credits(request, self.identity, amount=1, admin_id=admin_id) @action( - name="grant_credits_5", + name="04_grant_credits_5", label="크레딧 +5", confirmation_message="선택한 사용자에게 크레딧 5개를 충전하시겠습니까?", add_in_list=True, ) - async def grant_credits_5_action(self, request: Request) -> RedirectResponse: + async def seq_c_grant_credits_5_action(self, request: Request) -> RedirectResponse: admin_id = request.session.get("admin_id") return await handle_grant_credits(request, self.identity, amount=5, admin_id=admin_id) @action( - name="grant_credits_10", + name="05_grant_credits_10", label="크레딧 +10", confirmation_message="선택한 사용자에게 크레딧 10개를 충전하시겠습니까?", add_in_list=True, ) - async def grant_credits_10_action(self, request: Request) -> RedirectResponse: + async def seq_b_grant_credits_10_action(self, request: Request) -> RedirectResponse: admin_id = request.session.get("admin_id") return await handle_grant_credits(request, self.identity, amount=10, admin_id=admin_id) @action( - name="deduct_credits_1", + name="06_deduct_credits_1", label="크레딧 -1", confirmation_message="선택한 사용자의 크레딧 1개를 차감하시겠습니까?", add_in_list=True, ) - async def deduct_credits_1_action(self, request: Request) -> RedirectResponse: + async def seq_a_deduct_credits_1_action(self, request: Request) -> RedirectResponse: admin_id = request.session.get("admin_id") return await handle_deduct_credits(request, self.identity, amount=1, admin_id=admin_id) @@ -201,8 +198,6 @@ class SocialAccountAdmin(ViewerAccessible, ModelView, model=SocialAccount): "platform", "platform_user_id", "platform_username", - "platform_data", - "scope", "token_expires_at", "is_active", "is_deleted",