Improve auth models

services/auth/app/models/users.py

@@ -1,4 +1,3 @@
-# ================================================================
 # services/auth/app/models/users.py - FIXED VERSION
 # ================================================================
 """
@@ -7,6 +6,7 @@ User models for authentication service - FIXED
 
 from sqlalchemy import Column, String, Boolean, DateTime, Text
 from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.orm import relationship # Import relationship
 from datetime import datetime, timezone
 import uuid
 
@@ -22,8 +22,7 @@ class User(Base):
     full_name = Column(String(255), nullable=False)
     is_active = Column(Boolean, default=True)
     is_verified = Column(Boolean, default=False)
-    tenant_id = Column(UUID(as_uuid=True), nullable=True)
-    role = Column(String(50), default="user")  # user, admin, super_admin
+    # Removed tenant_id and role from User model
     
     # FIXED: Use timezone-aware datetime for all datetime fields
     created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
@@ -34,6 +33,11 @@ class User(Base):
     phone = Column(String(20))
     language = Column(String(10), default="es")
     timezone = Column(String(50), default="Europe/Madrid")
+
+    # Relationships
+    # Define the many-to-many relationship through TenantMember
+    tenant_memberships = relationship("TenantMember", back_populates="user", cascade="all, delete-orphan") # Changed back_populates to avoid conflict
+    tenants = relationship("Tenant", secondary="tenant_members", back_populates="users")
     
     def __repr__(self):
         return f"<User(id={self.id}, email={self.email})>"
@@ -46,8 +50,7 @@ class User(Base):
             "full_name": self.full_name,
             "is_active": self.is_active,
             "is_verified": self.is_verified,
-            "tenant_id": str(self.tenant_id) if self.tenant_id else None,
-            "role": self.role,
+            # Removed tenant_id and role from to_dict
             "created_at": self.created_at.isoformat() if self.created_at else None,
             "last_login": self.last_login.isoformat() if self.last_login else None,
             "phone": self.phone,