Remove mongo & fix tests

didier/cogs/debug_cog.py

@@ -4,7 +4,7 @@ from overrides import overrides
 from didier import Didier
 
 
-class TestCog(commands.Cog):
+class DebugCog(commands.Cog):
     """Testing cog for dev purposes"""
 
     client: Didier
@@ -16,11 +16,11 @@ class TestCog(commands.Cog):
     async def cog_check(self, ctx: commands.Context) -> bool:
         return await self.client.is_owner(ctx.author)
 
-    @commands.command()
-    async def test(self, ctx: commands.Context):
+    @commands.command(aliases=["Dev"])
+    async def debug(self, ctx: commands.Context):
         """Debugging command"""
 
 
 async def setup(client: Didier):
     """Load the cog"""
-    await client.add_cog(TestCog(client))
+    await client.add_cog(DebugCog(client))

didier/cogs/other.py

@@ -5,7 +5,7 @@ from discord import app_commands
 from discord.ext import commands
 
 from database.crud.links import get_link_by_name
-from database.schemas.relational import Link
+from database.schemas import Link
 from didier import Didier
 from didier.data.apis import urban_dictionary
 from didier.data.embeds.google import GoogleSearch

didier/data/apis/imgflip.py

@@ -1,7 +1,7 @@
 from aiohttp import ClientSession
 
 import settings
-from database.schemas.relational import MemeTemplate
+from database.schemas import MemeTemplate
 from didier.exceptions.missing_env import MissingEnvironmentVariable
 from didier.utils.http.requests import ensure_post
 

didier/data/embeds/deadlines.py

@@ -4,7 +4,7 @@ from datetime import datetime
 import discord
 from overrides import overrides
 
-from database.schemas.relational import Deadline
+from database.schemas import Deadline
 from didier.data.embeds.base import EmbedBaseModel
 from didier.utils.types.datetime import tz_aware_now
 from didier.utils.types.string import get_edu_year_name

didier/data/embeds/ufora/announcements.py

@@ -13,7 +13,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 import settings
 from database.crud import ufora_announcements as crud
-from database.schemas.relational import UforaCourse
+from database.schemas import UforaCourse
 from didier.data.embeds.base import EmbedBaseModel
 from didier.utils.discord.colours import ghent_university_blue
 from didier.utils.types.datetime import int_to_weekday

didier/didier.py

@@ -2,7 +2,6 @@ import logging
 import os
 
 import discord
-import motor.motor_asyncio
 from aiohttp import ClientSession
 from discord.app_commands import AppCommandError
 from discord.ext import commands
@@ -10,7 +9,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 import settings
 from database.crud import custom_commands
-from database.engine import DBSession, mongo_client
+from database.engine import DBSession
 from database.utils.caches import CacheManager
 from didier.data.embeds.error_embed import create_error_embed
 from didier.exceptions import HTTPException, NoMatch
@@ -55,11 +54,6 @@ class Didier(commands.Bot):
         """Obtain a session for the PostgreSQL database"""
         return DBSession()
 
-    @property
-    def mongo_db(self) -> motor.motor_asyncio.AsyncIOMotorDatabase:
-        """Obtain a reference to the MongoDB database"""
-        return mongo_client[settings.MONGO_DB]
-
     async def setup_hook(self) -> None:
         """Do some initial setup
 
@@ -71,7 +65,7 @@ class Didier(commands.Bot):
         # Initialize caches
         self.database_caches = CacheManager()
         async with self.postgres_session as session:
-            await self.database_caches.initialize_caches(session, self.mongo_db)
+            await self.database_caches.initialize_caches(session)
 
         # Load extensions
         await self._load_initial_extensions()

didier/views/modals/deadlines.py

@@ -5,7 +5,7 @@ from discord import Interaction
 from overrides import overrides
 
 from database.crud.deadlines import add_deadline
-from database.schemas.relational import UforaCourse
+from database.schemas import UforaCourse
 
 __all__ = ["AddDeadline"]
 

didier/views/modals/memes.py

@@ -3,7 +3,7 @@ import traceback
 import discord.ui
 from overrides import overrides
 
-from database.schemas.relational import MemeTemplate
+from database.schemas import MemeTemplate
 from didier import Didier
 from didier.data.apis.imgflip import generate_meme