- Rearranged imports in multiple files for consistency and clarity. - Updated logging middleware to exclude specific paths from logging. - Enhanced security module by cleaning up token handling and improving tenant validation. - Added tenant and company scoped mixins for better database model management. - Implemented generic CRUD routes for tenant-scoped resources. - Improved error handling and response management in API routes. - Cleaned up login and logout processes to ensure proper session management. - Introduced mechanisms to clear local storage and cookies on tenant change. - Enhanced company store to detect tenant changes and clear data accordingly. - Added new DTO mixins for currency and value affect flags.
50 lines
1.6 KiB
Python
50 lines
1.6 KiB
Python
"""
|
|
Modelo de relación entre usuarios (Keycloak) y tenants
|
|
"""
|
|
|
|
from typing import TYPE_CHECKING, Optional
|
|
|
|
from api.v1.common.base_models import TenantScopedMixin, TimestampMixin
|
|
from core.database import Base
|
|
from sqlalchemy import Boolean, ForeignKeyConstraint, String, UniqueConstraint
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
|
|
if TYPE_CHECKING:
|
|
from api.v1.modules.a76.tenants.models import Tenant
|
|
|
|
|
|
class UserTenant(Base, TenantScopedMixin, TimestampMixin):
|
|
"""
|
|
Relación muchos-a-muchos entre usuarios de Keycloak y tenants
|
|
|
|
Un usuario puede pertenecer a múltiples tenants
|
|
Un tenant puede tener múltiples usuarios
|
|
"""
|
|
|
|
__tablename__ = "user_tenants"
|
|
__table_args__ = (
|
|
ForeignKeyConstraint(["company_id"], ["a76.company.id"]),
|
|
ForeignKeyConstraint(["tenant_id"], ["a76.tenants.id"]),
|
|
UniqueConstraint(
|
|
"keycloak_user_id", "tenant_id", "company_id", name="uq_user_tenant"
|
|
),
|
|
{"schema": "a76", "extend_existing": True},
|
|
)
|
|
|
|
# Primary Key
|
|
id: Mapped[int] = mapped_column(primary_key=True, index=True)
|
|
|
|
# ID del usuario en Keycloak (UUID string)
|
|
keycloak_user_id: Mapped[str] = mapped_column(
|
|
String(255), nullable=False, index=True
|
|
)
|
|
|
|
# Estado de la relación
|
|
is_active: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False)
|
|
|
|
# Información adicional - Rol del usuario en este tenant (opcional)
|
|
role: Mapped[Optional[str]] = mapped_column(String(50), nullable=True)
|
|
|
|
# Relación con Tenant
|
|
tenant: Mapped["Tenant"] = relationship("Tenant", back_populates="user_relations")
|