architectonics 0.0.33__tar.gz → 0.0.35__tar.gz

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

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

{architectonics-0.0.33 → architectonics-0.0.35}/architectonics/core/models/base_model.py

@@ -1,4 +1,4 @@
-from dataclasses import dataclass, field
+from dataclasses import asdict, dataclass, field
 from datetime import datetime
 import uuid
 
@@ -18,3 +18,13 @@ class BaseModel:
     updated_at: datetime = field(
         default_factory=datetime.utcnow,
     )
+
+    def to_update_dict(self) -> dict[str, any]:
+        now = datetime.utcnow()
+
+        values = {k: v for k, v in asdict(self).items() if k not in {"id", "created_at"} and v is not None}
+
+        values["updated_at"] = now
+        self.updated_at = now
+
+        return values

architectonics-0.0.35/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.33 → architectonics-0.0.35}/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,
@@ -80,50 +81,47 @@ class BaseService:
             value=model,
         )
 
-    """
-
-    
-
-
     async def update_model(
         self,
-        model_id: str,
-        update_schema: BaseModelUpdateSchema,
-    ) -> tuple[BaseModel | None, str | dict[str, list[str]] | None, int]:
-
-        schema_dict = update_schema.model_dump(by_alias=False)
+        model: BaseModel,
+    ) -> ServiceResult[BaseModel, BaseModelValidationErrors]:
 
-        attrs, errors = await self._validate_values(**schema_dict)
+        validation_errors = await self.validate(model)
 
-        if errors:
-            return None, errors, HTTP_422_UNPROCESSABLE_CONTENT
+        if validation_errors.has_errors():
+            return ServiceResult[BaseModel, BaseModelValidationErrors].validation_failure(
+                validation_errors=validation_errors,
+            )
 
         try:
             model = await self._repository.update_model(
-                model_id=model_id,
-                values=attrs,
+                model=model,
             )
-        except IntegrityErrorException as e:
-            return None, f"{e}", HTTP_404_NOT_FOUND
+        except IntegrityErrorException as error:
+            return ServiceResult[BaseModel, BaseModelValidationErrors].failure(error_message=error)
         except ObjectNotFoundException:
-            return None, "object_not_found", HTTP_404_NOT_FOUND
+            return ServiceResult[BaseModel, BaseModelValidationErrors].failure(
+                error_message="object_not_found",
+            )
 
-        return model, None, HTTP_200_OK
+        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]:
+    ) -> ServiceResult[DeletedModel, BaseModelValidationErrors]:
 
-        _, errors, status_code = await self.get_model(
-            model_id=model_id,
-        )
-
-        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.33 → architectonics-0.0.35}/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):
@@ -72,30 +72,23 @@ class BaseRepository(ABC):
 
     async def update_model(
         self,
-        model_id: str,
-        values: dict[str, any],
+        model: BaseModel,
     ) -> BaseModel:
 
-        filtered_values = {k: v for k, v in values.items() if v is not None}
+        updated_values = model.to_update_dict()
 
         update_statement = (
             update(
                 self._entity,
             )
             .where(
-                self._entity.id == model_id,
+                self._entity.id == model.id,
             )
             .values(
-                **filtered_values,
+                **updated_values,
             )
         )
 
-        get_statement = select(
-            self._entity,
-        ).where(
-            self._entity.id == model_id,
-        )
-
         async with self.get_session() as session:
             try:
                 result = await session.execute(update_statement)
@@ -109,13 +102,7 @@ class BaseRepository(ABC):
 
                 raise IntegrityErrorException(e)
 
-            result = await session.execute(get_statement)
-            model = result.scalars().first()
-
-            if model is None:
-                raise ObjectNotFoundException()
-
-            return model.to_model()
+            return model
 
     async def delete_model(
         self,
@@ -129,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.33 → architectonics-0.0.35}/pyproject.toml

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

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

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