updated docs

Services/Redis/Actions/actions.py

@@ -1,9 +1,9 @@
-import json
 import arrow
 
 from typing import Optional, List, Dict, Union
 
 from AllConfigs.main import MainConfig
+
 from Services.Redis.conn import redis_cli
 from Services.Redis.Models.base import RedisRow
 from Services.Redis.Models.response import RedisResponse
@@ -21,6 +21,24 @@ class RedisActions:
             for unit, multiplier in time_multipliers.items()
         )
 
+    @classmethod
+    def set_expiry_time(cls, expiry_seconds: int) -> Dict[str, int]:
+        """Convert total seconds back into a dictionary of time units."""
+        time_multipliers = {"days": 86400, "hours": 3600, "minutes": 60, "seconds": 1}
+        result = {}
+        for unit, multiplier in time_multipliers.items():
+            if expiry_seconds >= multiplier:
+                result[unit], expiry_seconds = divmod(expiry_seconds, multiplier)
+        return result
+
+    @classmethod
+    def resolve_expires_at(cls, redis_row: RedisRow) -> str:
+        """Resolve expiry time for Redis key."""
+        expiry_time = redis_cli.ttl(redis_row.redis_key)
+        if expiry_time == -1:
+            return "Key has no expiry time."
+        return arrow.now().shift(seconds=expiry_time).format(MainConfig.DATETIME_FORMAT)
+
     @classmethod
     def delete_key(cls, key: Union[Optional[str], Optional[bytes]]):
         try:
@@ -41,7 +59,7 @@ class RedisActions:
         cls, list_keys: List[Union[Optional[str], Optional[bytes]]]
     ) -> RedisResponse:
         try:
-            regex = RedisRow.regex(list_keys=list_keys)
+            regex = RedisRow().regex(list_keys=list_keys)
             json_get = redis_cli.scan_iter(match=regex)
 
             for row in list(json_get):
@@ -100,14 +118,6 @@ class RedisActions:
                 error=str(e),
             )
 
-    @classmethod
-    def resolve_expires_at(cls, redis_row: RedisRow) -> str:
-        """Resolve expiry time for Redis key."""
-        expiry_time = redis_cli.ttl(redis_row.redis_key)
-        if expiry_time == -1:
-            return "Key has no expiry time."
-        return arrow.now().shift(seconds=expiry_time).format(MainConfig.DATETIME_FORMAT)
-
     @classmethod
     def get_json(
         cls, list_keys: List[Union[Optional[str], Optional[bytes]]]
@@ -120,8 +130,14 @@ class RedisActions:
             for row in list(json_get):
                 redis_row = RedisRow()
                 redis_row.set_key(key=row)
-                redis_row.expires_at = cls.resolve_expires_at(redis_row=redis_row)
-                redis_value = redis_cli.get(redis_row.redis_key)
+                redis_value = redis_cli.get(row)
+                redis_value_expire = redis_cli.ttl(row)
+                redis_row.expires_at = cls.set_expiry_time(
+                    expiry_seconds=int(redis_value_expire)
+                )
+                redis_row.expires_at_string = cls.resolve_expires_at(
+                    redis_row=redis_row
+                )
                 redis_row.feed(redis_value)
                 list_of_rows.append(redis_row)
             if list_of_rows: