Merge pull request #1018 from allthingslinux/level-fix

fix(levels): fix issue where xp gets reset if db errors

Author: electron271

tux/database/controllers/levels.py

@@ -1,5 +1,6 @@
 import datetime
 import math
+from typing import NoReturn, cast
 
 from loguru import logger
 
@@ -78,18 +79,29 @@ async def get_xp_and_level(self, member_id: int, guild_id: int) -> tuple[float,
         Returns
         -------
         tuple[float, int]
-            A tuple containing the XP and level of the member, or (0.0, 0) if not found
+            A tuple containing the XP and level of the member.
         """
+
+        def _fail(msg: str) -> NoReturn:
+            raise ValueError(msg)
+
         try:
             record = await self.find_one(where={"member_id": member_id, "guild_id": guild_id})
+            if record is None:
+                logger.debug(
+                    f"Level record not found for member_id: {member_id}, guild_id: {guild_id}. Returning 0.0, 0",
+                )
+                return 0.0, 0
+
+            xp = getattr(record, "xp", None)
+            level = getattr(record, "level", None)
+            if xp is None or level is None:
+                _fail(f"Levels record missing xp/level for member {member_id} in guild {guild_id}")
 
-            if record:
-                return (self.safe_get_attr(record, "xp", 0.0), self.safe_get_attr(record, "level", 0))
-            return (0.0, 0)  # noqa: TRY300
+            return cast(float, xp), cast(int, level)
 
         except Exception as e:
-            logger.error(f"Error querying XP and level for member_id: {member_id}, guild_id: {guild_id}: {e}")
-            return (0.0, 0)
+            _fail(f"Error querying XP and level for member_id: {member_id}, guild_id: {guild_id}: {e}")
 
     async def get_last_message_time(self, member_id: int, guild_id: int) -> datetime.datetime | None:
         """Get the last message time of a member in a guild.