architectonics 0.0.34__tar.gz → 0.0.36__tar.gz

{architectonics-0.0.34 → architectonics-0.0.36}/PKG-INFO

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

{architectonics-0.0.34 → architectonics-0.0.36}/architectonics/core/models/base_model.py

@@ -1,7 +1,6 @@
-from dataclasses import dataclass, field
+from dataclasses import asdict, dataclass, field
 from datetime import datetime
 import uuid
-from dataclasses import asdict
 
 
 @dataclass(

architectonics-0.0.36/architectonics/core/models/deleted_models.py

@@ -0,0 +1,8 @@
+from dataclasses import dataclass
+
+from architectonics.core.models.base_model import BaseModel
+
+
+@dataclass
+class DeletedModel(BaseModel):
+    id: str

{architectonics-0.0.34 → architectonics-0.0.36}/architectonics/core/services/base_service.py

@@ -6,6 +6,7 @@ from starlette.status import (
 )
 
 from architectonics.core.models.base_model import BaseModel
+from architectonics.core.models.deleted_models import DeletedModel
 from architectonics.core.result.service_result import ServiceResult
 from architectonics.core.services.base_schemas import (
     BaseModelCreateSchema,
@@ -67,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",
             )
@@ -97,39 +98,30 @@ class BaseService:
                 model=model,
             )
         except IntegrityErrorException as error:
-            return ServiceResult[BaseModel, BaseModelValidationErrors].failure(
-                error_message=error
-            )
+            return ServiceResult[BaseModel, BaseModelValidationErrors].failure(error_message=error)
         except ObjectNotFoundException:
             return ServiceResult[BaseModel, BaseModelValidationErrors].failure(
                 error_message="object_not_found",
             )
 
-        return ServiceResult[BaseModel, BaseModelValidationErrors].success(
-            value=model
-        )
-
-    """
-
-    
-
-
-    
+        return ServiceResult[BaseModel, BaseModelValidationErrors].success(value=model)
 
     async def delete_model(
         self,
         model_id: str,
-    ) -> tuple[None | str, str | dict[str, list[str]] | None, int]:
-
-        _, errors, status_code = await self.get_model(
-            model_id=model_id,
-        )
+    ) -> ServiceResult[DeletedModel, BaseModelValidationErrors]:
 
-        if errors:
-            return None, errors, status_code
+        try:
+            await self._repository.delete_model(
+                model_id=model_id,
+            )
+        except ObjectNotFoundException:
+            return ServiceResult[BaseModel, BaseModelValidationErrors].failure(
+                error_message="object_not_found",
+            )
 
-        await self._repository.delete_model(
-            model_id=model_id,
+        return ServiceResult[DeletedModel, BaseModelValidationErrors].success(
+            value=DeletedModel(
+                id=model_id,
+            ),
         )
-
-        return "object_deleted", None, HTTP_200_OK"""

{architectonics-0.0.34 → architectonics-0.0.36}/architectonics/infrastructure/repositories/base_repository.py

@@ -2,17 +2,17 @@ from abc import ABC
 from typing import Callable
 
 from asyncpg.exceptions import ForeignKeyViolationError
+from sqlalchemy import delete, select, update
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from architectonics.core.models.base_model import BaseModel
 from architectonics.infrastructure.entities.base_entity import BaseEntity
 from architectonics.infrastructure.repositories.base_exceptions import (
     IntegrityErrorException,
     ObjectAlreadyExistsException,
     ObjectNotFoundException,
 )
-from sqlalchemy import delete, select, update
-from sqlalchemy.exc import IntegrityError
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from architectonics.core.models.base_model import BaseModel
 
 
 class BaseRepository(ABC):
@@ -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()
 
@@ -116,7 +116,13 @@ class BaseRepository(ABC):
         )
 
         async with self.get_session() as session:
-            await session.execute(statement)
+            result = await session.execute(
+                statement=statement,
+            )
+
+            if result.rowcount == 0:
+                raise ObjectNotFoundException()
+
             await session.commit()
 
     async def get_models_list(

{architectonics-0.0.34 → architectonics-0.0.36}/pyproject.toml

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

{architectonics-0.0.34 → architectonics-0.0.36}/setup.py

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