Convert bot to use a submissions table.

2023-03-29 23:01:12 -04:00
parent 226d7c77d7
commit 5b078c4a56
5 changed files with 141 additions and 246 deletions
@@ -10,7 +10,7 @@ from sqlalchemy.orm import Session, aliased
 # pylint: disable=import-error
 from classes.submission import Submission, SubmissionState
 from highscores import submission_objects
-from utilities.sql_data_classes import Category, CategoryGroup, Guild, engine
+from utilities.sql_data_classes import Category, CategoryGroup, Guild, Submissions, engine

 from .verification_view import VerificationView

@@ -30,7 +30,7 @@ def category_select_options(group_id: int) -> "list[nextcord.SelectOption]":
    return options


-############ Items used in submission process ############
+# Items used in submission process ########################


 class SubmissionDropdown(nextcord.ui.Select):
@@ -47,9 +47,14 @@ class SubmissionDropdown(nextcord.ui.Select):
    async def callback(self, interaction: nextcord.Interaction):
        submission = submission_objects.get_user_submission(interaction.user.id)
        submission.category_id = self.values[0]
-        embeds = submission.get_embeds()
+
+        with Session(engine) as session:
+            stmt = select(Category.IsTimeRecord).where(Category.CategoryId == submission.category_id)
+            submission.is_time_record = session.scalar(stmt)
+
+        embed = submission.get_embed()
        await interaction.message.edit(
-            embeds=embeds,
+            embed=embed,
        )


@@ -116,27 +121,40 @@ class SubmitButton(nextcord.ui.Button):
            stmt = select(Guild.VerificationChannel).where(Guild.GuildId == interaction.guild_id)
            verification_channel_id = session.scalar(stmt)
        channel = interaction.guild.get_channel(verification_channel_id)
-        submission = submission_objects.get_user_submission(interaction.user.id)
+        active_submission = submission_objects.get_user_submission(interaction.user.id)

        error_response = "Registered Verification channel does not exist or was never registered. \
                Contact server admins."
        assert channel is not None, await channel.send(error_response)

-        submission.submission_state = SubmissionState.VERIFY
+        active_submission.submission_state = SubmissionState.VERIFY

-        embeds = submission.get_embeds()
+        embed = active_submission.get_embed()

-        await channel.send(
+        verification_message = await channel.send(
            files=[await attch.to_file() for attch in interaction.message.attachments],
            view=VerificationView(),
-            embeds=embeds,
+            embed=embed,
            content=f"Submission from <@{interaction.user.id}>.",
        )
        await interaction.message.edit(content=f"<@{interaction.user.id}> Submitted!", view=None)
+
+        new_submission = Submissions(
+            CategoryId=active_submission.category_id,
+            GroupId=active_submission.group_id,
+            IsTimeRecord=active_submission.is_time_record,
+            Score=active_submission.score,
+            SubmissionMessageId=interaction.message.id,
+            UserName=active_submission.username,
+            VerificationMessageId=verification_message.id,
+        )
        submission_objects.remove_user_submission(interaction.user.id)
+        with Session(engine) as session:
+            session.add(new_submission)
+            session.commit()


-############ Submission Views ############
+# Submission Views ########################


 class SubmissionCreateButton(nextcord.ui.View):
@@ -175,7 +193,7 @@ class SubmissionCreateButton(nextcord.ui.View):

        submission_objects.add_submission(interaction.user.id, submission)

-        embeds = submission.get_embeds()
+        embed = submission.get_embed()

        submission_message = await channel.send(
            f"<@{interaction.user.id}>",
@@ -183,7 +201,7 @@ class SubmissionCreateButton(nextcord.ui.View):
                self._bot,
                interaction.user.id,
            ),
-            embeds=embeds,
+            embed=embed,
        )

        # update the message_id once its created
@@ -1,6 +1,10 @@
 """View for verification buttons"""

 import nextcord
+from sqlalchemy import select
+from sqlalchemy.orm import Session
+
+from utilities.sql_data_classes import Submissions, engine

 # pylint: disable=import-error
 from utilities.utils import submit_score
@@ -17,33 +21,34 @@ class VerificationView(nextcord.ui.View):
        self, button: nextcord.ui.Button, interaction: nextcord.Interaction
    ):  # pylint: disable=unused-argument
        """Button for denying score submission."""
+        with Session(engine) as session:
+            stmt = select(Submissions).where(Submissions.VerificationMessageId == interaction.message.id)
+            submission = session.scalar(stmt)
+            # let user know submission was denied
+
+            # TODO need to access bot here
+
+            # delete the submission
+            session.delete(stmt)
+            session.commit()
        await interaction.message.delete()

    @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
    ):  # pylint: disable=unused-argument
-        """Button for approving score submission."""
-        for embed in interaction.message.embeds:
-            content = embed.to_dict()
-
-            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"]
+        with Session(engine) as session:
+            stmt = select(Submissions).where(Submissions.VerificationMessageId == interaction.message.id)
+            submission = session.scalar(stmt)

        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])
+            await interaction.message.edit(content=content, view=None)
+            # TODO send message to let user know submission was accepted. Need access to bot here.
        except UnboundLocalError:
            await interaction.send("Instruct user to submit with all fields.")
            await interaction.message.edit(view=None)