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

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

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

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

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

utg_base-1.15.0/src/utg_base/permissions/folder.py

@@ -0,0 +1,22 @@
+from typing import Literal
+
+from django_redis import get_redis_connection
+from redis.client import Redis
+
+
+def generate_folder_cache_key(user_id: str):
+    return f"user:{user_id}:folders"
+
+
+def has_folder_perm(user_id, folder_perm):
+    redis_conn: Redis = get_redis_connection("shared")
+    return bool(redis_conn.sismember(generate_folder_cache_key(user_id), folder_perm))
+
+
+def has_folder_perms(user_id: str, folder_perms: list[str], operator: Literal["OR", "AND"] = "OR"):
+    redis_conn: Redis = get_redis_connection("shared")
+    result = redis_conn.smismember(generate_folder_cache_key(user_id), folder_perms)
+
+    if operator == "OR":
+        return any(result)
+    return all(result)

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

@@ -21,13 +21,13 @@ def generate_perm_cache_key(user_id: str):
 def has_perm(user_id, perm):
     redis_conn: Redis = get_redis_connection("shared")
     perm = f"{to_snake_case(env('APP_NAME'))}:{perm}"
-    return bool(redis_conn.sismember(f'user:{user_id}:permissions', 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"):
     redis_conn: Redis = get_redis_connection("shared")
     perms = [f"{to_snake_case(env('APP_NAME'))}:{perm}" for perm in perms]
-    result = redis_conn.smismember(f'user:{user_id}:permissions', perms)
+    result = redis_conn.smismember(generate_perm_cache_key(user_id), perms)
 
     if operator == "OR":
         return any(result)

{utg_base-1.14.0 → utg_base-1.15.0}/src/utg_base/references_api/utils.py

@@ -8,6 +8,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_serializer
 from rest_framework import filters
 from rest_framework import viewsets, serializers
 
+from utg_base.api.base import BaseAPIView
 from utg_base.permissions.decorators import has_class_perm
 
 serializer_classes = {}
@@ -82,7 +83,7 @@ def create_view_set(model: Model):
     fields_list = get_model_fields_list(model)
 
     @extend_schema(tags=[get_url_prefix(model)])
-    class ViewSet(viewsets.ModelViewSet):
+    class ViewSet(viewsets.ModelViewSet, BaseAPIView):
         http_method_names = get_api_meta_property(model, 'http_method_names') or ['get', 'patch']
         manager = model.objects.order_by(*get_ordering(model))
         filter_backends = [filters.SearchFilter]
@@ -98,6 +99,10 @@ def create_view_set(model: Model):
 
             return create_serializer(model)
 
+        def get_queryset(self):
+            self.update_lang()
+            return self.manager.all()
+
     if permissions := get_api_meta_property(model, 'permissions'):
         has_class_perm(permissions)(ViewSet)