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

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

@@ -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.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=eJ4t_64orYEpA6lZqRROvz8TIYZzB--wBiFrVOJefgM,376
+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=0_nPQkVqV-yaLAgXExKVE0s8gRuTu5nyqs4cMDZYN6s,3812
+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=UO-bMbsRfegTZRUVjj5f2kWHNNkm2OG0PwuxcojLQnQ,3828
-architectonics-0.0.33.dist-info/WHEEL,sha256=y3eDiaFVSNTPbgzfNn0nYn5tEn1cX6WrdetDlQM4xWw,83
-architectonics-0.0.33.dist-info/METADATA,sha256=m5o2a8MuWx6zaOfU3LSPkfzDLlhxV6shvti4jV-7dqI,469
-architectonics-0.0.33.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,,