fix(users): preserve scheduled traffic cycles across manual resets

.github/workflows/test-database-migrations.yml

@@ -194,6 +194,9 @@ jobs:
             - name: Check Migrations
               run: make check-migrations
 
+            - name: Verify traffic reset races under REPEATABLE READ
+              run: .venv/bin/python -m pytest tests/api/test_user_usage_reset_cycle.py -k "mysql_repeatable_read or optimized_reset_dates" -q
+
             - name: Run Tests
               run: make test
 
@@ -317,6 +320,9 @@ jobs:
             - name: Check Migrations
               run: make check-migrations
 
+            - name: Verify traffic reset races under REPEATABLE READ
+              run: .venv/bin/python -m pytest tests/api/test_user_usage_reset_cycle.py -k "mysql_repeatable_read or optimized_reset_dates" -q
+
             - name: Run Tests (multi-worker all-in-one)
               env:
                   ROLE: all-in-one

app/db/compiles_types.py

@@ -114,7 +114,7 @@ class DateDiff(FunctionElement):
     inherit_cache = True
 
     def __init__(self, date1, date2, **kwargs):
-        super().__init__(**kwargs)
+        super().__init__(date1, date2, **kwargs)
         self.date1 = date1
         self.date2 = date2
 

app/db/crud/bulk.py

@@ -13,6 +13,7 @@
     User,
     UserStatus,
     UserUsageResetLogs,
+    UserUsageResetSource,
     users_groups_association,
 )
 from app.models.group import BulkGroup
@@ -46,8 +47,9 @@ async def reset_all_users_data_usage(
 
     Operations performed:
         - Sets `used_traffic` to 0 for all target users.
-        - Sets `status` to `active` for all users, unless filtered by admin.
-        - Deletes all related `UserUsageResetLogs` and `NextPlan` entries.
+        - Reactivates limited users while preserving all other statuses.
+        - Adds a manual `UserUsageResetLogs` row for lifetime traffic accounting.
+        - Deletes all related `NextPlan` entries.
         - Deletes `NodeUserUsage` chart rows when `clean_chart_data` is enabled.
 
     Args:
@@ -60,16 +62,28 @@ async def reset_all_users_data_usage(
         - This function assumes proper foreign key constraints and cascading rules are in place.
         - The function commits changes at the end of the operation.
     """
-    user_ids_query = select(User.id).where(User.admin_id == admin.id) if admin else select(User.id)
-    user_ids = (await db.execute(user_ids_query)).scalars().all()
+    users_query = select(User.id, User.used_traffic).order_by(User.id).with_for_update()
+    if admin:
+        users_query = users_query.where(User.admin_id == admin.id)
+    user_rows = (await db.execute(users_query)).all()
+    user_ids = [row.id for row in user_rows]
 
     if not user_ids:
         return
 
+    db.add_all(
+        [
+            UserUsageResetLogs(
+                user_id=row.id,
+                used_traffic_at_reset=row.used_traffic,
+                reset_source=UserUsageResetSource.manual.value,
+            )
+            for row in user_rows
+        ]
+    )
     reset_status = case((User.status == UserStatus.limited, UserStatus.active), else_=User.status)
     await db.execute(update(User).where(User.id.in_(user_ids)).values(used_traffic=0, status=reset_status))
 
-    await db.execute(delete(UserUsageResetLogs).where(UserUsageResetLogs.user_id.in_(user_ids)))
     if clean_chart_data:
         await db.execute(delete(NodeUserUsage).where(NodeUserUsage.user_id.in_(user_ids)))
     await db.execute(delete(NextPlan).where(NextPlan.user_id.in_(user_ids)))