71 lines
2.9 KiB
Python
71 lines
2.9 KiB
Python
# services/auth/app/models/users.py - FIXED VERSION
|
|
"""
|
|
User models for authentication service - FIXED
|
|
Removed tenant relationships to eliminate cross-service dependencies
|
|
"""
|
|
|
|
from sqlalchemy import Column, String, Boolean, DateTime, Text
|
|
from sqlalchemy.dialects.postgresql import UUID
|
|
from datetime import datetime, timezone
|
|
import uuid
|
|
|
|
from shared.database.base import Base
|
|
|
|
class User(Base):
|
|
"""User model - FIXED without cross-service relationships"""
|
|
__tablename__ = "users"
|
|
|
|
id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
|
email = Column(String(255), unique=True, index=True, nullable=False)
|
|
hashed_password = Column(String(255), nullable=False)
|
|
full_name = Column(String(255), nullable=False)
|
|
is_active = Column(Boolean, default=True)
|
|
is_verified = Column(Boolean, default=False)
|
|
|
|
# Timezone-aware datetime fields
|
|
created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
|
|
updated_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
|
|
last_login = Column(DateTime(timezone=True))
|
|
|
|
# Profile fields
|
|
phone = Column(String(20))
|
|
language = Column(String(10), default="es")
|
|
timezone = Column(String(50), default="Europe/Madrid")
|
|
|
|
# REMOVED: All tenant relationships - these are handled by tenant service
|
|
# No tenant_memberships, tenants relationships
|
|
|
|
def __repr__(self):
|
|
return f"<User(id={self.id}, email={self.email})>"
|
|
|
|
def to_dict(self):
|
|
"""Convert user to dictionary"""
|
|
return {
|
|
"id": str(self.id),
|
|
"email": self.email,
|
|
"full_name": self.full_name,
|
|
"is_active": self.is_active,
|
|
"is_verified": self.is_verified,
|
|
"phone": self.phone,
|
|
"language": self.language,
|
|
"timezone": self.timezone,
|
|
"created_at": self.created_at.isoformat() if self.created_at else None,
|
|
"updated_at": self.updated_at.isoformat() if self.updated_at else None,
|
|
"last_login": self.last_login.isoformat() if self.last_login else None
|
|
}
|
|
|
|
class RefreshToken(Base):
|
|
"""Refresh token model for JWT authentication"""
|
|
__tablename__ = "refresh_tokens"
|
|
|
|
id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
|
user_id = Column(UUID(as_uuid=True), nullable=False, index=True) # No FK - cross-service
|
|
token = Column(Text, unique=True, nullable=False) # CHANGED FROM String(255) TO Text
|
|
expires_at = Column(DateTime(timezone=True), nullable=False)
|
|
is_revoked = Column(Boolean, default=False)
|
|
|
|
created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
|
|
revoked_at = Column(DateTime(timezone=True))
|
|
|
|
def __repr__(self):
|
|
return f"<RefreshToken(user_id={self.user_id}, expires_at={self.expires_at})>" |