fix: delete expired accounts

Author: ImMohammad20000

app/db/crud/user.py

@@ -1,4 +1,3 @@
-import asyncio
 from copy import deepcopy
 from datetime import UTC, datetime, timedelta, timezone
 from enum import Enum
@@ -201,6 +200,7 @@ async def get_expired_users(
     if admin_id:
         query = query.where(User.admin_id == admin_id)
 
+
     return (await db.execute(query)).unique().scalars().all()
 
 
@@ -503,10 +503,7 @@ async def remove_users(db: AsyncSession, db_users: list[User]):
     """
     user_ids = [user.id for user in db_users]
 
-    # Delete related subscription updates first
-    await db.execute(delete(UserSubscriptionUpdate).where(UserSubscriptionUpdate.user_id.in_(user_ids)))
-
-    await asyncio.gather(*[db.delete(user) for user in db_users])
+    await db.execute(delete(User).where(User.id.in_(user_ids)))
     await db.commit()
 
 

app/operation/__init__.py

@@ -14,8 +14,8 @@
     get_user,
     get_user_template,
 )
-from app.db.crud.user import get_user_by_id
 from app.db.crud.admin import get_admin_by_id
+from app.db.crud.user import get_user_by_id
 from app.db.models import Admin as DBAdmin, CoreConfig, Group, Node, ProxyHost, User, UserTemplate
 from app.models.admin import AdminDetails
 from app.models.group import BulkGroup
@@ -50,19 +50,18 @@ async def raise_error(self, message: str, code: int, db: AsyncSession | None = N
 
     async def validate_dates(self, start: dt | None, end: dt | None) -> tuple[dt, dt]:
         """Validate if start and end dates are correct and if end is after start."""
+
+        start_date = None
+        end_date = None
         try:
             if start:
                 start_date = fix_datetime_timezone(start)
-            else:
-                start_date = dt.now(tz.utc) - td(days=30)
 
             if end:
                 end_date = fix_datetime_timezone(end)
-            else:
-                end_date = dt.now(tz.utc)
 
             # Compare dates only after both are set
-            if end_date < start_date:
+            if (start_date and end_date) and end_date < start_date:
                 await self.raise_error(message="Start date must be before end date", code=400)
 
             return start_date, end_date

app/operation/user.py

@@ -369,8 +369,8 @@ async def delete_expired_users(
         self,
         db: AsyncSession,
         admin: AdminDetails,
-        expired_after: dt = None,
-        expired_before: dt = None,
+        expired_after: dt | None = None,
+        expired_before: dt | None = None,
         admin_username: str = None,
     ) -> RemoveUsersResponse:
         """
@@ -382,6 +382,7 @@ async def delete_expired_users(
         """
 
         expired_after, expired_before = await self.validate_dates(expired_after, expired_before)
+
         if admin_username:
             admin_id = (await self.get_validated_admin(db, admin_username)).id
         else:
@@ -390,7 +391,7 @@ async def delete_expired_users(
         await remove_users(db, users)
 
         username_list = [row.username for row in users]
-        self.remove_users_logger(users=username_list, by=admin.username)
+        await self.remove_users_logger(users=username_list, by=admin.username)
 
         return RemoveUsersResponse(users=username_list, count=len(username_list))