utg-base 1.15.0__tar.gz → 1.16.0__tar.gz

{utg_base-1.15.0 → utg_base-1.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utg-base
-Version: 1.15.0
+Version: 1.16.0
 Summary: UTG Base Package
 Author: Olimboy
 Author-email: shavkatov.olimboy@mail.ru

{utg_base-1.15.0 → utg_base-1.16.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utg-base"
-version = "1.15.0"
+version = "1.16.0"
 description = "UTG Base Package"
 authors = ["Olimboy <shavkatov.olimboy@mail.ru>", "Rovshen <rovshenashirov1619@gmail.com>"]
 readme = "README.md"

{utg_base-1.15.0 → utg_base-1.16.0}/src/utg_base/api/serializers.py

@@ -37,3 +37,20 @@ class DateTimePeriodSerializer(DateSerializer):
             })
         return attrs
 
+
+class RelatedObjectField(serializers.PrimaryKeyRelatedField):
+    """
+    POST / PUT  -> UUID (string)
+    RESPONSE    -> {id, name}
+    """
+    fields = []
+
+    def __init__(self, **kwargs):
+        self.fields = kwargs.pop("fields", ("id", "name"))
+        super().__init__(**kwargs)
+
+    def use_pk_only_optimization(self):
+        return False
+
+    def to_representation(self, value):
+        return {f: str(getattr(value, f)) for f in self.fields}

{utg_base-1.15.0 → utg_base-1.16.0}/src/utg_base/permissions/decorators.py

@@ -18,7 +18,7 @@ def has_perm(*permission: str, operator: Literal["OR", "AND"] = "OR"):
         view_func._perms = permission
         @wraps(view_func)
         def _wrapped_view(self, request, *args, **kwargs):
-            if not has_permissions(user_id=request.user.id, perms=list(permission), operator=operator):
+            if not has_permissions(user_id=request.user.id, perms=list(permission), operator=operator, request=request):
                 raise PermissionDenied
             return view_func(self, request, *args, **kwargs)
         return _wrapped_view
@@ -54,7 +54,7 @@ def has_class_perm(permissions_map: Dict[str, Union[str, List[str]]], operator:
                 if isinstance(required_perms, str):
                     required_perms = [required_perms]
 
-                if not has_permissions(user_id=request.user.id, perms=required_perms, operator=operator):
+                if not has_permissions(user_id=request.user.id, perms=required_perms, operator=operator, request=request):
                     raise PermissionDenied
 
             return original_initial(self, request, *args, **kwargs)

{utg_base-1.15.0 → utg_base-1.16.0}/src/utg_base/permissions/utils.py

@@ -18,13 +18,17 @@ def generate_perm_cache_key(user_id: str):
     return f"user:{user_id}:permissions"
 
 
-def has_perm(user_id, perm):
+def has_perm(user_id, perm, request=None):
+    if request is not None and isinstance(request, Request) and request.user.is_superuser:
+        return True
     redis_conn: Redis = get_redis_connection("shared")
     perm = f"{to_snake_case(env('APP_NAME'))}:{perm}"
     return bool(redis_conn.sismember(generate_perm_cache_key(user_id), perm))
 
 
-def has_perms(user_id: str, perms: list[str], operator: Literal["OR", "AND"] = "OR"):
+def has_perms(user_id: str, perms: list[str], operator: Literal["OR", "AND"] = "OR", request=None):
+    if request is not None and isinstance(request, Request) and request.user.is_superuser:
+        return True
     redis_conn: Redis = get_redis_connection("shared")
     perms = [f"{to_snake_case(env('APP_NAME'))}:{perm}" for perm in perms]
     result = redis_conn.smismember(generate_perm_cache_key(user_id), perms)