Исправлено сравнение текущего и нового статуса

Short-Tracker · Feb 6, 2024 · 28c1255 · 28c1255
1 parent 408f43f
commit 28c1255
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/short_tracker/api/v1/bot/views.py b/short_tracker/api/v1/bot/views.py
@@ -1,5 +1,6 @@
 from django.contrib.auth import get_user_model
-from rest_framework.generics import ListAPIView
+from rest_framework.generics import ListAPIView, GenericAPIView
+from rest_framework.views import APIView
 
 from .serializer import BotSerializer
 

diff --git a/short_tracker_bot/short_tracker_bot/handlers/hello.py b/short_tracker_bot/short_tracker_bot/handlers/hello.py
@@ -52,8 +52,12 @@ async def get_token(state, bot):
 
 
 async def get_messages(data, chat_id, bot: Bot):
+    logging.info('Вход в функцию получения сообщений')
     for msg in data['results'][0]['messages']:
-        if not get_data_from_redis(f'{chat_id}_msg_{msg["id"]}'):
+        logging.info(msg)
+        message_in_redis = get_data_from_redis(f'{chat_id}_msg_{msg["id"]}')
+        logging.info(message_in_redis)
+        if not message_in_redis:
             await save_data_to_redis(
                 f'{chat_id}_msg_{msg["id"]}', msg['message_body']
             )
@@ -62,7 +66,8 @@ async def get_messages(data, chat_id, bot: Bot):
                 text=f'У вас новое сообщение\n\"{msg["message_body"]}\"'
             )
         for reply in msg['reply']:
-            if not get_data_from_redis(f'{chat_id}_reply_{msg["id"]}'):
+            reply_in_redis = await get_data_from_redis(f'{chat_id}_reply_{msg["id"]}')
+            if not reply_in_redis:
                 await save_data_to_redis(
                     f'{chat_id}_reply_{msg["id"]}',
                     reply["reply_body"]
@@ -138,7 +143,7 @@ async def get_data(state: FSMContext, bot: Bot):
                 data = await request_get(
                     URL + 'bot/',
                     headers=headers)
-            logging.info('Запрос сообщений')
+            logging.info(f'Запрос сообщений')
             await get_messages(data, chat_id, bot)
             await get_tasks(data, chat_id, bot)
         except Exception:

diff --git a/short_tracker_bot/short_tracker_bot/handlers/redis_data.py b/short_tracker_bot/short_tracker_bot/handlers/redis_data.py
@@ -10,6 +10,9 @@ async def save_data_to_redis(key, value):
     await redis.set(key, value)
 
 
+
 async def get_data_from_redis(key):
     data = await redis.get(key)
-    return data.decode('utf-8')
+    if data:
+        return data.decode('utf-8')
+    return None