maquinaweb-shared-auth 0.2.30__py3-none-any.whl → 0.2.31__py3-none-any.whl

{maquinaweb_shared_auth-0.2.30.dist-info → maquinaweb_shared_auth-0.2.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maquinaweb-shared-auth
-Version: 0.2.30
+Version: 0.2.31
 Summary: Models read-only para autenticação compartilhada entre projetos Django.
 Author-email: Seu Nome <seuemail@dominio.com>
 License: MIT
@@ -743,7 +743,7 @@ SharedOrganization.objects.main_organizations()  # QuerySet (is_branch=False)
 SharedOrganization.objects.by_cnpj('12.345.678/0001-90')  # Org | None
 ```
 
-#### SharedUserManager
+#### UserManager
 
 ```python
 from shared_auth.models import User

{maquinaweb_shared_auth-0.2.30.dist-info → maquinaweb_shared_auth-0.2.31.dist-info}/RECORD

@@ -5,17 +5,17 @@ shared_auth/conf.py,sha256=WlSXQB7p3BfE3BL6WR6EDYpCHQEjDlxQlyf8dTfClsk,621
 shared_auth/decorators.py,sha256=RT-Qfi7oGBo6PvWJRR1dqJUQdU6ZOf9p-8mV3rZmqQ0,3237
 shared_auth/exceptions.py,sha256=VKamHjBl2yjXG2RsMrLrXru1_Q9IJXmy4xmDcXlpWsU,627
 shared_auth/fields.py,sha256=RAcmFh1D_nkbai_7t_OrPZhfhAipesy5kKnEj4LUvvM,1254
-shared_auth/managers.py,sha256=A9y-X4ixVXhsNxgr3YD4DtuN4ufrX7LbM_JPwJ0Y3aA,9176
+shared_auth/managers.py,sha256=NpIDMY7BWl1pKZKCepuNDxz7eekEUhKkOUYsWGbwyos,6715
 shared_auth/middleware.py,sha256=72GF8kGijbhw98v2Q-1sXBXk-7Bamfyvypm9h8xLX_I,6112
-shared_auth/mixins.py,sha256=9TJk07hlHXnTYu0tPNr7VAXd7VL9fyXayMaFERifLLY,7389
-shared_auth/models.py,sha256=vCyssDwKfWRE3ofl6LK_CB1-y5O-_6uvJyGZGoCnb44,6574
+shared_auth/mixins.py,sha256=BSYNTWYjLRGuxfy7x-uAaNZmrTMsm67ogAQzjrU2DoQ,7388
+shared_auth/models.py,sha256=QMY_Oyr4x7AtSNAFV3UfoJY0YBZwFKePvfVNWt-vQTc,6562
 shared_auth/permissions.py,sha256=FNIp12ePOUlXVp26zNMAyEtzX9kwyP7RuNIgaaCXtPA,2671
 shared_auth/router.py,sha256=zYidJ7j40lQLrhkCtAQAp-rQLhua_UF0X7SDzYRcV5w,668
-shared_auth/serializers.py,sha256=VmajFqnAHB5wyxsdd5_WVegAQygi0KNOMk7vScCPHiQ,7385
+shared_auth/serializers.py,sha256=vziJOlBrPy5tgTCgfr6Sp6gihyI6_1Gkn05BtpmYZxY,11149
 shared_auth/storage_backend.py,sha256=Eqkjz8aF5UrOpRwYl-J0Td95IObfxnJ8eLQDJVFM3Io,184
 shared_auth/urls.py,sha256=591wWEWJPaHEGkcOZ8yvfgxddRyOcZLgOc0vNtF7XRI,289
 shared_auth/views.py,sha256=2hyLnYSWUscfq-jVcskt-ukzDt4vg6IXeKjRDRu9RXk,1519
-maquinaweb_shared_auth-0.2.30.dist-info/METADATA,sha256=bIuaOJDn7kPoK8tE16uQWf3qgqPO3RixJpJ9HiYYXUk,26331
-maquinaweb_shared_auth-0.2.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maquinaweb_shared_auth-0.2.30.dist-info/top_level.txt,sha256=msyYRy02ZV7zz7GR1raUI5LXGFIFn2TIkgkeKZqKufE,12
-maquinaweb_shared_auth-0.2.30.dist-info/RECORD,,
+maquinaweb_shared_auth-0.2.31.dist-info/METADATA,sha256=EwURfIcN3-VtVx-YVE48f2Xsx_1nlf9xC_oIEhEZPi8,26325
+maquinaweb_shared_auth-0.2.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maquinaweb_shared_auth-0.2.31.dist-info/top_level.txt,sha256=msyYRy02ZV7zz7GR1raUI5LXGFIFn2TIkgkeKZqKufE,12
+maquinaweb_shared_auth-0.2.31.dist-info/RECORD,,

shared_auth/managers.py

@@ -45,8 +45,8 @@ class SharedOrganizationManager(models.Manager):
         return self.filter(cnpj__contains=clean_cnpj).first()
 
 
-class SharedUserManager(UserManager):
-    """Manager para SharedUser"""
+class UserManager(UserManager):
+    """Manager para User"""
 
     def get_or_fail(self, user_id):
         """Busca usuário ou lança exceção"""
@@ -89,38 +89,16 @@ class OrganizationQuerySetMixin:
 
     def with_organization_data(self):
         """
-        Pré-carrega dados de organizações (evita N+1 queries)
-
-        Faz uma única query bulk para buscar todas as organizações necessárias
-        e cacheia nos objetos usando _cached_organization.
-
-        IMPORTANTE: Este método força a avaliação do QuerySet e aplica cache.
-        Para manter a chain de QuerySet, chame este método por último.
-
-        Usage:
-            # Sem otimização (N+1 queries)
-            rascunhos = Rascunho.objects.all()
-            for r in rascunhos:
-                print(r.organization.name)  # Query individual para cada
-
-            # Com otimização (2 queries total)
-            rascunhos = Rascunho.objects.all().with_organization_data()
-            for r in rascunhos:
-                print(r.organization.name)  # Usa cache, sem queries extras
+        Pré-carrega dados de organizações (evita N+1)
 
         Returns:
-            Self (QuerySet) com _prefetch_done=True e objetos cacheados
+            Lista de objetos com _cached_organization
         """
-        # Marcar que o prefetch foi feito
-        self._prefetch_done = True
-
-        # Forçar avaliação do queryset
-        objects = list(self)
+        objects = list(self.all())
+        from .models import SharedOrganization
 
         if not objects:
-            return self
-
-        from .models import SharedOrganization
+            return objects
 
         # Coletar IDs únicos
         org_ids = set(obj.organization_id for obj in objects)
@@ -134,10 +112,7 @@ class OrganizationQuerySetMixin:
         for obj in objects:
             obj._cached_organization = organizations.get(obj.organization_id)
 
-        # Armazenar os objetos cacheados no queryset
-        self._result_cache = objects
-
-        return self
+        return objects
 
 
 class UserQuerySetMixin:
@@ -153,27 +128,14 @@ class UserQuerySetMixin:
 
     def with_user_data(self):
         """
-        Pré-carrega dados de usuários (evita N+1 queries)
-
-        Usage:
-            # Com otimização (2 queries total)
-            rascunhos = Rascunho.objects.all().with_user_data()
-            for r in rascunhos:
-                print(r.user.email)  # Usa cache, sem queries extras
-
-        Returns:
-            Self (QuerySet) com objetos cacheados
+        Pré-carrega dados de usuários (evita N+1)
         """
         from .models import User
 
-        # Marcar que o prefetch foi feito
-        self._prefetch_done = True
-
-        # Forçar avaliação do queryset
-        objects = list(self)
+        objects = list(self.all())
 
         if not objects:
-            return self
+            return objects
 
         user_ids = set(obj.user_id for obj in objects)
 
@@ -182,10 +144,7 @@ class UserQuerySetMixin:
         for obj in objects:
             obj._cached_user = users.get(obj.user_id)
 
-        # Armazenar os objetos cacheados no queryset
-        self._result_cache = objects
-
-        return self
+        return objects
 
 
 class OrganizationUserQuerySetMixin(OrganizationQuerySetMixin, UserQuerySetMixin):
@@ -193,39 +152,14 @@ class OrganizationUserQuerySetMixin(OrganizationQuerySetMixin, UserQuerySetMixin
 
     def with_auth_data(self):
         """
-        Pré-carrega dados de organizações E usuários (evita N+1 queries)
-
-        Faz apenas 3 queries no total, independente da quantidade de objetos:
-        1. Query dos objetos principais
-        2. Query bulk das organizações
-        3. Query bulk dos usuários
-
-        Usage:
-            # Sem otimização (1 + N + N queries)
-            rascunhos = Rascunho.objects.all()  # 1 query
-            for r in rascunhos:
-                print(r.organization.name)  # N queries
-                print(r.user.email)  # N queries
-
-            # Com otimização (3 queries total)
-            rascunhos = Rascunho.objects.all().with_auth_data()
-            for r in rascunhos:
-                print(r.organization.name)  # Cache
-                print(r.user.email)  # Cache
-
-        Returns:
-            Self (QuerySet) com objetos cacheados
+        Pré-carrega dados de organizações E usuários (evita N+1)
         """
         from .models import SharedOrganization, User
 
-        # Marcar que o prefetch foi feito
-        self._prefetch_done = True
-
-        # Forçar avaliação do queryset
-        objects = list(self)
+        objects = list(self.all())
 
         if not objects:
-            return self
+            return objects
 
         # Coletar IDs
         org_ids = set(obj.organization_id for obj in objects)
@@ -243,10 +177,7 @@ class OrganizationUserQuerySetMixin(OrganizationQuerySetMixin, UserQuerySetMixin
             obj._cached_organization = organizations.get(obj.organization_id)
             obj._cached_user = users.get(obj.user_id)
 
-        # Armazenar os objetos cacheados no queryset
-        self._result_cache = objects
-
-        return self
+        return objects
 
     def create_with_validation(self, organization_id, user_id, **kwargs):
         """

shared_auth/mixins.py

@@ -227,7 +227,6 @@ class LoggedOrganizationMixin(viewsets.ModelViewSet):
             return queryset.none()
 
         organization_id = self.get_organization_id()
-
         if hasattr(queryset.model, "organization_id"):
             return queryset.filter(organization_id=organization_id)
         elif hasattr(queryset.model, "organization"):

shared_auth/models.py

@@ -10,7 +10,7 @@ from django.db import models
 
 from .conf import MEMBER_TABLE, ORGANIZATION_TABLE, TOKEN_TABLE, USER_TABLE
 from .exceptions import OrganizationNotFoundError
-from .managers import SharedMemberManager, SharedOrganizationManager, SharedUserManager
+from .managers import SharedMemberManager, SharedOrganizationManager, UserManager
 from .storage_backend import Storage
 
 
@@ -155,7 +155,7 @@ class User(AbstractUser):
     updatedat = models.DateTimeField()
     deleted_at = models.DateTimeField(null=True, blank=True)
 
-    objects = SharedUserManager()
+    objects = UserManager()
 
     class Meta:
         managed = False

shared_auth/serializers.py

@@ -1,11 +1,43 @@
 """
 Serializers compartilhados para DRF
+
+Separação de responsabilidades:
+- CreateSerializerMixin: apenas para criação (seta IDs do request)
+- SerializerMixin: listagem com dados aninhados + criação (compatibilidade com código existente)
+
+Se quiser usar separadamente:
+- Use apenas *CreateSerializerMixin para create
+- Use apenas *SerializerMixin para listagem
+- Ou herde ambos se precisar
 """
 
 from rest_framework import serializers
 
 from .models import SharedOrganization, User
 
+# ==================== ORGANIZATION SERIALIZERS ====================
+
+
+class OrganizationCreateSerializerMixin(serializers.ModelSerializer):
+    """
+    Mixin APENAS para criação.
+    Automaticamente seta organization_id no create a partir do request context.
+
+    Usage:
+        class RascunhoCreateSerializer(OrganizationCreateSerializerMixin, serializers.ModelSerializer):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'conteudo']
+    """
+
+    def create(self, validated_data):
+        """Automatically set organization_id from request context"""
+        if self.context.get("request") and hasattr(
+            self.context["request"], "organization_id"
+        ):
+            validated_data["organization_id"] = self.context["request"].organization_id
+        return super().create(validated_data)
+
 
 class OrganizationSerializerMixin(serializers.ModelSerializer):
     """
@@ -30,6 +62,18 @@ class OrganizationSerializerMixin(serializers.ModelSerializer):
             class Meta:
                 model = Rascunho
                 fields = ['id', 'titulo', 'organization']
+
+        # Ou apenas para listagem (sem create):
+        class RascunhoListSerializer(OrganizationSerializerMixin, serializers.ModelSerializer):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'organization']
+
+        # Ou combinar com create:
+        class RascunhoFullSerializer(OrganizationSerializerMixin, OrganizationCreateSerializerMixin):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'organization']
     """
 
     organization = serializers.SerializerMethodField()
@@ -55,14 +99,6 @@ class OrganizationSerializerMixin(serializers.ModelSerializer):
         except Exception:
             return None
 
-    def create(self, validated_data):
-        """Automatically set organization_id from request context"""
-        if self.context.get("request") and hasattr(
-            self.context["request"], "organization_id"
-        ):
-            validated_data["organization_id"] = self.context["request"].organization_id
-        return super().create(validated_data)
-
 
 class OrganizationSerializer(serializers.ModelSerializer):
     class Meta:
@@ -70,21 +106,26 @@ class OrganizationSerializer(serializers.ModelSerializer):
         fields = "__all__"
 
 
-class UserSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = User
-        fields = [
-            "id",
-            "username",
-            "first_name",
-            "last_name",
-            "email",
-            "is_active",
-            "is_staff",
-            "is_superuser",
-            "date_joined",
-            "last_login",
-        ]
+# ==================== USER SERIALIZERS ====================
+
+
+class UserCreateSerializerMixin(serializers.ModelSerializer):
+    """
+    Mixin APENAS para criação.
+    Automaticamente seta user_id no create a partir do request context.
+
+    Usage:
+        class RascunhoCreateSerializer(UserCreateSerializerMixin, serializers.ModelSerializer):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'conteudo']
+    """
+
+    def create(self, validated_data):
+        """Automatically set user_id from request context"""
+        if self.context.get("request") and hasattr(self.context["request"], "user"):
+            validated_data["user_id"] = self.context["request"].user.id
+        return super().create(validated_data)
 
 
 class UserSerializerMixin(serializers.ModelSerializer):
@@ -110,6 +151,18 @@ class UserSerializerMixin(serializers.ModelSerializer):
             class Meta:
                 model = Rascunho
                 fields = ['id', 'titulo', 'user']
+
+        # Ou apenas para listagem (sem create):
+        class RascunhoListSerializer(UserSerializerMixin, serializers.ModelSerializer):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'user']
+
+        # Ou combinar com create:
+        class RascunhoFullSerializer(UserSerializerMixin, UserCreateSerializerMixin):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'user']
     """
 
     user = serializers.SerializerMethodField()
@@ -131,10 +184,47 @@ class UserSerializerMixin(serializers.ModelSerializer):
         except Exception:
             return None
 
+
+class UserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User
+        fields = [
+            "id",
+            "username",
+            "first_name",
+            "last_name",
+            "email",
+            "is_active",
+            "is_staff",
+            "is_superuser",
+            "date_joined",
+            "last_login",
+        ]
+
+
+# ==================== COMBINED ORGANIZATION + USER SERIALIZERS ====================
+
+
+class OrganizationUserCreateSerializerMixin(serializers.ModelSerializer):
+    """
+    Mixin APENAS para criação com organization + user.
+    Automaticamente seta organization_id e user_id no create a partir do request context.
+
+    Usage:
+        class RascunhoCreateSerializer(OrganizationUserCreateSerializerMixin, serializers.ModelSerializer):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'conteudo']
+    """
+
     def create(self, validated_data):
-        """Automatically set user_id from request context"""
-        if self.context.get("request") and hasattr(self.context["request"], "user"):
-            validated_data["user_id"] = self.context["request"].user.id
+        """Automatically set both organization_id and user_id from request context"""
+        if self.context.get("request"):
+            request = self.context["request"]
+            if hasattr(request, "organization_id"):
+                validated_data["organization_id"] = request.organization_id
+            if hasattr(request, "user"):
+                validated_data["user_id"] = request.user.id
         return super().create(validated_data)
 
 
@@ -164,24 +254,43 @@ class OrganizationUserSerializerMixin(OrganizationSerializerMixin, UserSerialize
             class Meta:
                 model = Rascunho
                 fields = ['id', 'titulo', 'conteudo', 'organization', 'user']
+
+        # Ou apenas para listagem (sem create):
+        class RascunhoListSerializer(OrganizationUserSerializerMixin, serializers.ModelSerializer):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'organization', 'user']
+
+        # Ou combinar com create:
+        class RascunhoFullSerializer(OrganizationUserSerializerMixin, OrganizationUserCreateSerializerMixin):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'organization', 'user']
     """
 
-    def create(self, validated_data):
-        """Automatically set both organization_id and user_id from request context"""
-        if self.context.get("request"):
-            request = self.context["request"]
-            if hasattr(request, "organization_id"):
-                validated_data["organization_id"] = request.organization_id
-            if hasattr(request, "user"):
-                validated_data["user_id"] = request.user.id
-        return super(UserSerializerMixin, self).create(validated_data)
+    pass
+
+
+# ==================== SIMPLIFIED VERSIONS ====================
 
 
-# Versões simplificadas (opcional)
 class OrganizationSimpleSerializerMixin(serializers.ModelSerializer):
     """
     Versão simplificada que retorna apenas campos essenciais da organização
     e automaticamente seta organization_id no create a partir do request context.
+
+    Usage:
+        # Para listagem:
+        class RascunhoListSerializer(OrganizationSimpleSerializerMixin, serializers.ModelSerializer):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'organization']
+
+        # Para criar com organization:
+        class RascunhoCreateSerializer(OrganizationSimpleSerializerMixin, OrganizationCreateSerializerMixin):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'organization']
     """
 
     organization = serializers.SerializerMethodField()
@@ -194,22 +303,27 @@ class OrganizationSimpleSerializerMixin(serializers.ModelSerializer):
                 "name": org.name,
                 "cnpj": org.cnpj,
             }
-        except:
+        except Exception:
             return None
 
-    def create(self, validated_data):
-        """Automatically set organization_id from request context"""
-        if self.context.get("request") and hasattr(
-            self.context["request"], "organization_id"
-        ):
-            validated_data["organization_id"] = self.context["request"].organization_id
-        return super().create(validated_data)
-
 
 class UserSimpleSerializerMixin(serializers.ModelSerializer):
     """
     Versão simplificada que retorna apenas campos essenciais do usuário
     e automaticamente seta user_id no create a partir do request context.
+
+    Usage:
+        # Para listagem:
+        class RascunhoListSerializer(UserSimpleSerializerMixin, serializers.ModelSerializer):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'user']
+
+        # Para criar com user:
+        class RascunhoCreateSerializer(UserSimpleSerializerMixin, UserCreateSerializerMixin):
+            class Meta:
+                model = Rascunho
+                fields = ['id', 'titulo', 'user']
     """
 
     user = serializers.SerializerMethodField()
@@ -222,11 +336,5 @@ class UserSimpleSerializerMixin(serializers.ModelSerializer):
                 "email": user.email,
                 "full_name": user.get_full_name(),
             }
-        except:
+        except Exception:
             return None
-
-    def create(self, validated_data):
-        """Automatically set user_id from request context"""
-        if self.context.get("request") and hasattr(self.context["request"], "user"):
-            validated_data["user_id"] = self.context["request"].user.id
-        return super().create(validated_data)