feat: enhance organization management; add member registration and validation, update user registration flow, and improve enum handling
This commit is contained in:
+7
-3
@@ -9,7 +9,7 @@ from pydantic import BaseModel, ConfigDict
|
||||
from sqlalchemy import DateTime, Enum as SqlEnum, ForeignKey, Integer, Numeric, String, func
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
|
||||
from app.models.base import Base
|
||||
from app.models.base import Base, enum_values
|
||||
|
||||
|
||||
class DealStatus(StrEnum):
|
||||
@@ -39,10 +39,14 @@ class Deal(Base):
|
||||
amount: Mapped[Decimal | None] = mapped_column(Numeric(12, 2), nullable=True)
|
||||
currency: Mapped[str | None] = mapped_column(String(8), nullable=True)
|
||||
status: Mapped[DealStatus] = mapped_column(
|
||||
SqlEnum(DealStatus, name="deal_status"), nullable=False, default=DealStatus.NEW
|
||||
SqlEnum(DealStatus, name="deal_status", values_callable=enum_values),
|
||||
nullable=False,
|
||||
default=DealStatus.NEW,
|
||||
)
|
||||
stage: Mapped[DealStage] = mapped_column(
|
||||
SqlEnum(DealStage, name="deal_stage"), nullable=False, default=DealStage.QUALIFICATION
|
||||
SqlEnum(DealStage, name="deal_stage", values_callable=enum_values),
|
||||
nullable=False,
|
||||
default=DealStage.QUALIFICATION,
|
||||
)
|
||||
created_at: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True), server_default=func.now(), nullable=False
|
||||
|
||||
Reference in New Issue
Block a user