Chewing_Bever/didier
0
0
Fork 0
mirror of https://github.com/stijndcl/didier.git synced 2026-04-07 23:55:46 +02:00
Code Issues Projects Releases Wiki Activity

Remove mongo & fix tests

Browse source
This commit is contained in:
stijndcl 2022-08-29 20:24:42 +02:00
parent 7b2109fb07
commit 8a4baf6bb8
56 changed files with 406 additions and 539 deletions
Download patch file Download diff file Expand all files Collapse all files

24
database/utils/caches.py
View file

@ -1,19 +1,15 @@
from abc import ABC, abstractmethod
from typing import Generic, TypeVar
from discord import app_commands
from overrides import overrides
from sqlalchemy.ext.asyncio import AsyncSession
from database.crud import links, memes, ufora_courses, wordle
from database.mongo_types import MongoDatabase
__all__ = ["CacheManager", "LinkCache", "UforaCourseCache"]
T = TypeVar("T")
class DatabaseCache(ABC, Generic[T]):
class DatabaseCache(ABC):
"""Base class for a simple cache-like structure
The goal of this class is to store data for Discord auto-completion results
@ -25,7 +21,7 @@ class DatabaseCache(ABC, Generic[T]):
Considering the fact that a user isn't obligated to choose something from the suggestions,
chances are high we have to go to the database for the final action either way.
Also stores the data in lowercase to allow fast searching
Also stores the data in lowercase to allow fast searching.
"""
data: list[str] = []
@ -36,7 +32,7 @@ class DatabaseCache(ABC, Generic[T]):
self.data.clear()
@abstractmethod
async def invalidate(self, database_session: T):
async def invalidate(self, database_session: AsyncSession):
"""Invalidate the data stored in this cache"""
def get_autocomplete_suggestions(self, query: str) -> list[app_commands.Choice[str]]:
@ -48,7 +44,7 @@ class DatabaseCache(ABC, Generic[T]):
return [app_commands.Choice(name=suggestion, value=suggestion.lower()) for suggestion in suggestions]
class LinkCache(DatabaseCache[AsyncSession]):
class LinkCache(DatabaseCache):
"""Cache to store the names of links"""
@overrides
@ -61,7 +57,7 @@ class LinkCache(DatabaseCache[AsyncSession]):
self.data_transformed = list(map(str.lower, self.data))
class MemeCache(DatabaseCache[AsyncSession]):
class MemeCache(DatabaseCache):
"""Cache to store the names of meme templates"""
@overrides
@ -74,7 +70,7 @@ class MemeCache(DatabaseCache[AsyncSession]):
self.data_transformed = list(map(str.lower, self.data))
class UforaCourseCache(DatabaseCache[AsyncSession]):
class UforaCourseCache(DatabaseCache):
"""Cache to store the names of Ufora courses"""
# Also store the aliases to add additional support
@ -119,10 +115,10 @@ class UforaCourseCache(DatabaseCache[AsyncSession]):
return [app_commands.Choice(name=suggestion, value=suggestion.lower()) for suggestion in suggestions]
class WordleCache(DatabaseCache[MongoDatabase]):
class WordleCache(DatabaseCache):
"""Cache to store the current daily Wordle word"""
async def invalidate(self, database_session: MongoDatabase):
async def invalidate(self, database_session: AsyncSession):
word = await wordle.get_daily_word(database_session)
if word is not None:
self.data = [word]
@ -142,9 +138,9 @@ class CacheManager:
self.ufora_courses = UforaCourseCache()
self.wordle_word = WordleCache()
async def initialize_caches(self, postgres_session: AsyncSession, mongo_db: MongoDatabase):
async def initialize_caches(self, postgres_session: AsyncSession):
"""Initialize the contents of all caches"""
await self.links.invalidate(postgres_session)
await self.memes.invalidate(postgres_session)
await self.ufora_courses.invalidate(postgres_session)
await self.wordle_word.invalidate(mongo_db)
await self.wordle_word.invalidate(postgres_session)

12
database/utils/datetime.py
View file

@ -1,15 +1,5 @@
import datetime
import zoneinfo
__all__ = ["LOCAL_TIMEZONE", "today_only_date"]
__all__ = ["LOCAL_TIMEZONE"]
LOCAL_TIMEZONE = zoneinfo.ZoneInfo("Europe/Brussels")
def today_only_date() -> datetime.datetime:
"""Mongo can't handle datetime.date, so we need a datetime instance
We do, however, only care about the date, so remove all the rest
"""
today = datetime.date.today()
return datetime.datetime(year=today.year, month=today.month, day=today.day)