rb-commons 0.5.17__py3-none-any.whl → 0.5.19__py3-none-any.whl

rb_commons/orm/managers.py

@@ -12,6 +12,16 @@ from rb_commons.orm.exceptions import DatabaseException, InternalException
 
 ModelType = TypeVar('ModelType', bound=declarative_base())
 
+class QJSON:
+    def __init__(self, field: str, key: str, operator: str, value: Any):
+        self.field = field
+        self.key = key
+        self.operator = operator
+        self.value = value
+
+    def __repr__(self):
+        return f"QJSON(field={self.field}, key={self.key}, op={self.operator}, value={self.value})"
+
 class Q:
     """Boolean logic container that can be combined with `&`, `|`, and `~`."""
 
@@ -124,7 +134,10 @@ class BaseManager(Generic[ModelType]):
             return current.is_(None) if value else current.isnot(None)
         raise ValueError(f"Unsupported operator in lookup: {lookup}")
 
-    def _q_to_expr(self, q: Q):
+    def _q_to_expr(self, q: Union[Q, QJSON]):
+        if isinstance(q, QJSON):
+            return self._parse_qjson(q)
+
         clauses: List[Any] = [self._parse_lookup(k, v) for k, v in q.lookups.items()]
         for child in q.children:
             clauses.append(self._q_to_expr(child))
@@ -135,6 +148,29 @@ class BaseManager(Generic[ModelType]):
         )
         return ~combined if q.negated else combined
 
+    def _parse_qjson(self, qjson: QJSON):
+        col = getattr(self.model, qjson.field, None)
+        if col is None:
+            raise ValueError(f"Invalid JSON field: {qjson.field}")
+
+        json_expr = col[qjson.key].astext
+
+        if qjson.operator == "eq":
+            return json_expr == str(qjson.value)
+        if qjson.operator == "ne":
+            return json_expr != str(qjson.value)
+        if qjson.operator == "contains":
+            return json_expr.ilike(f"%{qjson.value}%")
+        if qjson.operator == "startswith":
+            return json_expr.ilike(f"{qjson.value}%")
+        if qjson.operator == "endswith":
+            return json_expr.ilike(f"%{qjson.value}")
+        if qjson.operator == "in":
+            if not isinstance(qjson.value, (list, tuple, set)):
+                raise ValueError(f"{qjson.field}[{qjson.key}]__in requires an iterable")
+            return json_expr.in_(qjson.value)
+        raise ValueError(f"Unsupported QJSON operator: {qjson.operator}")
+
     def _loader_from_path(self, path: str) -> Load:
         """
         Turn 'attributes.attribute.attribute_group' into
@@ -173,25 +209,31 @@ class BaseManager(Generic[ModelType]):
         return self
 
     def filter(self, *expressions: Any, **lookups: Any) -> "BaseManager[ModelType]":
-        """Add **AND** constraints (default behaviour).
+        """Add **AND** constraints (default behaviour)."""
 
-        * `expressions` can be raw SQLAlchemy clauses **or** `Q` objects.
-        * `lookups` are Django‑style keyword filters.
-        """
         self._filtered = True
         for expr in expressions:
-            self.filters.append(self._q_to_expr(expr) if isinstance(expr, Q) else expr)
+            if isinstance(expr, Q) or isinstance(expr, QJSON):
+                self.filters.append(self._q_to_expr(expr))
+            else:
+                self.filters.append(expr)
         for k, v in lookups.items():
             self.filters.append(self._parse_lookup(k, v))
         return self
 
     def or_filter(self, *expressions: Any, **lookups: Any) -> "BaseManager[ModelType]":
         """Add one OR group (shortcut for `filter(Q() | Q())`)."""
+
         or_clauses: List[Any] = []
         for expr in expressions:
-            or_clauses.append(self._q_to_expr(expr) if isinstance(expr, Q) else expr)
+            if isinstance(expr, Q) or isinstance(expr, QJSON):
+                or_clauses.append(self._q_to_expr(expr))
+            else:
+                or_clauses.append(expr)
+
         for k, v in lookups.items():
             or_clauses.append(self._parse_lookup(k, v))
+
         if or_clauses:
             self._filtered = True
             self.filters.append(or_(*or_clauses))

rb_commons/permissions/role_permissions.py

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

rb_commons/schemes/jwt.py

@@ -14,6 +14,7 @@ class Claims(BaseModel):
     model_config = ConfigDict(extra="ignore")
 
     user_id: Optional[int] = Field(None, alias="x-user-id")
+    customer_id: Optional[int] = Field(None, alias="x-customer-id")
     user_role: UserRole = Field(UserRole.GUEST, alias="x-user-role")
     shop_id: Optional[uuid.UUID] = Field(None, alias="x-shop-id")
     jwt_token: Optional[str] = Field(None, alias="x-jwt-token")
@@ -22,6 +23,7 @@ class Claims(BaseModel):
     def from_headers(cls, headers: dict) -> 'Claims':
         raw_claims = {
             "x-user-id": headers.get("x-user-id"),
+            "x-customer-id": headers.get("x-customer-id"),
             "x-user-role": headers.get("x-user-role", "admin"),
             "x-shop-id": headers.get("x-shop-id"),
             "x-jwt-token": headers.get("x-jwt-token")
@@ -34,6 +36,12 @@ class Claims(BaseModel):
                 except ValueError as e:
                     raise ValueError(f"Invalid user_id format: {e}")
 
+            if raw_claims["x-customer-id"]:
+                try:
+                    raw_claims["x-customer-id"] = int(raw_claims["x-customer-id"])
+                except ValueError as e:
+                    raise ValueError(f"Invalid customer_id format: {e}")
+
             if raw_claims["x-shop-id"]:
                 try:
                     raw_claims["x-shop-id"] = uuid.UUID(raw_claims["x-shop-id"])

{rb_commons-0.5.17.dist-info → rb_commons-0.5.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.5.17
+Version: 0.5.19
 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.17.dist-info → rb_commons-0.5.19.dist-info}/RECORD

@@ -13,16 +13,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=VMu3v-JzSVZ9pN2d4ZcAF6qZyqmBeXZ62kiHUY73v20,17163
+rb_commons/orm/managers.py,sha256=czc2czBswfVjm51vYvMEupDGxniinAYMqkTXbiMEC7Y,18660
 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=kDvAUvUPt5iUV6ZrdeVPYNJjv4a_Gau7VR8oC_GaaGU,1050
+rb_commons/permissions/role_permissions.py,sha256=4dV89z6ggzLqCCiFYlMp7kQVJRESu6MHpkT5ZNjLo6A,1096
 rb_commons/schemes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rb_commons/schemes/jwt.py,sha256=4MLw3J1-LiU2CXIgm0kP1mlGoDmNfMXmj9iav2s-1Iw,2056
+rb_commons/schemes/jwt.py,sha256=5J-VTAgRWnRrOU6cuumc8eDJQDyTm5y8cn-kLSLan_g,2453
 rb_commons/schemes/pagination.py,sha256=8VZW1wZGJIPR9jEBUgppZUoB4uqP8ORudHkMwvEJSxg,1866
 rb_commons/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/utils/media.py,sha256=J2Zi0J28DhcVQVzt-myNNVuzj9Msaetul53VjZtdDdc,820
-rb_commons-0.5.17.dist-info/METADATA,sha256=fE2fDxCw2vdzr3-1VWvsrya3Nnw6sp2RAdXco07y3LM,6571
-rb_commons-0.5.17.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-rb_commons-0.5.17.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.5.17.dist-info/RECORD,,
+rb_commons-0.5.19.dist-info/METADATA,sha256=BjA7S-dZXfP3gExEwuqyNqmZbYuGx1cb_d1Ww3MjhRA,6571
+rb_commons-0.5.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rb_commons-0.5.19.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.5.19.dist-info/RECORD,,

{rb_commons-0.5.17.dist-info → rb_commons-0.5.19.dist-info}/WHEEL

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