current election cycle shoud return quarter cycle if it can't find a cycle.
This commit is contained in:
@@ -28,7 +28,7 @@ from utils import (
|
||||
get_cl_election_name,
|
||||
get_datetime,
|
||||
get_dm_election_name,
|
||||
get_election_cycle_name,
|
||||
get_election_name,
|
||||
)
|
||||
|
||||
|
||||
@@ -199,7 +199,7 @@ class ElectionCycle:
|
||||
parent: nextcord.TextChannel = self.guild.get_channel(
|
||||
self.config.params.voting_parent_id
|
||||
)
|
||||
quarter_name: str = get_election_cycle_name(self.config)
|
||||
quarter_name: str = get_election_name(self.config)
|
||||
|
||||
thread_msg: nextcord.Message = await parent.send(content=quarter_name)
|
||||
|
||||
@@ -247,8 +247,7 @@ class ElectionCycle:
|
||||
|
||||
with Session(engine) as session:
|
||||
stmt = select(ElectionInformation).where(
|
||||
ElectionInformation.ElectionCycle
|
||||
== get_election_cycle_name(self.config)
|
||||
ElectionInformation.ElectionCycle == get_election_name(self.config)
|
||||
)
|
||||
info = session.scalar(stmt)
|
||||
info.CouncilVoteMsgId = vote_msg.id
|
||||
@@ -277,7 +276,7 @@ class ElectionCycle:
|
||||
message, view=NominateHighCouncilView(self.config, self.guild)
|
||||
)
|
||||
|
||||
election_name = get_election_cycle_name(self.config)
|
||||
election_name = get_election_name(self.config)
|
||||
|
||||
with Session(engine) as session:
|
||||
# remove vote button from vote message
|
||||
@@ -333,8 +332,7 @@ class ElectionCycle:
|
||||
|
||||
with Session(engine) as session:
|
||||
stmt = select(ElectionInformation).where(
|
||||
ElectionInformation.ElectionCycle
|
||||
== get_election_cycle_name(self.config)
|
||||
ElectionInformation.ElectionCycle == get_election_name(self.config)
|
||||
)
|
||||
info = session.scalar(stmt)
|
||||
info.HighCouncilVoteMsgId = vote_msg.id
|
||||
@@ -364,9 +362,7 @@ class ElectionCycle:
|
||||
# role management
|
||||
stmt = (
|
||||
select(CouncilMembers.MemberId)
|
||||
.where(
|
||||
CouncilMembers.ElectionCycle == get_election_cycle_name(self.config)
|
||||
)
|
||||
.where(CouncilMembers.ElectionCycle == get_election_name(self.config))
|
||||
.where(CouncilMembers.Elected == true())
|
||||
)
|
||||
|
||||
@@ -390,7 +386,7 @@ class ElectionCycle:
|
||||
stmt = select(Votes.VotedForId).where(Votes.ElectionCycle == cl_election)
|
||||
cl_votes = collections.Counter(session.scalars(stmt))
|
||||
|
||||
election_cycle = get_election_cycle_name(self.config)
|
||||
election_cycle = get_election_name(self.config)
|
||||
try:
|
||||
dm_winner = max(dm_votes, key=dm_votes.get)
|
||||
stmt = (
|
||||
@@ -422,7 +418,7 @@ class ElectionCycle:
|
||||
|
||||
# clear view from vote message
|
||||
stmt = select(ElectionInformation.HighCouncilVoteMsgId).where(
|
||||
ElectionInformation.ElectionCycle == get_election_cycle_name(self.config)
|
||||
ElectionInformation.ElectionCycle == get_election_name(self.config)
|
||||
)
|
||||
vote_msg_id = session.scalar(stmt)
|
||||
vote_msg: nextcord.Message = await election_thread.fetch_message(vote_msg_id)
|
||||
@@ -451,8 +447,7 @@ class ElectionCycle:
|
||||
|
||||
with Session(engine) as session:
|
||||
stmt = select(ElectionInformation).where(
|
||||
ElectionInformation.ElectionCycle
|
||||
== get_election_cycle_name(self.config)
|
||||
ElectionInformation.ElectionCycle == get_election_name(self.config)
|
||||
)
|
||||
return session.scalar(stmt)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user