fix: type annotations

Author: stefanotroncaro

app/common/infrastructure/sqlalchemy_criteria_translator.py

@@ -1,4 +1,7 @@
-__all__ = ("SqlalchemyCriteriaTranslator",)
+__all__ = (
+    "SqlalchemyCriteriaTranslator",
+    "Statement",
+)
 
 import abc
 import typing as t
@@ -7,7 +10,7 @@
 
 from app.common.domain import Criteria
 
-type _Statement = sa.Select[t.Any] | sa.Update | sa.Delete
+type Statement = sa.Select[t.Any] | sa.Update | sa.Delete
 type _Criteria = Criteria[t.Any]
 type _Translator = "SqlalchemyCriteriaTranslator[t.Any]"
 type _Registry = dict[type[_Criteria], type[_Translator]]
@@ -38,7 +41,7 @@ def get_for_criteria(cls, criteria: _Criteria) -> _Translator:
         return translator_cls(criteria)
 
     @abc.abstractmethod
-    def translate(self, stmt: _Statement) -> _Statement:
+    def translate(self, stmt: Statement) -> Statement:
         raise NotImplementedError()
 
 

app/users/api/dependencies/current_user_dependency.py

@@ -4,6 +4,7 @@
 )
 
 import typing as t
+import uuid
 
 import fastapi
 
@@ -34,8 +35,9 @@ def get_current_user(
             status_code=fastapi.status.HTTP_401_UNAUTHORIZED, detail=e.message
         )
 
+    user_id = UserId(uuid.UUID(token_data.user_id))
     try:
-        user = user_repository.find_or_fail(UserId(token_data.user_id))
+        user = user_repository.find_or_fail(user_id)
     except ModelNotFoundException as e:
         raise fastapi.HTTPException(
             status_code=404,

app/users/infrastructure/sqlalchemy_user_translators.py

@@ -1,6 +1,7 @@
 __all__ = ("SQLAlchemyUserEmailFilterTranslator",)
 
 from app.common.infrastructure import SqlalchemyCriteriaTranslator
+from app.common.infrastructure import Statement
 from app.users.domain import UserEmailFilter
 
 from .sqlalchemy_user_model import SQLAlchemyUserModel
@@ -10,5 +11,5 @@ class SQLAlchemyUserEmailFilterTranslator(
     SqlalchemyCriteriaTranslator[UserEmailFilter],
     criteria=UserEmailFilter,
 ):
-    def translate(self, stmt):
+    def translate(self, stmt: Statement) -> Statement:
         return stmt.where(SQLAlchemyUserModel.email == self._criteria.email)