From ef2c35d8fc2d63a3b5e99ac4d6187259515dd738 Mon Sep 17 00:00:00 2001 From: Shreyash Date: Mon, 30 Dec 2024 16:20:03 +0530 Subject: [PATCH] Deploy ready branch --- .gitmodules | 3 +++ cogs/badges.py | 4 ++-- cogs/discordDataScraper.py | 4 ++-- cogs/listeners/member_events_cog.py | 5 ++--- cogs/listeners/message_events_cog.py | 5 ++--- cogs/listeners/role_events_cog.py | 5 ++--- cogs/serverManagement.py | 5 ++--- cogs/userInteractions.py | 4 ++-- cogs/vcCog.py | 7 +++---- helpers/supabaseClient.py | 2 +- main.py | 6 +++--- shared_migrations | 1 + 12 files changed, 25 insertions(+), 26 deletions(-) create mode 100644 .gitmodules create mode 160000 shared_migrations diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..3e0df8d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "shared_migrations"] + path = shared_migrations + url = https://github.com/Code4GovTech/shared-models-migrations.git diff --git a/cogs/badges.py b/cogs/badges.py index 43f6f97..037bd6a 100644 --- a/cogs/badges.py +++ b/cogs/badges.py @@ -3,7 +3,7 @@ import discord from discord.ext import commands -from helpers.supabaseClient import PostgresClient +from shared_migrations.db.discord_bot import DiscordBotQueries class BadgeModal(discord.ui.Modal, title="Your Badges"): @@ -17,7 +17,7 @@ async def on_timeout(self, interaction): class BadgeContents: def __init__(self, name) -> None: - self.postgres_client = PostgresClient() + self.postgres_client = DiscordBotQueries() apprentinceDesc = f"""Welcome *{name}*!! diff --git a/cogs/discordDataScraper.py b/cogs/discordDataScraper.py index 6a1eb0c..13a5c4a 100644 --- a/cogs/discordDataScraper.py +++ b/cogs/discordDataScraper.py @@ -9,7 +9,7 @@ from discord.channel import TextChannel from discord.ext import commands, tasks -from helpers.supabaseClient import PostgresClient +from shared_migrations.db.discord_bot import DiscordBotQueries with open("config.json") as config_file: config_data = json.load(config_file) @@ -24,7 +24,7 @@ class DiscordDataScaper(commands.Cog): def __init__(self, bot) -> None: self.bot = bot - self.postgres_client = PostgresClient() + self.postgres_client = DiscordBotQueries() @commands.Cog.listener() async def on_message(self, message): diff --git a/cogs/listeners/member_events_cog.py b/cogs/listeners/member_events_cog.py index ebb6937..a024648 100644 --- a/cogs/listeners/member_events_cog.py +++ b/cogs/listeners/member_events_cog.py @@ -1,13 +1,12 @@ import discord from discord.ext import commands -from helpers.supabaseClient import PostgresClient - +from shared_migrations.db.discord_bot import DiscordBotQueries class MemberEventsListener(commands.Cog): def __init__(self, bot) -> None: self.bot = bot - self.postgres_client = PostgresClient() + self.postgres_client = DiscordBotQueries() super().__init__() @commands.Cog.listener("on_member_join") diff --git a/cogs/listeners/message_events_cog.py b/cogs/listeners/message_events_cog.py index 5c8047d..3af74a2 100644 --- a/cogs/listeners/message_events_cog.py +++ b/cogs/listeners/message_events_cog.py @@ -2,10 +2,9 @@ from discord.ext import commands from config.server import ServerConfig -from helpers.supabaseClient import PostgresClient - +from shared_migrations.db.discord_bot import DiscordBotQueries serverConfig = ServerConfig() -postgresClient = PostgresClient() +postgresClient = DiscordBotQueries() async def grantVerifiedRole(member: discord.Member): diff --git a/cogs/listeners/role_events_cog.py b/cogs/listeners/role_events_cog.py index a497947..369ca9d 100644 --- a/cogs/listeners/role_events_cog.py +++ b/cogs/listeners/role_events_cog.py @@ -1,13 +1,12 @@ import discord from discord.ext import commands -from helpers.supabaseClient import PostgresClient - +from shared_migrations.db.discord_bot import DiscordBotQueries class RoleEventsListener(commands.Cog): def __init__(self, bot) -> None: self.bot = bot - self.postgres_client = PostgresClient() + self.postgres_client = DiscordBotQueries() super().__init__() @commands.Cog.listener() diff --git a/cogs/serverManagement.py b/cogs/serverManagement.py index ba842ab..c370f3b 100644 --- a/cogs/serverManagement.py +++ b/cogs/serverManagement.py @@ -3,15 +3,14 @@ from discord.ext import commands, tasks from config.server import ServerConfig -from helpers.supabaseClient import PostgresClient - +from shared_migrations.db.discord_bot import DiscordBotQueries serverConfig = ServerConfig() class ServerManagement(commands.Cog): def __init__(self, bot): self.bot: commands.Bot = bot - self.postgres_client = PostgresClient() + self.postgres_client = DiscordBotQueries() def validUser(self, ctx): authorised_users = [ diff --git a/cogs/userInteractions.py b/cogs/userInteractions.py index 270c0b6..e8ad0ac 100644 --- a/cogs/userInteractions.py +++ b/cogs/userInteractions.py @@ -5,7 +5,7 @@ from discord.ext import commands, tasks from dotenv import find_dotenv, load_dotenv -from helpers.supabaseClient import PostgresClient +from shared_migrations.db.discord_bot import DiscordBotQueries load_dotenv(find_dotenv()) @@ -16,7 +16,7 @@ class UserHandler(commands.Cog): def __init__(self, bot) -> None: self.bot = bot self.update_contributors.start() - self.postgres_client = PostgresClient() + self.postgres_client = DiscordBotQueries() @tasks.loop(minutes=60) async def update_contributors(self): diff --git a/cogs/vcCog.py b/cogs/vcCog.py index bfc6f90..dbab3b8 100644 --- a/cogs/vcCog.py +++ b/cogs/vcCog.py @@ -6,8 +6,7 @@ from discord.ext import commands from config.server import ServerConfig -from helpers.supabaseClient import PostgresClient - +from shared_migrations.db.discord_bot import DiscordBotQueries """ with io.BytesIO(image_bytes) as image_file: # Create a discord.File object from this file-like object @@ -21,7 +20,7 @@ class CommunityVCView(ui.View): def __init__(self, *, timeout=None): super().__init__(timeout=timeout) - self.postgres_client = PostgresClient() + self.postgres_client = DiscordBotQueries() def isCommunityContributor(self, roles: list[Role]): CommunityContributorRoleID = ServerConfig.Roles.CONTRIBUTOR_ROLE @@ -215,7 +214,7 @@ async def serveCertificateLink(self, interaction: Interaction, button: ui.Button class VCProgramSelection(ui.View): def __init__(self, *, timeout=None): - self.postgres_client = PostgresClient() + self.postgres_client = DiscordBotQueries() super().__init__(timeout=timeout) async def resetSelectMenu(self, interaction): diff --git a/helpers/supabaseClient.py b/helpers/supabaseClient.py index f1e5925..0402cca 100644 --- a/helpers/supabaseClient.py +++ b/helpers/supabaseClient.py @@ -6,7 +6,7 @@ from dotenv import load_dotenv from sqlalchemy import create_engine,select,desc,update,delete from sqlalchemy.orm import sessionmaker -from models import * +from shared_migrations.db.models import * from sqlalchemy.ext.declarative import DeclarativeMeta from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession diff --git a/main.py b/main.py index 20da47b..16cc830 100644 --- a/main.py +++ b/main.py @@ -7,7 +7,7 @@ from discord.ext import commands from cogs.vcCog import VCProgramSelection -from helpers.supabaseClient import PostgresClient +from shared_migrations.db.discord_bot import DiscordBotQueries from dotenv import load_dotenv, find_dotenv @@ -70,7 +70,7 @@ async def on_submit(self, interaction: discord.Interaction): except Exception as e: print('exception e ', e) try: - response = await PostgresClient().updateContributor(user_data) + response = await DiscordBotQueries().updateContributor(user_data) print("DB updated for user:", user_data["discord_id"]) except Exception as e: print("Failed to update credentials for user: "+e) @@ -96,7 +96,7 @@ async def hasIntroduced(): while not authentication: print("Not authenticated. Waiting") await asyncio.sleep(15) - authentication = await PostgresClient().read("contributors_registration", "discord_id", user.id) + authentication = await DiscordBotQueries().read("contributors_registration", "discord_id", user.id) print("User has authenticated") return True diff --git a/shared_migrations b/shared_migrations new file mode 160000 index 0000000..0dedd5a --- /dev/null +++ b/shared_migrations @@ -0,0 +1 @@ +Subproject commit 0dedd5a32a8dd0c1f0be6ddba6f2766c45951813