SARepo 0.1.2__tar.gz → 0.1.3__tar.gz

{sarepo-0.1.2 → sarepo-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SARepo
-Version: 0.1.2
+Version: 0.1.3
 Summary: Minimal, explicit Repository & Unit-of-Work layer over SQLAlchemy 2.x
 Author: nurbergenovv
 License: MIT

{sarepo-0.1.2 → sarepo-0.1.3}/SARepo/repo.py

@@ -12,4 +12,5 @@ class CrudRepository(Protocol, Generic[T]):
     def add(self, entity: T) -> T: ...
     def update(self, entity: T) -> T: ...
     def remove(self, entity: T) -> None: ...
+    def delete_by_id(self, id_: Any) -> bool: ...
     def page(self, page: PageRequest, spec=None, order_by=None) -> Page[T]: ...

{sarepo-0.1.2 → sarepo-0.1.3}/SARepo/sa_repo.py

@@ -2,7 +2,7 @@
 from typing import List, Type, Generic, TypeVar, Optional, Sequence, Any, Callable
 from sqlalchemy.orm import Session
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy import select, func
+from sqlalchemy import inspect, select, func
 from .base import PageRequest, Page, NotFoundError
 
 T = TypeVar("T")
@@ -45,11 +45,26 @@ class SARepository(Generic[T]):
         return entity
 
     def remove(self, entity: T) -> None:
+        insp = inspect(entity, raiseerr=False)
+        if not (insp and (insp.persistent or insp.pending)):
+            pk = getattr(entity, "id", None)
+            if pk is None:
+                raise ValueError("remove() needs a persistent entity or an entity with a primary key set")
+            entity = self.session.get(self.model, pk)
+            if entity is None:
+                return
         if hasattr(entity, "is_deleted"):
             setattr(entity, "is_deleted", True)
         else:
             self.session.delete(entity)
 
+    def delete_by_id(self, id_: Any) -> bool:
+        obj = self.session.get(self.model, id_)
+        if not obj:
+            return False
+        self.remove(obj)
+        return True
+
     def page(self, page: PageRequest, spec: Optional[Spec] = None, order_by=None) -> Page[T]:
         stmt = self._select()
         if spec:
@@ -101,11 +116,26 @@ class SAAsyncRepository(Generic[T]):
         return entity
 
     async def remove(self, entity: T) -> None:
+        insp = inspect(entity, raiseerr=False)
+        if not (insp and (insp.persistent or insp.pending)):
+            pk = getattr(entity, "id", None)
+            if pk is None:
+                raise ValueError("remove() needs a persistent entity or an entity with a primary key set")
+            entity = await self.session.get(self.model, pk)
+            if entity is None:
+                return
         if hasattr(entity, "is_deleted"):
             setattr(entity, "is_deleted", True)
         else:
             await self.session.delete(entity)
 
+    async def delete_by_id(self, id_: Any) -> bool:
+        obj = await self.session.get(self.model, id_)
+        if not obj:
+            return False
+        await self.remove(obj)
+        return True
+
     async def page(self, page: PageRequest, spec: Optional[Spec] = None, order_by=None) -> Page[T]:
         stmt = self._select()
         if spec:

{sarepo-0.1.2 → sarepo-0.1.3}/SARepo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SARepo
-Version: 0.1.2
+Version: 0.1.3
 Summary: Minimal, explicit Repository & Unit-of-Work layer over SQLAlchemy 2.x
 Author: nurbergenovv
 License: MIT

{sarepo-0.1.2 → sarepo-0.1.3}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "SARepo"
-version = "0.1.2"
+version = "0.1.3"
 description = "Minimal, explicit Repository & Unit-of-Work layer over SQLAlchemy 2.x"
 readme = "README.md"
 requires-python = ">=3.11"