architectonics 0.0.35__tar.gz → 0.0.37__tar.gz

{architectonics-0.0.35 → architectonics-0.0.37}/PKG-INFO

@@ -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 → architectonics-0.0.37}/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-0.0.37/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-0.0.35 → architectonics-0.0.37}/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 → architectonics-0.0.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "architectonics"
-version = "0.0.35"
+version = "0.0.37"
 description = ""
 authors = ["Your Name <you@example.com>"]
 

{architectonics-0.0.35 → architectonics-0.0.37}/setup.py

@@ -33,7 +33,7 @@ install_requires = \
 
 setup_kwargs = {
     'name': 'architectonics',
-    'version': '0.0.35',
+    'version': '0.0.37',
     'description': '',
     'long_description': None,
     'author': 'Your Name',