System-End/nephthys
1
0
Fork 0
mirror of https://github.com/System-End/nephthys.git synced 2026-04-19 18:35:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

timezones? pfft, what are those

Browse source
This commit is contained in:
transcental 2025-07-03 22:01:27 +01:00
parent f1072fd09f
commit fae7d1ad12
2 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
nephthys/views/home/components/leaderboards.py
View file

@ -1,13 +1,11 @@
from datetime import datetime
from datetime import timedelta
import pytz
from nephthys.utils.env import env
from prisma.enums import TicketStatus
async def get_leaderboard_view(tz=None):
async def get_leaderboard_view():
tickets = await env.db.ticket.find_many() or []
users_with_closed_tickets = await env.db.user.find_many(
include={"closedTickets": True, "assignedTickets": True}, where={"helper": True}
@ -32,15 +30,11 @@ async def get_leaderboard_view(tz=None):
else:
overall_leaderboard_str = "\n".join(overall_leaderboard_lines)
# Use UTC as fallback if no timezone provided
if tz is None:
tz = pytz.UTC
now = datetime.now(tz)
now = datetime.now()
prev_day_start = now - timedelta(days=1)
prev_day_total = len(
[t for t in tickets if prev_day_start < t.createdAt.replace(tzinfo=tz) < now]
[t for t in tickets if prev_day_start < t.createdAt.replace(tzinfo=None) < now]
)
prev_day_only_closed = len(
[
@ -48,15 +42,15 @@ async def get_leaderboard_view(tz=None):
for t in tickets
if t.status == TicketStatus.CLOSED
and t.closedAt
and prev_day_start < t.closedAt.replace(tzinfo=tz) < now
and prev_day_start < t.createdAt.replace(tzinfo=tz) < now
and prev_day_start < t.closedAt.replace(tzinfo=None) < now
and prev_day_start < t.createdAt.replace(tzinfo=None) < now
]
)
prev_day_open = len(
[
t
for t in tickets
if prev_day_start < t.createdAt.replace(tzinfo=tz) < now
if prev_day_start < t.createdAt.replace(tzinfo=None) < now
and t.status == TicketStatus.OPEN
]
)
@ -65,7 +59,7 @@ async def get_leaderboard_view(tz=None):
t
for t in tickets
if t.assignedAt
and prev_day_start < t.assignedAt.replace(tzinfo=tz) < now
and prev_day_start < t.assignedAt.replace(tzinfo=None) < now
and t.status == TicketStatus.IN_PROGRESS
]
)
@ -75,11 +69,11 @@ async def get_leaderboard_view(tz=None):
for t in tickets
if t.status == TicketStatus.CLOSED
and t.closedAt
and prev_day_start < t.closedAt.replace(tzinfo=tz) < now
and prev_day_start < t.closedAt.replace(tzinfo=None) < now
]
)
prev_day_leaderboard_lines = [
f"{i + 1}. <@{user.slackId}> - {len([t for t in user.closedTickets or [] if prev_day_start < t.closedAt.replace(tzinfo=tz) < now])} closed, {len([t for t in user.assignedTickets or [] if prev_day_start < t.createdAt.replace(tzinfo=tz) < now and t.status != TicketStatus.CLOSED])} assigned"
f"{i + 1}. <@{user.slackId}> - {len([t for t in user.closedTickets or [] if prev_day_start < t.closedAt.replace(tzinfo=None) < now])} closed, {len([t for t in user.assignedTickets or [] if prev_day_start < t.createdAt.replace(tzinfo=None) < now and t.status != TicketStatus.CLOSED])} assigned"
for i, user in enumerate(
sorted(
users_with_closed_tickets,
@ -87,7 +81,7 @@ async def get_leaderboard_view(tz=None):
[
t
for t in user.closedTickets or []
if prev_day_start < t.closedAt.replace(tzinfo=tz) < now
if prev_day_start < t.closedAt.replace(tzinfo=None) < now
]
),
reverse=True,

2
nephthys/views/home/helper.py
View file

@ -18,7 +18,7 @@ async def get_helper_view(user: User):
tz = pytz.timezone(tz_string)
pie_chart = await get_ticket_status_pie_chart(user, tz)
leaderboard = await get_leaderboard_view(tz)
leaderboard = await get_leaderboard_view()
btns = get_buttons(user, "dashboard")