rb-commons 0.5.4__tar.gz → 0.5.6__tar.gz

{rb_commons-0.5.4 → rb_commons-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.5.4
+Version: 0.5.6
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/RoboSell-organization/rb-commons
 Author: Abdulvoris

{rb_commons-0.5.4 → rb_commons-0.5.6}/rb_commons/orm/managers.py

@@ -270,12 +270,18 @@ class BaseManager(Generic[ModelType]):
         self._reset_state()
         return result.scalars().first()
 
-
-    async def count(self) -> int:
+    async def count(self) -> int | None:
         self._ensure_filtered()
-        query = select(func.count()).select_from(self.model).filter(and_(*self.filters))
-        result = await self.session.execute(query)
-        return result.scalar_one()
+
+        stmt = select(func.count(self.model.id)).select_from(self.model)
+        if self.filters:
+            stmt = stmt.where(and_(*self.filters))
+
+        try:
+            result = await self.session.execute(stmt)
+            return int(result.scalar_one())
+        finally:
+            self._reset_state()
 
     async def paginate(self, limit=10, offset=0, load_all_relations=False):
         self._ensure_filtered()

{rb_commons-0.5.4 → rb_commons-0.5.6}/rb_commons/permissions/role_permissions.py

@@ -23,7 +23,7 @@ class IsAdmin(BasePermission):
 
 class IsCustomer(BasePermission):
     def has_permission(self, claims: Claims) -> bool:
-        return claims.user_role == UserRole.CUSTOMER
+        return claims.user_role == UserRole.CUSTOMER and claims.user_id is not None
 
 
 IsAdminDep = Annotated[Claims, Depends(IsAdmin())]

{rb_commons-0.5.4 → rb_commons-0.5.6}/rb_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.5.4
+Version: 0.5.6
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/RoboSell-organization/rb-commons
 Author: Abdulvoris

{rb_commons-0.5.4 → rb_commons-0.5.6}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="rb-commons",
-    version="0.5.4",
+    version="0.5.6",
     author="Abdulvoris",
     author_email="erkinovabdulvoris101@gmail.com",
     description="Commons of project and simplified orm based on sqlalchemy.",