rb-commons 0.4.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

rb_commons/orm/managers.py

@@ -166,7 +166,13 @@ class BaseManager(Generic[ModelType]):
         query = self._apply_eager_loading(query, load_all_relations)
 
         result = await self.session.execute(query)
-        return list(result.scalars().all())
+        rows = result.scalars().all()
+
+        unique_by_pk = {}
+        for obj in rows:
+            unique_by_pk[obj.id] = obj
+
+        return list(unique_by_pk.values())
 
     async def first(self, load_relations: Sequence[str] = None) -> Optional[ModelType]:
         """Return the first matching object, or None."""

rb_commons/permissions/role_permissions.py

@@ -18,7 +18,7 @@ class BasePermission:
 
 class IsAdmin(BasePermission):
     def has_permission(self, claims: Claims) -> bool:
-        return claims.user_role == UserRole.ADMIN
+        return claims.user_role == UserRole.ADMIN and claims.shop_id is not None
 
 
 class IsCustomer(BasePermission):

{rb_commons-0.4.1.dist-info → rb_commons-0.4.3.dist-info}/METADATA

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

{rb_commons-0.4.1.dist-info → rb_commons-0.4.3.dist-info}/RECORD

@@ -11,15 +11,15 @@ 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=PedAa8zEIrbeW0d9V0_2rrPvbYsJuB05_aVNnLewsI8,13893
+rb_commons/orm/managers.py,sha256=vil3mFmKA8dbmycnOfVuISdKAX-8VNGSbHjPdeeob2c,14028
 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=3ZTwKclavAKSheO58fybo2uLDeTkd-iluTY7hUEjRPk,957
+rb_commons/permissions/role_permissions.py,sha256=HL50s5RHW1nk2U3-YTESg0EDGkJDu1vN4QchcfK-L5g,988
 rb_commons/schemes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/schemes/jwt.py,sha256=F66JJDhholuOPPzlKeoC6f1TL4gXg4oRUrV5yheNpyo,1675
 rb_commons/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/utils/media.py,sha256=KNY_9SdRa3Rp7d3B1tZaXkhmzVa65RcS62BYwZP1bVM,332
-rb_commons-0.4.1.dist-info/METADATA,sha256=lmDjCIO0rK2XvyaMM3lvE7T9YZi-BXBPXr_KJulRL5E,6570
-rb_commons-0.4.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rb_commons-0.4.1.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.4.1.dist-info/RECORD,,
+rb_commons-0.4.3.dist-info/METADATA,sha256=8109-UeVW00s8WWOosclBlsJ-N-njhOlgfC2bo6tQv4,6570
+rb_commons-0.4.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rb_commons-0.4.3.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.4.3.dist-info/RECORD,,