fix cache abstraction

brandenburg/services/batch.py

@@ -4,10 +4,9 @@
 from typing import Tuple
 
 # Local application imports
-from brandenburg.config import settings
+from brandenburg import cache
 from brandenburg.models.batch import BatchModel
 from brandenburg.services.publisher import PublisherService
-from brandenburg.toolbox._backends.redis import RedisBackend
 from brandenburg.toolbox.logger import logger
 
 
@@ -34,8 +33,6 @@ async def upload(name: str, filename: str, file: bytes, hash: str, token: str) -
     @classmethod
     async def _set_last_ran(cls, batch: BatchModel) -> None:
 
-        # TODO: Convert the redis connection into a decorator
-        cache = await RedisBackend(settings.REDIS_URL).get_instance()
         table: str = batch.table_name.lower()
         updated_at: int = batch.last_updated_at
         await cache.set_table_last_updated(table, updated_at)

brandenburg/services/lead.py

@@ -2,9 +2,6 @@
 import asyncio  # pragma: nocover
 from typing import List, Tuple, Dict, Union
 
-# Third party imports
-from pydantic import ValidationError
-
 # Local application imports
 from brandenburg import cache
 from brandenburg.models.lead import LeadModel
@@ -15,7 +12,10 @@
 class LeadService:
     @staticmethod
     async def execute(token: str, lead: LeadModel) -> Union[bool, Tuple[Dict[str, Union[str, List[str]]], bool]]:
-
+        """
+        TODO:
+        """
+        #TODO: Improve the return type, to be more especific
         is_valid: bool = await cache.is_valid_token(token)
         if is_valid:
             await logger.info(f"Is valid token with data")

brandenburg/toolbox/_backends/redis.py

@@ -125,5 +125,5 @@ async def set_table_last_updated(self, table: str, updated_at: int) -> None:
         """
         last_updated_ts: int = max(int(await self._pool.get(key=table) or 0), updated_at)
         await logger.info(f"Configuring last ran date to table: {table}, timestamp: {last_updated_ts}")
-        await cls.set(key=table, value=last_updated_ts)
+        await self._pool.set(table, last_updated_ts)
         await logger.info("last ran was set successfully")

brandenburg/toolbox/funcs.py

@@ -42,7 +42,7 @@ def encode(data: Union[Dict[str, str], str, int]) -> str:
         Can be a string, a dict or a integer and the function will return a encoded string
         """
         if isinstance(data, dict):
-            return base64.b64encode(json.dumps(data).encode()).decode()
+            return base64.b64encode(json.dumps(data)).decode()
         else:
             return base64.b64encode(str(data).encode()).decode()