SARepo 0.1.5__tar.gz → 0.1.6__tar.gz

{sarepo-0.1.5 → sarepo-0.1.6}/PKG-INFO

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

{sarepo-0.1.5 → sarepo-0.1.6}/SARepo/repo.py

@@ -13,7 +13,7 @@ class CrudRepository(Protocol, Generic[T]):
     def try_get(self, id_: Any, *, include_deleted: bool = False) -> Optional[T]: ...
     def add(self, entity: T) -> T: ...
     def update(self, entity: T) -> T: ...
-    def remove(self, entity: T) -> None: ...
+    def remove(self, entity: Optional[T] = None, id: Optional[Any] = None) -> bool: ...
     def delete_by_id(self, id_: Any) -> bool: ...
     def page(self, page: PageRequest, spec: Optional[Spec] = None, order_by=None, *, include_deleted: bool = False) -> Page[T]: ...
     def get_all_by_column(

{sarepo-0.1.5 → sarepo-0.1.6}/SARepo/sa_repo.py

@@ -71,7 +71,13 @@ class SARepository(Generic[T]):
         self.session.refresh(entity)
         return entity
 
-    def remove(self, entity: T) -> None:
+    def remove(self, entity: Optional[T] = None, id: Optional[Any] = None) -> bool:
+        if entity is None and id is None:
+            raise ValueError("remove() requires either entity or id")
+    
+        if id is not None:
+            return self._delete_by_id(id)
+        
         insp = inspect(entity, raiseerr=False)
         if not (insp and (insp.persistent or insp.pending)):
             pk = getattr(entity, "id", None)
@@ -79,13 +85,15 @@ class SARepository(Generic[T]):
                 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
+                return False
         if hasattr(entity, "is_deleted"):
             setattr(entity, "is_deleted", True)
         else:
             self.session.delete(entity)
+            
+        return True
 
-    def delete_by_id(self, id_: Any) -> bool:
+    def _delete_by_id(self, id_: Any) -> bool:
         obj = self.session.get(self.model, id_)
         if not obj:
             return False
@@ -283,7 +291,13 @@ class SAAsyncRepository(Generic[T]):
         await self.session.refresh(entity)
         return entity
 
-    async def remove(self, entity: T) -> None:
+    async def remove(self, entity: Optional[T] = None, id: Optional[Any] = None) -> bool:
+        if entity is None and id is None:
+            raise ValueError("remove() requires either entity or id")
+    
+        if id is not None:
+            return await self._delete_by_id(id)
+        
         insp = inspect(entity, raiseerr=False)
         if not (insp and (insp.persistent or insp.pending)):
             pk = getattr(entity, "id", None)
@@ -291,13 +305,16 @@ class SAAsyncRepository(Generic[T]):
                 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
+                return False
         if hasattr(entity, "is_deleted"):
             setattr(entity, "is_deleted", True)
         else:
             await self.session.delete(entity)
+            
+        return True
 
-    async def delete_by_id(self, id_: Any) -> bool:
+    
+    async def _delete_by_id(self, id_: Any) -> bool:
         obj = await self.session.get(self.model, id_)
         if not obj:
             return False

{sarepo-0.1.5 → sarepo-0.1.6}/SARepo.egg-info/PKG-INFO

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

{sarepo-0.1.5 → sarepo-0.1.6}/pyproject.toml

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

{sarepo-0.1.5 → sarepo-0.1.6}/tests/test_sync_basic.py

@@ -132,8 +132,11 @@ def test_restore(session, repo):
     seed(session, repo)
 
     beta = repo.find_all_by_column("title", "beta")[0]
-    beta.is_deleted = True
+    beta.is_deleted = False
     session.commit()
+    
+    deleted = repo.remove(id=beta.id)
+    print("DELETED ", deleted)
 
     ok = repo.restore(beta.id)
     assert ok is True