Feat: Update file to use new models.

2025-07-24 13:46:13 -04:00
parent 3dfdc10334
commit 530ca5b172
1 changed files with 84 additions and 34 deletions
@@ -1,17 +1,21 @@
 """Contains various views to be used in the high council nomination process."""

 import nextcord
+from nextcord.interactions import Interaction
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+from sqlmodel import col
+
 from dakiny_bot.dakiny_settings import settings
-from dakiny_bot.database.sql_data_classes import CouncilMembers, engine
+from dakiny_bot.database.db import engine
+from dakiny_bot.database.models import CouncilMember
+from dakiny_bot.logger import dakiny_logger
 from dakiny_bot.utils import (
    NOMINEE_SPLITTER,
    decorate_cl_nomination,
    decorate_dm_nomination,
    get_election_name,
 )
-from nextcord.interactions import Interaction
-from sqlalchemy import select
-from sqlalchemy.orm import Session


 class NominateDMModal(nextcord.ui.Modal):
@@ -52,26 +56,37 @@ class NominateDMModal(nextcord.ui.Modal):
            interaction (Interaction): Interaction with user.

        """
-        speech = decorate_dm_nomination(interaction.user.id, self.speech.value)
+        if interaction.user is None or not isinstance(interaction.channel, nextcord.TextChannel):
+            # ignore none... Don't know what situation this is.
+            # if not textchannel, don't know how callback happened
+            return
+
+        speech = decorate_dm_nomination(interaction.user.id, self.speech.value if self.speech.value else "")

        with Session(engine) as session:
            # user already in table
            election_name = get_election_name()
            stmt = (
-                select(CouncilMembers)
-                .where(CouncilMembers.ElectionName == election_name)
-                .where(CouncilMembers.MemberId == self.usr_id)
+                select(CouncilMember)
+                .where(col(CouncilMember.election_name == election_name))
+                .where(col(CouncilMember.member_id == self.usr_id))
            )
            council_elect = session.scalar(stmt)

-            if not self.usr_nominated:
+            if council_elect is None:
+                dakiny_logger.error("Did not find member (id: %s) in election %s.", self.usr_id, election_name)
+                return
+
+            if not self.usr_nominated or council_elect.discord_manager_speech_id is None:
                msg = await interaction.channel.send(speech)

-                council_elect.DiscordManagerSpeechId = msg.id
+                council_elect.discord_manager_speech_id = msg.id
                session.commit()
            else:
-                msg: nextcord.Message = await interaction.channel.fetch_message(council_elect.DiscordManagerSpeechId)
-                await msg.edit(content=decorate_dm_nomination(interaction.user.id, self.speech.value))
+                msg: nextcord.Message = await interaction.channel.fetch_message(council_elect.discord_manager_speech_id)
+                await msg.edit(
+                    content=decorate_dm_nomination(interaction.user.id, self.speech.value if self.speech.value else "")
+                )


 class NominateCLModal(nextcord.ui.Modal):
@@ -112,26 +127,37 @@ class NominateCLModal(nextcord.ui.Modal):
            interaction (Interaction): Interaction with user.

        """
-        speech = decorate_cl_nomination(interaction.user.id, self.speech.value)
+        if interaction.user is None or not isinstance(interaction.channel, nextcord.TextChannel):
+            # ignore none... Don't know what situation this is.
+            # if not textchannel, don't know how callback happened
+            return
+
+        speech = decorate_cl_nomination(interaction.user.id, self.speech.value if self.speech.value else "")

        with Session(engine) as session:
            # user already in table
            election_name = get_election_name()
            stmt = (
-                select(CouncilMembers)
-                .where(CouncilMembers.ElectionName == election_name)
-                .where(CouncilMembers.MemberId == self.usr_id)
+                select(CouncilMember)
+                .where(col(CouncilMember.election_name == election_name))
+                .where(col(CouncilMember.member_id == self.usr_id))
            )
            council_elect = session.scalar(stmt)

-            if not self.usr_nominated:
+            if council_elect is None:
+                dakiny_logger.error("Did not find member (id: %s) in election %s.", self.usr_id, election_name)
+                return
+
+            if not self.usr_nominated or council_elect.clan_leader_speech_id is None:
                msg = await interaction.channel.send(speech)

-                council_elect.ClanLeaderSpeechId = msg.id
+                council_elect.clan_leader_speech_id = msg.id
                session.commit()
            else:
-                msg: nextcord.Message = await interaction.channel.fetch_message(council_elect.ClanLeaderSpeechId)
-                await msg.edit(content=decorate_cl_nomination(interaction.user.id, self.speech.value))
+                msg: nextcord.Message = await interaction.channel.fetch_message(council_elect.clan_leader_speech_id)
+                await msg.edit(
+                    content=decorate_cl_nomination(interaction.user.id, self.speech.value if self.speech.value else "")
+                )


 class NominateHighCouncilView(nextcord.ui.View):
@@ -157,8 +183,16 @@ class NominateHighCouncilView(nextcord.ui.View):
            button (nextcord.ui.Button): Unused. idk why its needed in the decorator
            interaction (nextcord.Interaction): Interaction of user who pressed the button
        """
+        if interaction.user is None or not isinstance(interaction.channel, nextcord.TextChannel):
+            # ignore none... Don't know what situation this is.
+            # if not textchannel, don't know how callback happened
+            return
+
        # enforce council elect only
-        if self.guild.get_role(settings.role_ids.clan_council_elect) not in interaction.user.roles:
+        if (
+            isinstance(interaction.user, nextcord.User)
+            or self.guild.get_role(settings.role_ids.clan_council_elect) not in interaction.user.roles
+        ):
            await interaction.response.send_message(
                f"You must have the <@&{settings.role_ids.clan_council_elect}> role to vote.",
                ephemeral=True,
@@ -170,16 +204,20 @@ class NominateHighCouncilView(nextcord.ui.View):
        speech_content = ""
        with Session(engine) as session:
            stmt = (
-                select(CouncilMembers)
-                .where(CouncilMembers.ElectionName == election_name)
-                .where(CouncilMembers.MemberId == interaction.user.id)
+                select(CouncilMember)
+                .where(col(CouncilMember.election_name == election_name))
+                .where(col(CouncilMember.member_id == interaction.user.id))
            )
-            obj = session.scalar(stmt)
+            council_elect = session.scalar(stmt)
+
+            if council_elect is None:
+                dakiny_logger.error("Did not find member (id: %s) in election %s.", interaction.user.id, election_name)
+                return

            # user needs to exist to get here anyways...
-            if obj.DiscordManagerSpeechId is not None:
+            if council_elect.discord_manager_speech_id is not None:
                usr_nominated = True
-                msg = await interaction.channel.fetch_message(obj.DiscordManagerSpeechId)
+                msg = await interaction.channel.fetch_message(council_elect.discord_manager_speech_id)
                speech_content = msg.content.split(NOMINEE_SPLITTER)[1]

        await interaction.response.send_modal(NominateDMModal(interaction.user.id, usr_nominated, speech_content))
@@ -200,8 +238,16 @@ class NominateHighCouncilView(nextcord.ui.View):
            button (nextcord.ui.Button): Unused. idk why its needed in the decorator
            interaction (nextcord.Interaction): Interaction of user who pressed the button
        """
+        if interaction.user is None or not isinstance(interaction.channel, nextcord.TextChannel):
+            # ignore none... Don't know what situation this is.
+            # if not textchannel, don't know how callback happened
+            return
+
        # enforce council elect only
-        if self.guild.get_role(settings.role_ids.clan_council_elect) not in interaction.user.roles:
+        if (
+            isinstance(interaction.user, nextcord.User)
+            or self.guild.get_role(settings.role_ids.clan_council_elect) not in interaction.user.roles
+        ):
            await interaction.response.send_message(
                f"You must have the <@&{settings.role_ids.clan_council_elect}> role to vote.",
                ephemeral=True,
@@ -213,16 +259,20 @@ class NominateHighCouncilView(nextcord.ui.View):
        speech_content = ""
        with Session(engine) as session:
            stmt = (
-                select(CouncilMembers)
-                .where(CouncilMembers.ElectionName == election_name)
-                .where(CouncilMembers.MemberId == interaction.user.id)
+                select(CouncilMember)
+                .where(col(CouncilMember.election_name == election_name))
+                .where(col(CouncilMember.member_id == interaction.user.id))
            )
-            obj = session.scalar(stmt)
+            council_elect = session.scalar(stmt)
+
+            if council_elect is None:
+                dakiny_logger.error("Did not find member (id: %s) in election %s.", interaction.user.id, election_name)
+                return

            # user needs to exist to get here anyways...
-            if obj.ClanLeaderSpeechId is not None:
+            if council_elect.clan_leader_speech_id is not None:
                usr_nominated = True
-                msg = await interaction.channel.fetch_message(obj.ClanLeaderSpeechId)
+                msg = await interaction.channel.fetch_message(council_elect.clan_leader_speech_id)
                speech_content = msg.content.split(NOMINEE_SPLITTER)[1]

        await interaction.response.send_modal(NominateCLModal(interaction.user.id, usr_nominated, speech_content))