Improve auth models

services/tenant/app/models/tenants.py

@@ -39,25 +39,30 @@ class Tenant(Base):
     model_trained = Column(Boolean, default=False)
     last_training_date = Column(DateTime)
     
-    # Ownership
+    # Ownership (The user who created the tenant, still a direct link)
     owner_id = Column(UUID(as_uuid=True), nullable=False, index=True)
     
     # Timestamps
     created_at = Column(DateTime, default=datetime.utcnow)
     updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
+
+    # Relationships
+    # Define the many-to-many relationship through TenantMember
+    members = relationship("TenantMember", back_populates="tenant", cascade="all, delete-orphan")
+    users = relationship("User", secondary="tenant_members", back_populates="tenants")
     
     def __repr__(self):
         return f"<Tenant(id={self.id}, name={self.name})>"
 
 class TenantMember(Base):
-    """Tenant membership model for team access"""
+    """Tenant membership model for team access - Association Table"""
     __tablename__ = "tenant_members"
     
     id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     tenant_id = Column(UUID(as_uuid=True), ForeignKey("tenants.id", ondelete="CASCADE"), nullable=False)
-    user_id = Column(UUID(as_uuid=True), nullable=False, index=True)
+    user_id = Column(UUID(as_uuid=True), ForeignKey("users.id", ondelete="CASCADE"), nullable=False, index=True) # Added ForeignKey to users.id
     
-    # Role and permissions
+    # Role and permissions specific to this tenant
     role = Column(String(50), default="member")  # owner, admin, member, viewer
     permissions = Column(Text)  # JSON string of permissions
     
@@ -68,6 +73,10 @@ class TenantMember(Base):
     joined_at = Column(DateTime)
     
     created_at = Column(DateTime, default=datetime.utcnow)
+
+    # Relationships to access the associated Tenant and User objects
+    tenant = relationship("Tenant", back_populates="members")
+    user = relationship("User", back_populates="tenant_memberships") # Changed back_populates to avoid conflict
     
     def __repr__(self):
         return f"<TenantMember(tenant_id={self.tenant_id}, user_id={self.user_id}, role={self.role})>"