user async lock

backend/src/application/auth/depends.py

@@ -1,11 +1,13 @@
+from typing import AsyncGenerator
 from fastapi import Depends, Security
 from fastapi.security import APIKeyHeader
 import hashlib
 import hmac
 import json
+import asyncio
 import urllib.parse
 
-from config import TG_CHANNEL_ID, TG_TOKEN
+from config import TG_TOKEN
 from domain.user import UserRepository
 from application.user import UserService
 from infrastructure.db import User, CTX_SESSION
@@ -14,8 +16,9 @@
 
 tg_auth = APIKeyHeader(name = "Tg-Authorization", description = "Telgram Init Data")
 
+locks: dict[int, asyncio.Lock] = {}
 
-async def get_userdata(auth: str = Security(tg_auth)) -> dict:
+async def get_userdata(auth: str = Security(tg_auth)) -> AsyncGenerator[dict, None]:
     tg = dict(urllib.parse.parse_qsl(urllib.parse.unquote(auth)))
     if not tg.get("hash"):
         raise AuthDataException
@@ -30,13 +33,12 @@ async def get_userdata(auth: str = Security(tg_auth)) -> dict:
         raise AuthDataException
 
     user = json.loads(tg['user'])
-    return user
-
+    async with locks.setdefault(user['id'], asyncio.Lock()):
+        yield user
 
 async def get_userid(userdata: dict = Depends(get_userdata)) -> int:
     return userdata['id']
 
-
 async def get_user(userdata: dict = Depends(get_userdata)) -> User:
     user = await UserRepository().get(userdata['id'])
     if not user:

backend/src/domain/user/models.py

@@ -15,7 +15,8 @@ class BaseUser(BaseModel):
 
     @field_validator("name", "surname")
     @staticmethod
-    def name_validator(val):
+    def name_validator(val: str):
+        val = val.strip()
         if " " in val:
             raise HTTPException(422, "name and surname should be one word")
         return val
@@ -59,12 +60,6 @@ class BanUser(UserRequest):
 class VerifyUser(UserRequest):
     value: bool
 
-# class GetUser(TelegramRequest):
-#     user_id: int
-
-# class TelegramRequestResponse(TelegramRequest):
-#     success: bool
-
 class GetUserResponse(BaseModel):
     text: str
     attachments: list[str]