Update auth/models.py

auth/models.py

@@ -1,92 +1,47 @@
-"""
-models.py
-Enterprise ORM Models
-Basyx Whisper V10.1
-"""
-
-from datetime import datetime
 import uuid
-
-from sqlalchemy import (
-    Column,
-    String,
-    DateTime,
-    Boolean,
-    Index,
-    func,
-)
+from sqlalchemy import Column, String, Boolean, DateTime, func, Index
 from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.orm import validates
-
-from database import Base
 
+from auth.database import Base
 
-# ==========================================================
-# USER MODEL
-# ==========================================================
 
+# =========================================================
+# USERS TABLE (CORE AUTH ENTITY)
+# =========================================================
 class User(Base):
-    """
-    Enterprise-grade User table
-    """
-
     __tablename__ = "users"
 
-    # ------------------------------------------------------
-    # Primary Identifier
-    # ------------------------------------------------------
-
+    # -----------------------------
+    # Primary Key (UUID for Supabase compatibility)
+    # -----------------------------
     id = Column(
         UUID(as_uuid=True),
         primary_key=True,
         default=uuid.uuid4,
-        unique=True,
         nullable=False,
     )
 
-    # ------------------------------------------------------
+    # -----------------------------
     # Identity Fields
-    # ------------------------------------------------------
+    # -----------------------------
+    email = Column(String(255), unique=True, nullable=False, index=True)
+    username = Column(String(100), unique=True, nullable=True, index=True)
 
-    email = Column(
-        String(255),
-        unique=True,
-        nullable=False,
-        index=True,
-    )
+    # -----------------------------
+    # Security Fields
+    # NOTE: stores hashed password only (never plaintext)
+    # -----------------------------
+    hashed_password = Column(String(255), nullable=False)
 
-    username = Column(
-        String(50),
-        unique=True,
-        nullable=False,
-        index=True,
-    )
-
-    password_hash = Column(
-        String(255),
-        nullable=False,
-    )
-
-    # ------------------------------------------------------
+    # -----------------------------
     # Account State
-    # ------------------------------------------------------
-
-    is_active = Column(
-        Boolean,
-        default=True,
-        nullable=False,
-    )
-
-    is_verified = Column(
-        Boolean,
-        default=False,
-        nullable=False,
-    )
+    # -----------------------------
+    is_active = Column(Boolean, default=True, nullable=False)
+    is_verified = Column(Boolean, default=False, nullable=False)
 
-    # ------------------------------------------------------
+    # -----------------------------
     # Audit Fields
-    # ------------------------------------------------------
-
+    # -----------------------------
     created_at = Column(
         DateTime(timezone=True),
         server_default=func.now(),
@@ -100,56 +55,42 @@ class User(Base):
         nullable=False,
     )
 
-    # ------------------------------------------------------
-    # VALIDATION LAYER
-    # ------------------------------------------------------
-
-    @validates("email")
-    def validate_email(self, key, value):
-        value = value.strip().lower()
-
-        if "@" not in value:
-            raise ValueError("Invalid email address")
-
-        if len(value) > 255:
-            raise ValueError("Email too long")
-
-        return value
-
-    @validates("username")
-    def validate_username(self, key, value):
-        value = value.strip()
 
-        if len(value) < 3:
-            raise ValueError("Username must be at least 3 characters")
+# =========================================================
+# OPTIONAL: API KEY TABLE (FOR AUTOMATION / N8N / WORKFLOWS)
+# =========================================================
+class ApiKey(Base):
+    __tablename__ = "api_keys"
 
-        if len(value) > 50:
-            raise ValueError("Username too long")
+    id = Column(
+        UUID(as_uuid=True),
+        primary_key=True,
+        default=uuid.uuid4,
+        nullable=False,
+    )
 
-        return value
+    user_id = Column(
+        UUID(as_uuid=True),
+        nullable=False,
+        index=True,
+    )
 
-    # ------------------------------------------------------
-    # SERIALIZATION SAFE OUTPUT
-    # ------------------------------------------------------
+    key_hash = Column(String(255), nullable=False, unique=True)
 
-    def to_dict(self):
-        """
-        Safe public serialization
-        NEVER expose password_hash
-        """
+    name = Column(String(120), nullable=True)
 
-        return {
-            "id": str(self.id),
-            "email": self.email,
-            "username": self.username,
-            "createdAt": self.created_at.isoformat(),
-        }
+    is_active = Column(Boolean, default=True, nullable=False)
 
+    created_at = Column(
+        DateTime(timezone=True),
+        server_default=func.now(),
+        nullable=False,
+    )
 
-# ==========================================================
-# ENTERPRISE INDEX STRATEGY
-# ==========================================================
 
-Index("idx_users_email_unique", User.email, unique=True)
-Index("idx_users_username_unique", User.username, unique=True)
-Index("idx_users_created_at", User.created_at)
+# =========================================================
+# INDEXES (PERFORMANCE OPTIMIZATION)
+# =========================================================
+Index("idx_users_email", User.email)
+Index("idx_users_username", User.username)
+Index("idx_api_keys_user_id", ApiKey.user_id)