Merge pull request #90 from Code4GovTech/feature/shared-migrations-clean

Deploy ready branch

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "shared_migrations"]
+	path = shared_migrations
+	url = https://github.com/Code4GovTech/shared-models-migrations.git

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}*!!
         
 

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):

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")

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):

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()

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 = [

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):

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):

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
 

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