Squashed commit of the following:

commit 3627419e12 Merge: 2db744d 3446ce9 Author: alwayscompiling <[email protected]> Date: Tue Dec 6 22:36:51 2022 -0500 Merge branch '45-sql-connection-timing-out' into develop commit 3446ce9ca2 Author: alwayscompiling <[email protected]> Date: Tue Dec 6 22:27:05 2022 -0500 Change session usage to on use basis. commit 2db744d170 Author: alwayscompiling <[email protected]> Date: Sun Dec 4 21:44:54 2022 -0500 Add restart policy. commit fa33be1b4a Author: alwayscompiling <[email protected]> Date: Sun Dec 4 21:25:57 2022 -0500 Renamed docker compose file.
2022-12-06 23:02:01 -05:00
parent 582b88e248
commit d04b8c5e32
12 changed files with 359 additions and 307 deletions
@@ -7,9 +7,10 @@ from typing import Optional
 import nextcord
 from nextcord.ext import commands
 from sqlalchemy import distinct, select
+from sqlalchemy.orm import Session

 # pylint: disable=import-error
-from utilities.sql_alchemy_connection import Category, CategoryGroup, Guild, Score, session
+from utilities.sql_data_classes import Category, CategoryGroup, Guild, Score, engine
 from utilities.utils import (
    autofill_categories,
    autofill_groups,
@@ -70,20 +71,21 @@ class DataManagementCog(commands.Cog, name="Table Management"):
            user_name (str): User to remove from highscores
        """

-        stmt = select(distinct(Score.CategoryId)).where(Score.UserName == user_name)
-        category_ids: "list[int]" = list(session.scalars(stmt))
+        with Session(engine) as session:
+            stmt = select(distinct(Score.CategoryId)).where(Score.UserName == user_name)
+            category_ids: "list[int]" = list(session.scalars(stmt))

-        stmt = select(Score).where(Score.UserName == user_name)
-        for score in session.scalars(stmt):
-            session.delete(score)
-        session.commit()
+            stmt = select(Score).where(Score.UserName == user_name)
+            for score in session.scalars(stmt):
+                session.delete(score)
+            session.commit()

-        group_ids = select(Category.GroupId).where(Category.CategoryId.in_(category_ids))
+            group_ids = select(Category.GroupId).where(Category.CategoryId.in_(category_ids))

-        stmt = select(CategoryGroup).where(CategoryGroup.GroupId.in_(group_ids))
+            stmt = select(CategoryGroup).where(CategoryGroup.GroupId.in_(group_ids))

-        for group in session.scalars(stmt):
-            await send_highscore_message(interaction.guild.get_channel(group.ChannelId), group)
+            for group in session.scalars(stmt):
+                await send_highscore_message(session, interaction.guild.get_channel(group.ChannelId), group)

        await interaction.send(f'User "{user_name}" was removed from all tables.', ephemeral=True)

@@ -107,20 +109,23 @@ class DataManagementCog(commands.Cog, name="Table Management"):
            user_name (str): The user to remove. Is SlashOption.
        """

-        stmt = select(CategoryGroup).where(CategoryGroup.GroupId == int(group_id))
-        group = session.scalar(stmt)
+        with Session(engine) as session:
+            stmt = select(CategoryGroup).where(CategoryGroup.GroupId == int(group_id))
+            group = session.scalar(stmt)

-        stmt = select(Category.CategoryName).where(Category.CategoryId == int(category_id))
-        category_name = session.scalar(stmt)
+            stmt = select(Category.CategoryName).where(Category.CategoryId == int(category_id))
+            category_name = session.scalar(stmt)

-        stmt = select(Score).where(Score.CategoryId == int(category_id)).where(Score.UserName == user_name)
+            stmt = select(Score).where(Score.CategoryId == int(category_id)).where(Score.UserName == user_name)

-        # there should only be one because category id and username are a composite primary key in score
-        session.delete(session.scalar(stmt))
-        session.commit()
+            # there should only be one because category id and username are a composite primary key in score
+            session.delete(session.scalar(stmt))
+            session.commit()

-        await send_highscore_message(interaction.guild.get_channel(group.ChannelId), group)
-        await interaction.response.send_message(f'User "{user_name}" removed from "{category_name}".', ephemeral=True)
+            await send_highscore_message(session, interaction.guild.get_channel(group.ChannelId), group)
+            await interaction.response.send_message(
+                f'User "{user_name}" removed from "{category_name}".', ephemeral=True
+            )

    @user.subcommand(description="Deletes a user's scores from entire group.")
    async def from_group(
@@ -138,19 +143,20 @@ class DataManagementCog(commands.Cog, name="Table Management"):
            user_name (str): The user to remove. Is SlashOption.
        """

-        stmt = select(CategoryGroup).where(CategoryGroup.GroupId == int(group_id))
-        group = session.scalar(stmt)
-        category_ids = select(Category.CategoryId).where(Category.GroupId == int(group_id))
-        stmt = select(Score).where(Score.CategoryId.in_(category_ids)).where(Score.UserName == user_name)
+        with Session(engine) as session:
+            stmt = select(CategoryGroup).where(CategoryGroup.GroupId == int(group_id))
+            group = session.scalar(stmt)
+            category_ids = select(Category.CategoryId).where(Category.GroupId == int(group_id))
+            stmt = select(Score).where(Score.CategoryId.in_(category_ids)).where(Score.UserName == user_name)

-        for score in session.scalars(stmt):
-            session.delete(score)
-        session.commit()
+            for score in session.scalars(stmt):
+                session.delete(score)
+            session.commit()

-        await send_highscore_message(interaction.guild.get_channel(group.ChannelId), group)
-        await interaction.response.send_message(
-            f'User "{user_name}" removed from all categories in {group.GroupName}.', ephemeral=True
-        )
+            await send_highscore_message(session, interaction.guild.get_channel(group.ChannelId), group)
+            await interaction.response.send_message(
+                f'User "{user_name}" removed from all categories in {group.GroupName}.', ephemeral=True
+            )

    @from_category.on_autocomplete("group_id")
    @from_group.on_autocomplete("group_id")
@@ -215,8 +221,10 @@ class DataManagementCog(commands.Cog, name="Table Management"):
            old_username (str): Username to replace.
            new_username (str): Username to replace old with.
        """
-        stmt = select(Guild.VerificationChannel).where(Guild.GuildId == interaction.guild_id)
-        verify_channel = interaction.guild.get_channel(session.scalar(stmt))
+
+        with Session(engine) as session:
+            stmt = select(Guild.VerificationChannel).where(Guild.GuildId == interaction.guild_id)
+            verify_channel = interaction.guild.get_channel(session.scalar(stmt))

        embed: nextcord.Embed = nextcord.Embed(title="Username change request.")
        embed.add_field(name="Old Username", value=old_username)