From 7e0ff1da18b090a1476ff7dd3b081fe8926db8c2 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Tue, 3 Sep 2024 11:42:20 -0400 Subject: [PATCH] Rename EventPoints.Cycle to EventPoints.QuarterName. --- .vscode/settings.json | 1 + cogs/commands/view.py | 4 ++-- database_setup/database.sql | 2 +- utils.py | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f1b7934..a8cedf8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "cSpell.words": [ "aiofiles", + "autofilled", "blurple", "CLANLEADER", "Dakiny", diff --git a/cogs/commands/view.py b/cogs/commands/view.py index 96a9ef4..accd83a 100644 --- a/cogs/commands/view.py +++ b/cogs/commands/view.py @@ -49,7 +49,7 @@ class ViewCog(commands.Cog, name="View Commands"): with Session(engine) as session: if quarter_name: ppdf = pd.read_sql_query( - sql=session.query(EventPoints).where(EventPoints.Cycle.startswith(quarter_name)).statement, + sql=session.query(EventPoints).where(EventPoints.QuarterName.startswith(quarter_name)).statement, con=engine, ) else: @@ -201,7 +201,7 @@ class ViewCog(commands.Cog, name="View Commands"): quarter_name (str): String to run autocomplete on. """ with Session(engine) as session: - stmt = select(EventPoints.Cycle).distinct() + stmt = select(EventPoints.QuarterName).distinct() quarters = session.scalars(stmt) # if empty compare string diff --git a/database_setup/database.sql b/database_setup/database.sql index bffac4d..8430856 100644 --- a/database_setup/database.sql +++ b/database_setup/database.sql @@ -42,7 +42,7 @@ CREATE TABLE Presences ( ); CREATE TABLE EventPoints ( - Cycle varchar(30) not null, + QuarterName varchar(30) not null, UserId varchar(32) not null, DiscordMember boolean not null, Points int unsigned DEFAULT 0, diff --git a/utils.py b/utils.py index e5a7b73..091fee2 100644 --- a/utils.py +++ b/utils.py @@ -318,13 +318,13 @@ def record_event_points(config: DakinyConfig, users: Sequence[str], add_points: quarter_name = get_quarter_name(config) with Session(engine) as session: for user in users: - stmt = select(EventPoints).where(EventPoints.UserId == user).where(EventPoints.Cycle == quarter_name) + stmt = select(EventPoints).where(EventPoints.UserId == user).where(EventPoints.QuarterName == quarter_name) points = session.scalar(stmt) if points is None: add_points = get_allowed_points(session, config.params.event_points_weekly_limit, user, add_points) new_points = EventPoints( - Cycle=quarter_name, + QuarterName=quarter_name, UserId=user, DiscordMember=is_member, Points=add_points,