utg-base 1.14.0__py3-none-any.whl → 1.15.0__py3-none-any.whl

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/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/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)
 

{utg_base-1.14.0.dist-info → utg_base-1.15.0.dist-info}/METADATA

@@ -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.dist-info → utg_base-1.15.0.dist-info}/RECORD

@@ -40,12 +40,13 @@ utg_base/models/jwt_user.py,sha256=6TQ5wB_OZBtGhRL-2MonBGZm0n0Y86s4BRTxiRlUJOk,3
 utg_base/models/timestamp.py,sha256=AkCliNXnvs8Z17b1mcS7gOK7v6h3Jul6WCyGyVAkb-w,217
 utg_base/permissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utg_base/permissions/decorators.py,sha256=bDmC_fUuOIo-Lp92wO4B3q5XtwhC4uU4n3NamDft4vI,2066
-utg_base/permissions/utils.py,sha256=zgwyp6r-CySPrUFCZ1qm8_4UzsbtMYPlgzyCBpOQ4BU,2585
+utg_base/permissions/folder.py,sha256=uJv40FVb7R379qss66a5oUcLK7KCUIL6DPbzEcGOw38,694
+utg_base/permissions/utils.py,sha256=8nbs9PwWEtInFv8wRDMre1pAPu_FwmVz7A07i_WikU8,2591
 utg_base/references_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utg_base/references_api/apps.py,sha256=thAGmO-ZT-OD9dHHBSQRL_RRt-Es_jt-mEmHgVTpERs,168
 utg_base/references_api/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utg_base/references_api/urls.py,sha256=WkLACQ8GfK5pJkvt8FuYdOxcqSZHj7pYRw51M9WluGw,390
-utg_base/references_api/utils.py,sha256=ndbeLXqLMUyCqqs_xqEFOCaE1rYnLxxI-LMeQx2YsjY,5903
+utg_base/references_api/utils.py,sha256=m9Jl9ccJylqhjlP6UdBZyx3Difag3viV9QWmBGu7ubY,6060
 utg_base/services/__init__.py,sha256=LqtwUiqEZPIbKRGJfve5D5m3ucV6Kw1Nbo5Jnj_hPhY,37
 utg_base/services/base_api.py,sha256=bMTmjy8TRN4WTCgV_1RvkquoqijJQ1hP7BBtPgW_AH0,5677
 utg_base/signals/__init__.py,sha256=5SKumqAQrfrXUzi4NO3zjPAXV2TG3EDKxOomaF-e15M,35
@@ -67,6 +68,6 @@ utg_base/utils/sql.py,sha256=rqIWcSjdjIMszdRnsnhV5TTYB8W17RPOujIQA9rKC_Y,762
 utg_base/utils/string.py,sha256=ATwIo9uLa00p85h_NjRYLcjRs8o3KSGF7s2yhTg5GiA,1073
 utg_base/utils/thread.py,sha256=4RqRnwtyHymY-dNcuPrMSTamE2V7wCMVfzzyIb0P4TI,2191
 utg_base/utils/translation.py,sha256=GxJHUt0iar_0E7RWBPbeLFQ4DhgXBjffHCmxfKyjFtk,463
-utg_base-1.14.0.dist-info/METADATA,sha256=iXWdpkKrzStHPqX6amNh9A2mXU-F9xZRnHynmSUte1k,917
-utg_base-1.14.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-utg_base-1.14.0.dist-info/RECORD,,
+utg_base-1.15.0.dist-info/METADATA,sha256=1ltxZeXg6sjr09qwXTbJivshbgsYh42Dy2yVuyoK8GE,917
+utg_base-1.15.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+utg_base-1.15.0.dist-info/RECORD,,