validators

resolvers/chats.py

@@ -1,7 +1,7 @@
 import json
 import uuid
 from datetime import datetime, timezone
-
+from validators.chat import Chat
 from services.auth import login_required
 from services.redis import redis
 from services.schema import mutation
@@ -9,7 +9,7 @@ from services.schema import mutation
 
 @mutation.field("updateChat")
 @login_required
-async def update_chat(_, info, chat_new):
+async def update_chat(_, info, chat_new: Chat):
     """
     updating chat
     requires info["request"].user.slug to be in chat["admins"]
@@ -20,11 +20,11 @@ async def update_chat(_, info, chat_new):
     """
     author_id = info.context["author_id"]
     chat_id = chat_new["id"]
-    chat = (await redis.execute("GET", f"chats/{chat_id}"))
+    chat = await redis.execute("GET", f"chats/{chat_id}")
     if not chat:
         return {"error": "chat not exist"}
     else:
-        chat = json.loads(chat)
+        chat: Chat = json.loads(chat)
 
     if author_id in chat["admins"]:
         chat.update(
@@ -33,11 +33,10 @@ async def update_chat(_, info, chat_new):
                 "description": chat_new.get("description", chat["description"]),
                 "updatedAt": int(datetime.now(tz=timezone.utc).timestamp()),
                 "admins": chat_new.get("admins", chat.get("admins") or []),
-                "users": chat_new.get("users", chat["users"]),
+                "members": chat_new.get("members", chat["members"]),
             }
         )
     await redis.execute("SET", f"chats/{chat['id']}", json.dumps(chat))
-    await redis.execute("COMMIT")
 
     return {"error": None, "chat": chat}
 
@@ -74,7 +73,7 @@ async def create_chat(_, info, title="", members=None):
             return {"chat": chat, "error": "existed"}
 
     chat_id = str(uuid.uuid4())
-    chat = {
+    chat: Chat = {
         "id": chat_id,
         "members": members,
         "title": title,
@@ -84,8 +83,8 @@ async def create_chat(_, info, title="", members=None):
         "admins": members if (len(members) == 2 and title == "") else [],
     }
 
-    for m in members:
-        await redis.execute("SADD", f"chats_by_author/{m}", chat_id)
+    for member_id in members:
+        await redis.execute("SADD", f"chats_by_author/{member_id}", chat_id)
     await redis.execute("SET", f"chats/{chat_id}", json.dumps(chat))
     await redis.execute("SET", f"chats/{chat_id}/next_message_id", str(0))
 
@@ -99,19 +98,10 @@ async def delete_chat(_, info, chat_id: str):
 
     chat = await redis.execute("GET", f"/chats/{chat_id}")
     if chat:
-        chat = dict(json.loads(chat))
+        chat: Chat = json.loads(chat)
         if author_id in chat["admins"]:
             await redis.execute("DEL", f"chats/{chat_id}")
             await redis.execute("SREM", f"chats_by_author/{author_id}", chat_id)
-            await redis.execute("COMMIT")
     else:
         return {"error": "chat not exist"}
 
-
-chats_resolvers = {
-    "Mutation": {
-        "deleteChat": delete_chat,
-        "createChat": create_chat,
-        "updateChat": update_chat,
-    },
-}