fix: get users usage error

Author: ImMohammad20000

app/operation/__init__.py

@@ -1,4 +1,4 @@
-from datetime import datetime as dt, timezone as tz
+from datetime import datetime as dt, timedelta as td, timezone as tz
 from enum import IntEnum
 
 from fastapi import HTTPException
@@ -48,7 +48,7 @@ async def raise_error(self, message: str, code: int, db: AsyncSession | None = N
         else:
             raise ValueError(message)
 
-    async def validate_dates(self, start: dt | None, end: dt | None) -> tuple[dt, dt]:
+    async def validate_dates(self, start: dt | None, end: dt | None, set_default_values: bool) -> tuple[dt, dt]:
         """Validate if start and end dates are correct and if end is after start."""
 
         start_date = None
@@ -60,8 +60,11 @@ async def validate_dates(self, start: dt | None, end: dt | None) -> tuple[dt, dt
             if end:
                 end_date = fix_datetime_timezone(end)
 
-            if not end_date:
-                end_date = dt.now(tz.utc)
+            if set_default_values:
+                if not start_date:
+                    start_date = dt.now(tz.utc) - td(days=30)
+                if not end_date:
+                    end_date = dt.now(tz.utc)
 
             # Compare dates only after both are set
             if (start_date and end_date) and end_date < start_date:

app/operation/node.py

@@ -2,7 +2,7 @@
 from datetime import datetime as dt
 from typing import AsyncIterator, Callable
 
-from PasarGuardNodeBridge import PasarGuardNode, NodeAPIError
+from PasarGuardNodeBridge import NodeAPIError, PasarGuardNode
 from sqlalchemy.exc import IntegrityError
 
 from app import notification
@@ -288,13 +288,11 @@ async def connect_single(node: Node) -> dict | None:
                 message=result.get("message"),
             )
 
-            notifications_to_send.append(
-                {
-                    "node": node_notif,
-                    "status": result["status"],
-                    "old_status": result["old_status"],
-                }
-            )
+            notifications_to_send.append({
+                "node": node_notif,
+                "status": result["status"],
+                "old_status": result["old_status"],
+            })
 
         # Bulk update all statuses in ONE query
         await bulk_update_node_status(db, valid_results)
@@ -396,7 +394,7 @@ async def get_usage(
         node_id: int | None = None,
         group_by_node: bool = False,
     ) -> NodeUsageStatsList:
-        start, end = await self.validate_dates(start, end)
+        start, end = await self.validate_dates(start, end, True)
         return await get_nodes_usage(db, start, end, period=period, node_id=node_id, group_by_node=group_by_node)
 
     async def get_logs(self, node_id: Node) -> Callable[[], AsyncIterator[asyncio.Queue]]:
@@ -410,7 +408,7 @@ async def get_logs(self, node_id: Node) -> Callable[[], AsyncIterator[asyncio.Qu
     async def get_node_stats_periodic(
         self, db: AsyncSession, node_id: id, start: dt = None, end: dt = None, period: Period = Period.hour
     ) -> NodeStatsList:
-        start, end = await self.validate_dates(start, end)
+        start, end = await self.validate_dates(start, end,True)
 
         return await get_node_stats(db, node_id, start, end, period=period)
 

app/operation/subscription.py

@@ -201,7 +201,7 @@ async def get_user_usage(
         period: Period = Period.hour,
     ) -> UserUsageStatsList:
         """Fetches the usage statistics for the user within a specified date range."""
-        start, end = await self.validate_dates(start, end)
+        start, end = await self.validate_dates(start, end, True)
 
         db_user = await self.get_validated_sub(db, token=token)
 

app/operation/user.py

@@ -240,7 +240,7 @@ async def get_user_usage(
         node_id: int | None = None,
         group_by_node: bool = False,
     ) -> UserUsageStatsList:
-        start, end = await self.validate_dates(start, end)
+        start, end = await self.validate_dates(start, end, True)
         db_user = await self.get_validated_user(db, username, admin)
 
         if not admin.is_sudo:
@@ -320,7 +320,7 @@ async def get_users_usage(
         group_by_node: bool = False,
     ) -> UserUsageStatsList:
         """Get all users usage"""
-        start, end = await self.validate_dates(start, end)
+        start, end = await self.validate_dates(start, end, True)
 
         if not admin.is_sudo:
             node_id = None
@@ -357,7 +357,7 @@ async def get_expired_users(
         - If both are omitted, returns all expired users
         """
 
-        expired_after, expired_before = await self.validate_dates(expired_after, expired_before)
+        expired_after, expired_before = await self.validate_dates(expired_after, expired_before, False)
         if admin_username:
             admin_id = (await self.get_validated_admin(db, admin_username)).id
         else:
@@ -381,7 +381,7 @@ async def delete_expired_users(
         - At least one of expired_after or expired_before must be provided
         """
 
-        expired_after, expired_before = await self.validate_dates(expired_after, expired_before)
+        expired_after, expired_before = await self.validate_dates(expired_after, expired_before, False)
 
         if admin_username:
             admin_id = (await self.get_validated_admin(db, admin_username)).id