Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions api/ee/src/dbs/postgres/meters/dao.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,17 +132,13 @@ async def check(
if quota.monthly:
now = datetime.now(timezone.utc)

if not anchor:
meter.year = now.year
meter.month = now.month

if anchor:
if now.day < anchor:
meter.year = now.year
meter.month = now.month
else:
meter.year = now.year + now.month // 12
meter.month = (now.month + 1) % 12
if not anchor or now.day < anchor:
year, month = now.year, now.month
else:
year = now.year + now.month // 12
month = ((now.month + 1) % 12) or 12

meter.year, meter.month = year, month

async with engine.core_session() as session:
stmt = select(MeterDBE).filter_by(
Expand Down Expand Up @@ -185,15 +181,13 @@ async def adjust(
if quota.monthly:
now = datetime.now(timezone.utc)

if not anchor:
meter.year = now.year
meter.month = now.month
elif now.day < anchor:
meter.year = now.year
meter.month = now.month
if not anchor or now.day < anchor:
year, month = now.year, now.month
else:
meter.year = now.year + now.month // 12
meter.month = (now.month + 1) % 12
year = now.year + now.month // 12
month = ((now.month + 1) % 12) or 12

meter.year, meter.month = year, month

# 2. Calculate proposed value (starting from 0)
desired_value = meter.value if meter.value is not None else (meter.delta or 0)
Expand Down
Loading