diff --git a/cogs/submission/verification_view.py b/cogs/submission/verification_view.py index be734cc..1d8dd3d 100644 --- a/cogs/submission/verification_view.py +++ b/cogs/submission/verification_view.py @@ -1,6 +1,10 @@ """View for verification buttons.""" import nextcord +from sqlalchemy import select +from sqlalchemy.orm import Session + +from database_setup.sql_data_classes import Submission, engine # pylint: disable=import-error from utilities.utils import submit_score @@ -20,27 +24,24 @@ class VerificationView(nextcord.ui.View): @nextcord.ui.button(label="Approve", style=nextcord.ButtonStyle.green, custom_id="approve-button-submission") async def approve_button(self, button: nextcord.ui.Button, interaction: nextcord.Interaction) -> None: # noqa: ARG002 """Button for approving score submission.""" - for embed in interaction.message.embeds: - content = embed.to_dict() + with Session(engine) as session: + stmt = ( + select(Submission) + .where(Submission.GuildId == interaction.guild_id) + .where(Submission.MessageId == interaction.message.id) + ) - for field in content["fields"]: - if field["name"] == "GroupId": - group_id = int(field["value"]) - elif field["name"] == "CategoryId": - category_id = int(field["value"]) - elif field["name"] == "Score": - score = field["value"] - elif field["name"] == "User Name": - user = field["value"] + submission = session.scalar(stmt) - # TODO: rework to get the information from database instead + if submission is None: + await interaction.response.send_message("Could not find submission data in database.", ephemeral=True) + await interaction.message.delete() + return - try: - await submit_score(interaction, group_id, category_id, user, score) + await submit_score( + interaction, submission.GroupId, submission.CategoryId, submission.UserName, submission.Score + ) content = interaction.message.content content += f"\nApproved by <@{interaction.user.id}>." # remove the bot information embed. it should always be the first one. - await interaction.message.edit(content=content, view=None, embed=interaction.message.embeds[0]) - except UnboundLocalError: - await interaction.send("Instruct user to submit with all fields.") - await interaction.message.edit(view=None) + await interaction.message.edit(content=content, view=None)