austnv/remnawave-minishop
1
0
Fork 0
Code Issues 1 Pull Requests Activity

fix: dedupe traffic billing warnings when panel limit drifts

Browse Source
This commit is contained in:
3252a8
2026-05-12 21:32:47 +03:00
parent 6afbb72a34
commit f31540afdb
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/dal/tariff_dal.py
+9 -2
View File
@@ -63,14 +63,21 @@ async def get_warning(
level: int, level: int,
traffic_limit_bytes: Optional[int] = None, traffic_limit_bytes: Optional[int] = None,
) -> Optional[TrafficWarning]: ) -> Optional[TrafficWarning]:
"""Return an existing traffic warning row if one was already recorded.
For traffic-style billing ``period_start_at`` is NULL. Do **not** match on
``traffic_limit_bytes`` in that case: the effective limit can change between
worker ticks (panel sync, top-ups, admin adjustments). Matching on the exact
bytes caused duplicate Telegram alerts after restarts or the next poll.
The ``traffic_limit_bytes`` argument is kept for call-site compatibility
but is ignored when ``period_start_at`` is None.
"""
conditions = [ conditions = [
TrafficWarning.subscription_id == subscription_id, TrafficWarning.subscription_id == subscription_id,
TrafficWarning.level == level, TrafficWarning.level == level,
] ]
if period_start_at is None: if period_start_at is None:
conditions.append(TrafficWarning.period_start_at.is_(None)) conditions.append(TrafficWarning.period_start_at.is_(None))
if traffic_limit_bytes is not None:
conditions.append(TrafficWarning.traffic_limit_bytes == traffic_limit_bytes)
else: else:
conditions.append(TrafficWarning.period_start_at == period_start_at) conditions.append(TrafficWarning.period_start_at == period_start_at)
result = await session.execute(select(TrafficWarning).where(and_(*conditions)).limit(1)) result = await session.execute(select(TrafficWarning).where(and_(*conditions)).limit(1))