Changes for migration to be postgres to be merged to main

.env.sample

@@ -4,12 +4,15 @@ SERVER_ID=
 INTRODUCTIONS_CHANNEL=
 NON_CONTRIBUTOR_ROLES=
 
-FLASK_HOST=
-GITHUB_PAT=
 WEBHOOK_URL=
 
 GITHUB_AUTHENTICATION_URL=
 
 SUPABASE_URL=
 SUPABASE_KEY=
 VERIFIED_ROLE_ID=
+
+POSTGRES_DB_HOST=
+POSTGRES_DB_NAME=
+POSTGRES_DB_USER=
+POSTGRES_DB_PASS=

.github/workflows/build-and-push.yml

@@ -4,44 +4,54 @@ on:
   push:
     branches:
       - main
+      - dev
   workflow_dispatch:
 
 env:
-  DOCKER_USERNAME: ${{ github.actor }}
-  DOCKER_IMAGE_NAME: ${{ github.repository }}
-  DOCKER_REGISTRY: ghcr.io
-  DOCKER_IMAGE_TAG: ${{ github.ref_name }}
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
+    # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
+    permissions:
+      contents: read
+      packages: write
     steps:
-      - id: lower-repo
-        shell: pwsh
-        run: |
-          "::set-output name=repository::$($env:DOCKER_IMAGE_NAME.ToLowerInvariant())"
 
       - name: Checkout code
         uses: actions/checkout@v2
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Login to Docker registry
-        uses: docker/login-action@v1
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
-          registry: ${{ env.DOCKER_REGISTRY }}
-          username: ${{ env.DOCKER_USERNAME }}
-          password: ${{ secrets.PAT }}
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            # minimal
+            type=pep440,pattern={{version}},value=${{ github.ref_name }},enable=${{ github.event_name == 'release' }}
+            # branch event
+            type=ref,event=branch
+            type=raw,value=latest,enable=${{ github.event_name == 'release' }}
 
       - name: Build and Push Docker image
         uses: docker/build-push-action@v4
         with:
-          build-args: |
-            "SERVER_RELEASE_VERSION=${{ github.sha }}"
+          # build-args: 
           context: .
           push: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          tags: ${{ env.DOCKER_REGISTRY }}/${{ steps.lower-repo.outputs.repository }}:${{env.DOCKER_IMAGE_TAG}}
-          labels: org.opencontainers.image.source=https://github.com/${{steps.lower-repo.outputs.repository}}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitmodules

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

Dockerfile

@@ -2,7 +2,15 @@ FROM python:3.9-slim-buster
 
 WORKDIR /app
 
-COPY requirements.txt requirements.txt
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends git openssh-client && \
+    rm -rf /var/lib/apt/lists/*
+
+
+COPY . /app
+
+RUN --mount=type=ssh git submodule update --init --recursive
+
 RUN pip3 install -r requirements.txt
 
 COPY . .

cogs/badges.py

@@ -3,7 +3,7 @@
 import discord
 from discord.ext import commands
 
-from helpers.supabaseClient import SupabaseClient
+from shared_migrations.db.discord_bot import DiscordBotQueries
 
 
 class BadgeModal(discord.ui.Modal, title="Your Badges"):
@@ -17,7 +17,9 @@ async def on_timeout(self, interaction):
 
 class BadgeContents:
     def __init__(self, name) -> None:
+        self.postgres_client = DiscordBotQueries()
         apprentinceDesc = f"""Welcome *{name}*!!
+
 
 
 Congratulations! 🎉 You have taken the first step to join & introduce yourself to this awesome community and earned the **Apprentice Badge**! 🎓 This badge shows that you are eager to learn and grow with our community! 😎 We are so happy to have you here and we can’t wait to see what you will create and solve! 🚀"""
@@ -133,7 +135,7 @@ def get_user_badges(self, discord_id):
         userBadges = {"points": [], "achievements": []}
         if (
             len(
-                SupabaseClient().read(
+                self.postgres_client.read(
                     "contributors_registration",
                     query_key="discord_id",
                     query_value=discord_id,
@@ -143,7 +145,7 @@ def get_user_badges(self, discord_id):
         ):
             userBadges["achievements"].append(self.discordXGithubBadge)
 
-        discordMemberData = SupabaseClient().read(
+        discordMemberData = self.postgres_client.read(
             "discord_engagement", "contributor", discord_id
         )
         if discordMemberData:
@@ -153,17 +155,17 @@ def get_user_badges(self, discord_id):
                 userBadges["achievements"].append(self.rockstarBadge)
             if discordMemberData[0]["has_introduced"]:
                 userBadges["achievements"].append(self.apprenticeBadge)
-        contributorData = SupabaseClient().read(
+        contributorData = self.postgres_client.read(
             "contributors_registration", query_key="discord_id", query_value=discord_id
         )
         if contributorData:
             github_id = contributorData[0]["github_id"]
             prData = {
-                "raised": SupabaseClient().read(
+                "raised": self.postgres_client.read(
                     table="connected_prs", query_key="raised_by", query_value=github_id
                 ),
-                "merged": SupabaseClient(table="connected_prs").read(
-                    table="connected_prs", query_key="merged_by", query_value=github_id
+                "merged": self.postgres_client.read(
+                    "connected_prs", query_key="merged_by", query_value=github_id
                 ),
             }
             points = 0

cogs/discordDataScraper.py

@@ -9,7 +9,7 @@
 from discord.channel import TextChannel
 from discord.ext import commands, tasks
 
-from helpers.supabaseClient import SupabaseClient
+from shared_migrations.db.discord_bot import DiscordBotQueries
 
 with open("config.json") as config_file:
     config_data = json.load(config_file)
@@ -24,49 +24,21 @@
 class DiscordDataScaper(commands.Cog):
     def __init__(self, bot) -> None:
         self.bot = bot
+        self.postgres_client = DiscordBotQueries()
 
     @commands.Cog.listener()
     async def on_message(self, message):
         pass
-        # contributor = SupabaseClient().read(
-        #     "discord_engagement", "contributor", message.author.id
-        # )
-        # print("message", len(message.content))
-        # if not contributor:
-        #     SupabaseClient().insert(
-        #         "discord_engagement",
-        #         {
-        #             "contributor": message.author.id,
-        #             "has_introduced": False,
-        #             "total_message_count": 1,
-        #             "total_reaction_count": 0,
-        #         },
-        #     )
-        #     return
-        # if len(message.content) > 20:
-        #     if message.channel.id == INTRODUCTIONS_CHANNEL_ID:
-        #         print("intro")
-        #         SupabaseClient().update(
-        #             "discord_engagement",
-        #             {"has_introduced": True},
-        #             "contributor",
-        #             message.author.id,
-        #         )
-        #     SupabaseClient("discord_engagement").update(
-        #         "discord_engagement",
-        #         {"total_message_count": contributor[0]["total_message_count"] + 1},
-        #         "contributor",
-        #         message.author.id,
-        #     )
+
 
     @commands.Cog.listener()
     async def on_reaction_add(self, reaction, user):
         message = reaction.message
-        contributor = SupabaseClient().read(
+        contributor = self.postgres_client.read(
             "discord_engagement", "contributor", message.author.id
         )[0]
         if not contributor:
-            SupabaseClient().insert(
+            self.postgres_client.insert(
                 "discord_engagement",
                 {
                     "contributor": message.author.id,
@@ -77,7 +49,7 @@ async def on_reaction_add(self, reaction, user):
             )
             return
         print("reaction")
-        SupabaseClient().update(
+        self.postgres_client.update(
             "discord_engagement",
             {"total_reaction_count": contributor["total_reaction_count"] + 1},
             "contributor",
@@ -89,7 +61,7 @@ async def add_engagement(self, ctx):
         await ctx.channel.send("started")
 
         def addEngagmentData(data):
-            client = SupabaseClient()
+            client = self.postgres_client
             client.insert("discord_engagement", data)
             return
 
@@ -145,7 +117,7 @@ async def enable_webhook(self, ctx):
         channels = await guild.fetch_channels()
         enabled = [
             channel["channel_id"]
-            for channel in SupabaseClient().read_all("discord_channels")
+            for channel in self.postgres_client.read_all("discord_channels")
         ]
         for channel in channels:
             try:
@@ -156,7 +128,7 @@ async def enable_webhook(self, ctx):
                     webhook = await channel.create_webhook(name="New Ticket Alert")
                     feedback = f"""URL: {webhook.url}\n Token:{"Yes" if webhook.token else "No"}"""
                     await ctx.send(feedback)
-                    SupabaseClient().insert(
+                    self.postgres_client.insert(
                         "discord_channels",
                         {
                             "channel_id": channel.id,
@@ -177,7 +149,7 @@ async def update_applicants(self, ctx):
             await ctx.send("Member List Count: " + str(len(members)))
             for member in members:
                 try:
-                    SupabaseClient().insert(
+                    self.postgres_client.insert(
                         "applicant",
                         {"sheet_username": member.name, "discord_id": member.id},
                     )
@@ -216,12 +188,12 @@ async def collect_all_messages(self):
 
     async def add_messages(self):
         def addMessageData(data):
-            client = SupabaseClient()
+            client = self.postgres_client
             client.insert("unstructured discord data", data)
             return
 
         def getLastMessageObject(channelId):
-            last_message = SupabaseClient().read_by_order_limit(
+            last_message = self.postgres_client.read_by_order_limit(
                 table="unstructured discord data",
                 query_key="channel",
                 query_value=channelId,

cogs/listeners/member_events_cog.py

@@ -1,17 +1,17 @@
 import discord
 from discord.ext import commands
 
-from helpers.supabaseClient import SupabaseClient
-
+from shared_migrations.db.discord_bot import DiscordBotQueries
 
 class MemberEventsListener(commands.Cog):
     def __init__(self, bot) -> None:
         self.bot = bot
+        self.postgres_client = DiscordBotQueries()
         super().__init__()
 
     @commands.Cog.listener("on_member_join")
     async def on_member_join(self, member: discord.Member):
-        SupabaseClient().updateContributor(member)
+        self.postgres_client.updateContributor(member)
 
     @commands.Cog.listener("on_member_remove")
     async def on_member_remove(self, member: discord.Member):
@@ -20,7 +20,7 @@ async def on_member_remove(self, member: discord.Member):
 
     @commands.Cog.listener("on_member_update")
     async def on_member_update(self, before: discord.Member, after: discord.Member):
-        SupabaseClient().updateContributor(after)
+        self.postgres_client.updateContributor(after)
 
 
 async def setup(bot: commands.Bot):

cogs/listeners/message_events_cog.py

@@ -2,10 +2,9 @@
 from discord.ext import commands
 
 from config.server import ServerConfig
-from helpers.supabaseClient import SupabaseClient
-
+from shared_migrations.db.discord_bot import DiscordBotQueries
 serverConfig = ServerConfig()
-supabaseClient = SupabaseClient()
+postgresClient = DiscordBotQueries()
 
 
 async def grantVerifiedRole(member: discord.Member):
@@ -32,7 +31,7 @@ def __init__(self, bot) -> None:
     async def on_message(self, message: discord.Message):
         # Listen for Introduction
         if message.channel.id == serverConfig.Channels.INTRODUCTION_CHANNEL:
-            if await supabaseClient.memberIsAuthenticated(message.author):
+            if await postgresClient.memberIsAuthenticated(message.author):
                 await grantVerifiedRole(message.author)
         else:
             return

cogs/listeners/role_events_cog.py

@@ -1,39 +1,39 @@
 import discord
 from discord.ext import commands
 
-from helpers.supabaseClient import SupabaseClient
-
+from shared_migrations.db.discord_bot import DiscordBotQueries
 
 class RoleEventsListener(commands.Cog):
     def __init__(self, bot) -> None:
         self.bot = bot
+        self.postgres_client = DiscordBotQueries()
         super().__init__()
 
     @commands.Cog.listener()
     async def on_guild_role_create(self, role: discord.Role):
         if role.name.startswith("College:"):
             orgName = role.name[len("College: ") :]
-            SupabaseClient().addChapter(roleId=role.id, orgName=orgName, type="COLLEGE")
+            self.postgres_client.addChapter(roleId=role.id, orgName=orgName, type="COLLEGE")
         elif role.name.startswith("Corporate:"):
             orgName = role.name[len("Corporate: ") :]
-            SupabaseClient().addChapter(
+            self.postgres_client.addChapter(
                 roleId=role.id, orgName=orgName, type="CORPORATE"
             )
 
     @commands.Cog.listener()
     async def on_guild_role_delete(self, role: discord.Role):
-        SupabaseClient().deleteChapter(roleID=role.id)
+        self.postgres_client.deleteChapter(roleID=role.id)
 
     @commands.Cog.listener()
     async def on_guild_role_update(self, before: discord.Role, after: discord.Role):
         if after.name.startswith("College:"):
             orgName = after.name[len("College: ") :]
-            SupabaseClient().addChapter(
+            self.postgres_client.addChapter(
                 roleId=after.id, orgName=orgName, type="COLLEGE"
             )
         elif after.name.startswith("Corporate:"):
             orgName = after.name[len("Corporate: ") :]
-            SupabaseClient().addChapter(
+            self.postgres_client.addChapter(
                 roleId=after.id, orgName=orgName, type="CORPORATE"
             )