architectonics 0.0.35__py3-none-any.whl → 0.0.37__py3-none-any.whl

architectonics/core/services/base_service.py

@@ -68,11 +68,11 @@ class BaseService:
         model_id: str,
     ) -> ServiceResult[BaseModel, BaseModelValidationErrors]:
 
-        try:
-            model = await self._repository.get_model_by_id(
-                model_id=model_id,
-            )
-        except ObjectNotFoundException:
+        model = await self._repository.get_model_by_id(
+            model_id=model_id,
+        )
+
+        if model is None:
             return ServiceResult[BaseModel, BaseModelValidationErrors].failure(
                 error_message="object_not_found",
             )

architectonics/core/services/user_auth_service.py

@@ -0,0 +1,52 @@
+from uuid import UUID
+
+from fastapi import Depends, Header, HTTPException
+from starlette.status import HTTP_400_BAD_REQUEST
+
+
+def get_user_id(
+    x_user_id: str = Header(
+        alias="X-User-Id",
+        description="Идентификатор пользователя",
+    ),
+) -> str:
+    if not x_user_id:
+        raise HTTPException(
+            status_code=HTTP_400_BAD_REQUEST,
+            detail="X-User-Id header is required",
+        )
+
+    try:
+        _ = UUID(x_user_id, version=4)  # version=4 для проверки UUID v4
+    except ValueError:
+        raise HTTPException(
+            status_code=HTTP_400_BAD_REQUEST,
+            detail="not_valid_uuid",
+        )
+
+    return x_user_id
+
+
+def get_user_roles(
+    x_user_roles: str = Header(
+        alias="X-User-Roles",
+        description="Роли пользователя",
+    ),
+) -> str:
+    if not x_user_roles:
+        raise HTTPException(
+            status_code=HTTP_400_BAD_REQUEST,
+            detail="X-User-Roles header is required",
+        )
+
+    return x_user_roles.split(",")
+
+
+class UserAuthService:
+    def __init__(
+        self,
+        user_id: str = Depends(get_user_id),
+        user_roles: list[str] = Depends(get_user_roles),
+    ):
+        self.user_id = user_id
+        self.user_roles = user_roles

architectonics/infrastructure/repositories/base_repository.py

@@ -49,7 +49,7 @@ class BaseRepository(ABC):
     async def get_model_by_id(
         self,
         model_id: str,
-    ) -> BaseModel:
+    ) -> BaseModel | None:
 
         statement = select(
             self._entity,
@@ -66,7 +66,7 @@ class BaseRepository(ABC):
             entity = result.scalars().first()
 
             if entity is None:
-                raise ObjectNotFoundException()
+                return None
 
             return entity.to_model()
 

{architectonics-0.0.35.dist-info → architectonics-0.0.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: architectonics
-Version: 0.0.35
+Version: 0.0.37
 Summary: 
 Author: Your Name
 Author-email: you@example.com

{architectonics-0.0.35.dist-info → architectonics-0.0.37.dist-info}/RECORD

@@ -13,7 +13,8 @@ architectonics/core/result/error_message.py,sha256=sMIMVt58wGo33E9lD4r6k9tRkgL2T
 architectonics/core/result/service_result.py,sha256=VwjegZKR38ocAEriY_0rnnPn69u09HDja4y3iKq0z9w,1879
 architectonics/core/schemas/base_schemas.py,sha256=4ghwg7h06uIoBRkXGtWDFQA7Yb6Hvo4AsIA80xmSlFk,415
 architectonics/core/services/base_schemas.py,sha256=9PpCcf5GaE68s2VDKiAWRNufhFL2iN5djOcMsir8HMk,295
-architectonics/core/services/base_service.py,sha256=hYYQ73icgMnwnDRjGd1rqYlE5qvsVvneKHosjEEHysU,4149
+architectonics/core/services/base_service.py,sha256=dyu_G4JV9iL_teT10M9UhvGlN5D15165FABJRxcjWXU,4111
+architectonics/core/services/user_auth_service.py,sha256=lQr_YdFkPP5p0WstUpsQ3htXyHeaaSlUjl_1XRJnFC0,1302
 architectonics/core/validation/base_model_validation_errors.py,sha256=Z3nGM3XaHbkW0z2qhVjwd8t0EbYULArIHARa0IYCNVg,306
 architectonics/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 architectonics/infrastructure/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,7 +23,7 @@ architectonics/infrastructure/config/database_settings.py,sha256=d1HA8rQj3LMACEv
 architectonics/infrastructure/entities/base_entity.py,sha256=EqmmY2aVzqIdgJPsKBUBtesOfsmSSNrRuBGGQQ6bpJA,818
 architectonics/infrastructure/repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 architectonics/infrastructure/repositories/base_exceptions.py,sha256=kOeu3p90LHMxCcp2cCL_Anrsz4CTLtELWqma_RCQSqM,303
-architectonics/infrastructure/repositories/base_repository.py,sha256=y9Q2SPj1t55gRrUaNrSZ7SnuEGVYRAlwuU3fhNwtzt8,3585
-architectonics-0.0.35.dist-info/WHEEL,sha256=y3eDiaFVSNTPbgzfNn0nYn5tEn1cX6WrdetDlQM4xWw,83
-architectonics-0.0.35.dist-info/METADATA,sha256=xAEwbOoRpQui4bDEHoq492lae0wJ4ZrVXjEFseJtgpQ,469
-architectonics-0.0.35.dist-info/RECORD,,
+architectonics/infrastructure/repositories/base_repository.py,sha256=RFERUHKTXCURSSME-GHkmBfbycSPTtiojYwBowjtNrw,3572
+architectonics-0.0.37.dist-info/WHEEL,sha256=y3eDiaFVSNTPbgzfNn0nYn5tEn1cX6WrdetDlQM4xWw,83
+architectonics-0.0.37.dist-info/METADATA,sha256=WYUiw3wsisUbwDzl2BlKGg6um97zA6qvNa465qkpY_E,469
+architectonics-0.0.37.dist-info/RECORD,,