diff --git a/cogs/commands/create.py b/cogs/commands/create.py index b5214f6..08703cc 100644 --- a/cogs/commands/create.py +++ b/cogs/commands/create.py @@ -4,8 +4,10 @@ import nextcord from nextcord.ext import commands from sqlalchemy import exc, select from sqlalchemy.orm import Session +from sqlmodel import col -from database.db import Category, CategoryGroup, engine +from database.db import engine +from database.models import Category, CategoryGroup from utilities.utils import MAX_LINE_LENGTH, autofill_groups, send_highscore_message @@ -52,30 +54,30 @@ class CreateCog(commands.Cog, name="Create Cog"): size (int): How many sores to show in the category message. Is SlashOption. """ new_category = Category( - CategoryName=category_name, - GroupId=int(group_id), - Size=size, - IsAscending=is_ascending, - IsTimeRecord=is_time_record, - IsValidated=is_validated, + name=category_name, + group_id=int(group_id), + size=size, + is_ascending=is_ascending, + is_time_record=is_time_record, + is_validated=is_validated, ) # Open connection to engine and add new category. with Session(engine) as session: - stmt = select(CategoryGroup).where(CategoryGroup.GroupId == int(group_id)) + stmt = select(CategoryGroup).where(col(CategoryGroup.id) == int(group_id)) group = session.scalar(stmt) try: session.add(new_category) session.commit() await send_highscore_message(session, interaction.guild, group) await interaction.response.send_message( - f'"{category_name}" has been added to "{group.GroupName}"!', ephemeral=True + f'"{category_name}" has been added to "{group.name}"!', ephemeral=True ) except exc.IntegrityError: # Category name already exists in group session.rollback() await interaction.response.send_message( - f'"{category_name}" already exists in "{group.GroupName}". Please rename.', ephemeral=True + f'"{category_name}" already exists in "{group.name}". Please rename.', ephemeral=True ) @create.subcommand(description="Create a new Category Group. Must not exist already for Guild.") @@ -123,11 +125,11 @@ class CreateCog(commands.Cog, name="Create Cog"): channel_id: int = channel.id new_group = CategoryGroup( - GroupName=group_name, - ChannelId=channel_id, - GuildId=interaction.guild_id, - PadLength=pad_length, - UsernameLength=username_length, + name=group_name, + channel_id=channel_id, + guild_id=interaction.guild_id, + pad_length=pad_length, + username_length=username_length, ) with Session(engine) as session: