rb-commons 0.4.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

rb_commons/orm/managers.py

@@ -3,7 +3,7 @@ from typing import TypeVar, Type, Generic, Optional, List, Dict, Literal, Union,
 from sqlalchemy import select, delete, update, and_, func, desc, inspect
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError, NoResultFound
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import declarative_base, InstrumentedAttribute, selectinload
+from sqlalchemy.orm import declarative_base, InstrumentedAttribute, selectinload, RelationshipProperty
 
 from rb_commons.http.exceptions import NotFoundException
 from rb_commons.orm.exceptions import DatabaseException, InternalException
@@ -74,7 +74,7 @@ class BaseManager(Generic[ModelType]):
         """
         if load_all_relations:
             mapper = inspect(self.model)
-            load_relations = [rel.key for rel in mapper.relationships()]
+            load_relations = [rel.key for rel in mapper.relationships]
 
             if load_relations:
                 for rel in load_relations:
@@ -103,26 +103,25 @@ class BaseManager(Generic[ModelType]):
         self._filtered = True
         self.filters = []
 
-        allowed_operators = {"eq", "ne", "gt", "lt", "gte", "lte", "in", "contains"}
-
         for key, value in kwargs.items():
             parts = key.split("__")
 
-            if parts[-1] in allowed_operators:
-                operator = parts[-1]
-                field_path = parts[:-1]
-            else:
-                operator = "eq"
-                field_path = parts
+            operator = "eq"
+
+            if parts[-1] in {"eq", "ne", "gt", "lt", "gte", "lte", "in", "contains"}:
+                operator = parts.pop()
 
             current_attr = self.model
-            for idx, field_name in enumerate(field_path):
-                current_attr = getattr(current_attr, field_name, None)
-                if current_attr is None:
-                    raise ValueError(f"Invalid filter field: {'.'.join(field_path)}")
 
-            if not isinstance(current_attr, InstrumentedAttribute):
-                raise ValueError(f"Invalid filter field: {'.'.join(field_path)}")
+            for field_name in parts:
+                attr_candidate = getattr(current_attr, field_name, None)
+                if attr_candidate is None:
+                    raise ValueError(f"Invalid filter field: {'.'.join(parts)}")
+
+                if hasattr(attr_candidate, "property") and isinstance(attr_candidate.property, RelationshipProperty):
+                    current_attr = attr_candidate.property.mapper.class_
+                else:
+                    current_attr = attr_candidate
 
             if operator == "eq":
                 # e.g., column == value
@@ -146,7 +145,7 @@ class BaseManager(Generic[ModelType]):
 
             elif operator == "in":
                 if not isinstance(value, list):
-                    raise ValueError(f"{'.'.join(field_path)}__in requires a list, got {type(value)}")
+                    raise ValueError(f"{'.'.join(parts)}__in requires a list, got {type(value)}")
                 self.filters.append(current_attr.in_(value))
 
             elif operator == "contains":

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.4.0
+Version: 0.4.2
 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.0.dist-info → rb_commons-0.4.2.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=IktMS_oq0drkt_MwBZTYPE179YgjkQB1HfaDcvnr5Zw,13928
+rb_commons/orm/managers.py,sha256=PedAa8zEIrbeW0d9V0_2rrPvbYsJuB05_aVNnLewsI8,13893
 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.0.dist-info/METADATA,sha256=MrBcay1HyOdGBeKwC8yohoDXLFi0tsjsMdk_S39Lcag,6570
-rb_commons-0.4.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rb_commons-0.4.0.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.4.0.dist-info/RECORD,,
+rb_commons-0.4.2.dist-info/METADATA,sha256=VMbwhfKeMWhIbyVJ1NFfCRvtwG26z1MhOvPf_OAAz1g,6570
+rb_commons-0.4.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rb_commons-0.4.2.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.4.2.dist-info/RECORD,,