Feat: use db models in voting views.
build_develop / build (push) Successful in 39s

fix pylance smells.
This commit is contained in:
2025-07-31 13:50:34 -04:00
parent 354823ca1f
commit 1f1e4ad20d
+44 -30
View File
@@ -1,18 +1,17 @@
"""Contains various views to be used while voting. Controls the logic when performing the vote.""" """Contains various views to be used while voting. Controls the logic when performing the vote."""
import nextcord import nextcord
from dakiny_bot.dakiny_settings import settings
from dakiny_bot.database.sql_data_classes import (
CouncilMembers,
ElectionInformation,
Votes,
engine,
)
from dakiny_bot.utils import VoteType, build_votes_str, get_election_name
from nextcord import SelectOption from nextcord import SelectOption
from nextcord.interactions import Interaction from nextcord.interactions import Interaction
from sqlalchemy import exc, select, update from sqlalchemy import exc, select, update
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from sqlmodel import col
from dakiny_bot.dakiny_settings import settings
from dakiny_bot.database.db import engine
from dakiny_bot.database.models import CouncilMember, ElectionInformation, Vote
from dakiny_bot.logger import dakiny_logger
from dakiny_bot.utils import VoteType, build_votes_str, get_election_name
class VoteSelect(nextcord.ui.StringSelect): class VoteSelect(nextcord.ui.StringSelect):
@@ -36,18 +35,32 @@ class VoteSelect(nextcord.ui.StringSelect):
Args: Args:
interaction (Interaction): Interaction with this callback. interaction (Interaction): Interaction with this callback.
""" """
if (
interaction.user is None
or not isinstance(interaction.channel, nextcord.TextChannel)
or interaction.guild is None
):
# ignore none... Don't know what situation this is.
# if not textchannel, don't know how callback happened
# if no guild, is problem because should only be in guild.
return
election_name = get_election_name() election_name = get_election_name()
with Session(engine) as session: with Session(engine) as session:
stmt = select(ElectionInformation.CouncilVoteMsgId).where(ElectionInformation.ElectionName == election_name) stmt = select(col(ElectionInformation.council_vote_msg_id)).where(
vote_msg_id = session.scalar(stmt) col(ElectionInformation.name == election_name)
)
if (vote_msg_id := session.scalar(stmt)) is None:
dakiny_logger.error("Unable to find a Vote Message ID in database.")
return
voted_for = None if self.values[0] == "Abstain" else int(self.values[0]) voted_for = None if self.values[0] == "Abstain" else int(self.values[0])
new_vote = Votes( new_vote = Vote(
ElectionName=election_name, election_name=election_name,
VoterId=interaction.user.id, voter_id=interaction.user.id,
VotedForId=voted_for, voted_for_id=voted_for,
Type=VoteType.COUNCIL, type=VoteType.COUNCIL,
) )
try: try:
@@ -57,10 +70,10 @@ class VoteSelect(nextcord.ui.StringSelect):
except exc.IntegrityError: except exc.IntegrityError:
session.rollback() session.rollback()
stmt = ( stmt = (
update(Votes) update(Vote)
.where(Votes.ElectionName == election_name) .where(col(Vote.election_name == election_name))
.where(Votes.VoterId == interaction.user.id) .where(col(Vote.voter_id == interaction.user.id))
.where(Votes.Type == VoteType.COUNCIL) .where(col(Vote.type == VoteType.COUNCIL))
.values(VotedForId=voted_for) .values(VotedForId=voted_for)
) )
session.execute(stmt) session.execute(stmt)
@@ -94,6 +107,10 @@ class VoteView(nextcord.ui.View):
button (nextcord.ui.Button): Unused. idk why its needed in the decorator button (nextcord.ui.Button): Unused. idk why its needed in the decorator
interaction (nextcord.Interaction): Interaction of user who pressed the button interaction (nextcord.Interaction): Interaction of user who pressed the button
""" """
if not isinstance(interaction.user, nextcord.Member):
# the user should only be a member of the guild.
return
# enforce members only # enforce members only
if self.guild.get_role(settings.role_ids.clan_member) not in interaction.user.roles: if self.guild.get_role(settings.role_ids.clan_member) not in interaction.user.roles:
await interaction.response.send_message( await interaction.response.send_message(
@@ -106,28 +123,25 @@ class VoteView(nextcord.ui.View):
with Session(engine) as session: with Session(engine) as session:
stmt = ( stmt = (
select(Votes.VotedForId) select(col(Vote.voted_for_id))
.where(Votes.ElectionName == election_name) .where(col(Vote.election_name == election_name))
.where(Votes.VoterId == interaction.user.id) .where(col(Vote.voter_id == interaction.user.id))
.where(Votes.Type == VoteType.COUNCIL) .where(col(Vote.type == VoteType.COUNCIL))
) )
voted_for = session.scalar(stmt) voted_for = session.scalar(stmt)
stmt = select(CouncilMembers.MemberId).where(CouncilMembers.ElectionName == election_name) stmt = select(col(CouncilMember.member_id)).where(col(CouncilMember.election_name == election_name))
options = [ options = [
SelectOption( SelectOption(
label=( label=(f"{member.display_name} ☑️" if voted_for == nominee else f"{member.display_name}"),
f"{self.guild.get_member(nominee).display_name} ☑️"
if voted_for == nominee
else f"{self.guild.get_member(nominee).display_name}"
),
value=str(nominee), value=str(nominee),
) )
for nominee in sorted( for nominee in sorted(
session.scalars(stmt), session.scalars(stmt),
key=lambda nominee: self.guild.get_member(nominee).display_name.lower(), key=lambda nominee: self.guild.get_member(nominee).display_name.lower(), # pyright: ignore[reportOptionalMemberAccess]
) )
if (member := self.guild.get_member(nominee)) is not None
] ]
options.append( options.append(
SelectOption( SelectOption(