feat(admin): add role eager loading and admin details helper for usage warnings

- Add selectinload for Admin.role in get_usage_percentage_reached_admins and get_active_to_limited_admins queries to prevent N+1 queries
- Add load_role parameter to load_admin_attrs function for flexible role relationship loading
- Create _admin_usage_warning_details helper function to properly construct AdminDetails with role and permission overrides for usage limit notifications
- Update bulk_create_from_template, modify_with_template, and create_user_from_template handlers to accept and pass admin parameter to get_user_templates
- Import Admin model and AdminRoleData, RoleLimits types in review_admins module for proper type handling

Author: x0sina

app/db/crud/admin.py

@@ -2,6 +2,7 @@
 
 from sqlalchemy import and_, case, delete, func, insert, not_, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.orm import selectinload
 
 from app.db.crud.general import (
     _build_trunc_expression,
@@ -31,12 +32,19 @@
 logger = get_logger("admin-crud")
 
 
-async def load_admin_attrs(admin: Admin, load_users: bool = True, load_usage_logs: bool = True):
+async def load_admin_attrs(
+    admin: Admin,
+    load_users: bool = True,
+    load_usage_logs: bool = True,
+    load_role: bool = True,
+):
     try:
         if load_users:
             await admin.awaitable_attrs.users
         if load_usage_logs:
             await admin.awaitable_attrs.usage_logs
+        if load_role:
+            await admin.awaitable_attrs.role
     except AttributeError:
         pass
 
@@ -452,12 +460,16 @@ async def get_usage_percentage_reached_admins(
         .exists()
     )
 
-    stmt = select(Admin).where(
-        Admin.status == AdminStatus.active,
-        Admin.data_limit.isnot(None),
-        Admin.data_limit > 0,
-        (Admin.used_traffic * 100) >= (Admin.data_limit * percentage),
-        not_(existing_reminder_subq),
+    stmt = (
+        select(Admin)
+        .options(selectinload(Admin.role))
+        .where(
+            Admin.status == AdminStatus.active,
+            Admin.data_limit.isnot(None),
+            Admin.data_limit > 0,
+            (Admin.used_traffic * 100) >= (Admin.data_limit * percentage),
+            not_(existing_reminder_subq),
+        )
     )
 
     if admin_ids is not None:
@@ -491,7 +503,7 @@ async def delete_admin_notification_reminders(
 
 async def get_active_to_limited_admins(db: AsyncSession) -> list[Admin]:
     """Return ALL active admins that have exceeded their data_limit (for status flip)."""
-    stmt = select(Admin).where(
+    stmt = select(Admin).options(selectinload(Admin.role)).where(
         Admin.status == AdminStatus.active,
         Admin.data_limit.isnot(None),
         Admin.data_limit > 0,

app/jobs/review_admins.py

@@ -20,8 +20,9 @@
     update_admin_status,
 )
 from app.db.crud.user import get_users
-from app.db.models import AdminStatus, ReminderType, UserStatus
-from app.models.admin import AdminDetails
+from app.db.models import Admin, AdminStatus, ReminderType, UserStatus
+from app.models.admin import AdminDetails, AdminRoleData
+from app.models.admin_role import RoleLimits
 from app.models.user import UserListQuery
 from app.models.validators import ListValidator
 from app.node.sync import remove_users as sync_remove_users
@@ -32,6 +33,29 @@
 logger = get_logger("review-admins")
 
 
+def _admin_usage_warning_details(admin: Admin) -> AdminDetails:
+    return AdminDetails(
+        id=admin.id,
+        username=admin.username,
+        used_traffic=int(admin.used_traffic or 0),
+        data_limit=admin.data_limit,
+        status=admin.status,
+        telegram_id=admin.telegram_id,
+        discord_webhook=admin.discord_webhook,
+        discord_id=admin.discord_id,
+        sub_domain=admin.sub_domain,
+        profile_title=admin.profile_title,
+        support_url=admin.support_url,
+        notification_enable=admin.notification_enable,
+        sub_template=admin.sub_template,
+        note=admin.note,
+        role=AdminRoleData.model_validate(admin.role) if admin.role else None,
+        permission_overrides=RoleLimits.model_validate(admin.permission_overrides)
+        if admin.permission_overrides
+        else None,
+    )
+
+
 async def _send_usage_limit_warning_notifications(db):
     notify_settings = await notification_enable()
     admin_notify = notify_settings.admin
@@ -55,7 +79,7 @@ async def _send_usage_limit_warning_notifications(db):
             if not admin.data_limit or admin.data_limit <= 0:
                 continue
             usage_percentage = int((admin.used_traffic * 100) / admin.data_limit)
-            admin_model = AdminDetails.model_validate(admin)
+            admin_model = _admin_usage_warning_details(admin)
             await notification.admin_usage_limit_reached(admin_model, usage_percentage, threshold)
             reminder_rows.append(
                 {

app/telegram/handlers/admin/bulk_actions.py

@@ -69,8 +69,8 @@ async def bulk_actions(event: CallbackQuery, admin: AdminDetails):
 @router.callback_query(
     HasPermission("users", "create"), BulkActionPanel.Callback.filter(BulkAction.create_from_template == F.action)
 )
-async def bulk_create_from_template(event: CallbackQuery, db: AsyncSession, state: FSMContext):
-    templates = await user_templates.get_user_templates(db, UserTemplateListQuery())
+async def bulk_create_from_template(event: CallbackQuery, db: AsyncSession, state: FSMContext, admin: AdminDetails):
+    templates = await user_templates.get_user_templates(db, UserTemplateListQuery(), admin)
     if not templates:
         return await event.answer(Texts.there_is_no_template)
 

app/telegram/handlers/admin/user.py

@@ -511,8 +511,10 @@ async def activate_next_plan(
 @router.callback_query(
     HasPermission("users", "update"), UserPanel.Callback.filter(UserPanelAction.modify_with_template == F.action)
 )
-async def modify_with_template(event: CallbackQuery, db: AsyncSession, callback_data: UserPanel.Callback):
-    templates = await user_templates.get_user_templates(db, UserTemplateListQuery())
+async def modify_with_template(
+    event: CallbackQuery, db: AsyncSession, admin: AdminDetails, callback_data: UserPanel.Callback
+):
+    templates = await user_templates.get_user_templates(db, UserTemplateListQuery(), admin)
     if not templates:
         return await event.answer(Texts.there_is_no_template)
 
@@ -542,8 +544,8 @@ async def modify_with_template_done(
     HasPermission("users", "create"),
     AdminPanel.Callback.filter(AdminPanelAction.create_user_from_template == F.action),
 )
-async def create_user_from_template(event: CallbackQuery, db: AsyncSession):
-    templates = await user_templates.get_user_templates(db, UserTemplateListQuery())
+async def create_user_from_template(event: CallbackQuery, db: AsyncSession, admin: AdminDetails):
+    templates = await user_templates.get_user_templates(db, UserTemplateListQuery(), admin)
     if not templates:
         return await event.answer(Texts.there_is_no_template)
     await event.message.edit_text(Texts.choose_a_template, reply_markup=ChooseTemplate(templates).as_markup())