rb-commons 0.5.4__py3-none-any.whl → 0.5.6__py3-none-any.whl

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/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.dist-info → rb_commons-0.5.6.dist-info}/METADATA

@@ -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.dist-info → rb_commons-0.5.6.dist-info}/RECORD

@@ -11,16 +11,16 @@ rb_commons/http/consul.py,sha256=Ioq72VD1jGwoC96set7n2SgxN40olzI-myA2lwKkYi4,186
 rb_commons/http/exceptions.py,sha256=EGRMr1cRgiJ9Q2tkfANbf0c6-zzXf1CD6J3cmCaT_FA,1885
 rb_commons/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/orm/exceptions.py,sha256=1aMctiEwrPjyehoXVX1l6ML5ZOhmDkmBISzlTD5ey1Y,509
-rb_commons/orm/managers.py,sha256=1ZyBgSEo_MUkMW38r66hwJpDA0T2EEHeHMpsGhA_iD0,16417
+rb_commons/orm/managers.py,sha256=mKpsN1OrPUDxF12KyZleZNMD7vBBQ503pWclIYjGWFE,16565
 rb_commons/orm/services.py,sha256=71eRcJ4TxZvzNz-hLXo12X4U7PGK54ZfbLAb27AjZi8,1589
 rb_commons/permissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rb_commons/permissions/role_permissions.py,sha256=HL50s5RHW1nk2U3-YTESg0EDGkJDu1vN4QchcfK-L5g,988
+rb_commons/permissions/role_permissions.py,sha256=e5Sw5zUcepXOtsrOlFEgp0Kr5lqHF7sVGPRvx0gDw68,1019
 rb_commons/schemes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/schemes/jwt.py,sha256=F66JJDhholuOPPzlKeoC6f1TL4gXg4oRUrV5yheNpyo,1675
 rb_commons/schemes/pagination.py,sha256=8VZW1wZGJIPR9jEBUgppZUoB4uqP8ORudHkMwvEJSxg,1866
 rb_commons/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/utils/media.py,sha256=KNY_9SdRa3Rp7d3B1tZaXkhmzVa65RcS62BYwZP1bVM,332
-rb_commons-0.5.4.dist-info/METADATA,sha256=lW5cFKjDBNf83aZuUvjhX2Kf70VIgNCFo3m2SZcIXbA,6570
-rb_commons-0.5.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rb_commons-0.5.4.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.5.4.dist-info/RECORD,,
+rb_commons-0.5.6.dist-info/METADATA,sha256=vS_mMAT7aohq3Wl76P3bbrTZQO3JvNlg5XRFlF-IO3A,6570
+rb_commons-0.5.6.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+rb_commons-0.5.6.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.5.6.dist-info/RECORD,,

{rb_commons-0.5.4.dist-info → rb_commons-0.5.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any