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

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/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/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,
@@ -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/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):
@@ -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.dist-info → architectonics-0.0.35.dist-info}/METADATA

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

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

@@ -7,12 +7,13 @@ architectonics/core/config/application_settings.py,sha256=DmCjQCbm4BsxMoZuQ212Pj
 architectonics/core/factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 architectonics/core/factory/factory.py,sha256=C9TDhkhq5lcdcBnICy4DgJj0yjeCIhq-UVSwaf-aTmM,748
 architectonics/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-architectonics/core/models/base_model.py,sha256=kuYPZ-Z7lR7Sbj3yOVVN7HeCgs6_Dg0dtmF-kjIqkFo,686
+architectonics/core/models/base_model.py,sha256=-dT4UqQCSW41Ip6Cb41Bkudh45Co71EsReYOdwF4BMs,663
+architectonics/core/models/deleted_models.py,sha256=9hqdZgCC2JhAriA_GA7P2uA32rk5UAEXvGA3u8HVIME,151
 architectonics/core/result/error_message.py,sha256=sMIMVt58wGo33E9lD4r6k9tRkgL2TpO7yjX-BZc6PHI,97
 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=fTd0oxeHhIlfMijtsJZRz-mLm8ZY9lkZu4WMvZjBZ7E,4001
+architectonics/core/services/base_service.py,sha256=hYYQ73icgMnwnDRjGd1rqYlE5qvsVvneKHosjEEHysU,4149
 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
@@ -21,7 +22,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=fT4X-b89H8vnrAMJ9oEXxxlv6JI87IH0iwruvzlmUs4,3448
-architectonics-0.0.34.dist-info/WHEEL,sha256=y3eDiaFVSNTPbgzfNn0nYn5tEn1cX6WrdetDlQM4xWw,83
-architectonics-0.0.34.dist-info/METADATA,sha256=vEwyBxaatz4FINRpwP_Fg6LxYQhJRC8M82zpjMU715g,469
-architectonics-0.0.34.dist-info/RECORD,,
+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,,