forked from cartsnitch/api
Stockboy Steve
a1d53f8e47
Better-Auth generates nanoid-style text IDs (e.g. pGud2ln2WAFHC0KYjBVKR4Rc7mM8OcTI), but the users table used PostgreSQL uuid type, causing registration failures: ERROR: invalid input syntax for type uuid: "pGud2ln2WAFHC0KYjBVKR4Rc7mM8OcTI" Changes: - User.id: removed UUIDPrimaryKeyMixin, use explicit text PK - UserStoreAccount.user_id: Mapped[uuid.UUID] -> Mapped[str] - Purchase.user_id: Mapped[uuid.UUID] -> Mapped[str] - UserResponse schema: id field from UUID -> str - New Alembic migration 004_fix_user_id_text: drops FKs, alters column types, re-adds FKs (using id::text cast) Co-Authored-By: Paperclip <noreply@paperclip.ing>
52 lines
2.1 KiB
Python
52 lines
2.1 KiB
Python
"""User and UserStoreAccount models."""
|
|
|
|
import uuid
|
|
from datetime import datetime
|
|
from typing import TYPE_CHECKING
|
|
|
|
from sqlalchemy import DateTime, ForeignKey, String, Text, UniqueConstraint
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
|
|
from cartsnitch_api.constants import AccountStatus
|
|
from cartsnitch_api.models.base import Base, TimestampMixin, UUIDPrimaryKeyMixin
|
|
from cartsnitch_api.types import EncryptedJSON
|
|
|
|
if TYPE_CHECKING:
|
|
from cartsnitch_api.models.purchase import Purchase
|
|
from cartsnitch_api.models.store import Store
|
|
|
|
|
|
class User(TimestampMixin, Base):
|
|
"""Application user."""
|
|
|
|
__tablename__ = "users"
|
|
|
|
id: Mapped[str] = mapped_column(Text, primary_key=True)
|
|
email: Mapped[str] = mapped_column(String(255), nullable=False, unique=True)
|
|
hashed_password: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
display_name: Mapped[str | None] = mapped_column(String(100))
|
|
|
|
# Relationships
|
|
store_accounts: Mapped[list["UserStoreAccount"]] = relationship(back_populates="user")
|
|
purchases: Mapped[list["Purchase"]] = relationship(back_populates="user")
|
|
|
|
|
|
class UserStoreAccount(UUIDPrimaryKeyMixin, TimestampMixin, Base):
|
|
"""Link between a user and their retailer account credentials."""
|
|
|
|
__tablename__ = "user_store_accounts"
|
|
__table_args__ = (UniqueConstraint("user_id", "store_id", name="uq_user_store_account"),)
|
|
|
|
user_id: Mapped[str] = mapped_column(ForeignKey("users.id"), nullable=False)
|
|
store_id: Mapped[uuid.UUID] = mapped_column(ForeignKey("stores.id"), nullable=False)
|
|
session_data: Mapped[dict | None] = mapped_column(EncryptedJSON)
|
|
session_expires_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
|
last_sync_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
|
status: Mapped[AccountStatus] = mapped_column(
|
|
String(20), nullable=False, default=AccountStatus.ACTIVE
|
|
)
|
|
|
|
# Relationships
|
|
user: Mapped["User"] = relationship(back_populates="store_accounts")
|
|
store: Mapped["Store"] = relationship(back_populates="user_accounts")
|