rms/Marzban
1
0
Fork 0
mirror of https://github.com/Gozargah/Marzban.git synced 2026-05-17 00:25:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): error when get reseted usage (#1520)

Browse Source
This commit is contained in:
Mohammad
2024-12-15 20:13:44 +03:30
committed by GitHub
parent 43ccc2d71a
commit 52f95020de
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/db/models.py
View File

@@ -107,10 +107,10 @@ class User(Base):
return sum([log.used_traffic_at_reset for log in self.usage_logs])
@reseted_usage.expression
def reseted_usage(self):
def reseted_usage(cls):
return (
select([func.sum(UserUsageResetLogs.used_traffic_at_reset)]).
where(UserUsageResetLogs.user_id == self.id).
select(func.sum(UserUsageResetLogs.used_traffic_at_reset)).
where(UserUsageResetLogs.user_id == cls.id).
label('reseted_usage')
)

5
cli/admin.py
View File

@@ -44,7 +44,7 @@ def calculate_admin_usage(admin_id: int) -> str:
def calculate_admin_reseted_usage(admin_id: int) -> str:
with GetDB() as db:
usage = db.query(func.sum(User.reseted_usage)).filter_by(admin_id=admin_id).first()[0]
usage = db.query(func.sum(User.reseted_usage)).filter_by(admin_id=admin_id).scalar()
return readable_size(int(usage or 0))
@@ -58,7 +58,8 @@ def list_admins(
with GetDB() as db:
admins: list[Admin] = crud.get_admins(db, offset=offset, limit=limit, username=username)
utils.print_table(
table=Table("Username", 'Usage', 'Reseted usage', "Is sudo", "Created at", "Telegram ID", "Discord Webhook"),
table=Table("Username", 'Usage', 'Reseted usage', "Is sudo",
"Created at", "Telegram ID", "Discord Webhook"),
rows=[
(str(admin.username),
calculate_admin_usage(admin.id),