wip loan update

2025-10-03 11:55:30 +02:00
parent 5e7d801075
commit 0ca660f268
9 changed files with 1100 additions and 275 deletions
--- a/backend/trading_journal/models.py
+++ b/backend/trading_journal/models.py
@@ -69,33 +69,51 @@ class FundingSource(str, Enum):

 class Trades(SQLModel, table=True):
    __tablename__ = "trades"  # type: ignore[attr-defined]
-    __table_args__ = (UniqueConstraint("user_id", "friendly_name", name="uq_trades_user_friendly_name"),)
+    __table_args__ = (
+        UniqueConstraint(
+            "user_id", "friendly_name", name="uq_trades_user_friendly_name"
+        ),
+    )

    id: int | None = Field(default=None, primary_key=True)
    user_id: int = Field(foreign_key="users.id", nullable=False, index=True)
    # allow null while user may omit friendly_name; uniqueness enforced per-user by constraint
-    friendly_name: str | None = Field(default=None, sa_column=Column(Text, nullable=True))
+    friendly_name: str | None = Field(
+        default=None, sa_column=Column(Text, nullable=True)
+    )
    symbol: str = Field(sa_column=Column(Text, nullable=False))
    exchange_id: int = Field(foreign_key="exchanges.id", nullable=False, index=True)
    exchange: "Exchanges" = Relationship(back_populates="trades")
-    underlying_currency: UnderlyingCurrency = Field(sa_column=Column(Text, nullable=False))
+    underlying_currency: UnderlyingCurrency = Field(
+        sa_column=Column(Text, nullable=False)
+    )
    trade_type: TradeType = Field(sa_column=Column(Text, nullable=False))
    trade_strategy: TradeStrategy = Field(sa_column=Column(Text, nullable=False))
    trade_date: date = Field(sa_column=Column(Date, nullable=False))
-    trade_time_utc: datetime = Field(sa_column=Column(DateTime(timezone=True), nullable=False))
+    trade_time_utc: datetime = Field(
+        sa_column=Column(DateTime(timezone=True), nullable=False)
+    )
    expiry_date: date | None = Field(default=None, nullable=True)
    strike_price_cents: int | None = Field(default=None, nullable=True)
    quantity: int = Field(sa_column=Column(Integer, nullable=False))
-    quantity_multiplier: int = Field(sa_column=Column(Integer, nullable=False), default=1)
+    quantity_multiplier: int = Field(
+        sa_column=Column(Integer, nullable=False), default=1
+    )
    price_cents: int = Field(sa_column=Column(Integer, nullable=False))
    gross_cash_flow_cents: int = Field(sa_column=Column(Integer, nullable=False))
    commission_cents: int = Field(sa_column=Column(Integer, nullable=False))
    net_cash_flow_cents: int = Field(sa_column=Column(Integer, nullable=False))
    is_invalidated: bool = Field(default=False, nullable=False)
-    invalidated_at: datetime | None = Field(default=None, sa_column=Column(DateTime(timezone=True), nullable=True))
-    replaced_by_trade_id: int | None = Field(default=None, foreign_key="trades.id", nullable=True)
+    invalidated_at: datetime | None = Field(
+        default=None, sa_column=Column(DateTime(timezone=True), nullable=True)
+    )
+    replaced_by_trade_id: int | None = Field(
+        default=None, foreign_key="trades.id", nullable=True
+    )
    notes: str | None = Field(default=None, sa_column=Column(Text, nullable=True))
-    cycle_id: int | None = Field(default=None, foreign_key="cycles.id", nullable=True, index=True)
+    cycle_id: int | None = Field(
+        default=None, foreign_key="cycles.id", nullable=True, index=True
+    )

    cycle: "Cycles" = Relationship(back_populates="trades")

@@ -107,15 +125,23 @@ class Trades(SQLModel, table=True):

 class Cycles(SQLModel, table=True):
    __tablename__ = "cycles"  # type: ignore[attr-defined]
-    __table_args__ = (UniqueConstraint("user_id", "friendly_name", name="uq_cycles_user_friendly_name"),)
+    __table_args__ = (
+        UniqueConstraint(
+            "user_id", "friendly_name", name="uq_cycles_user_friendly_name"
+        ),
+    )

    id: int | None = Field(default=None, primary_key=True)
    user_id: int = Field(foreign_key="users.id", nullable=False, index=True)
-    friendly_name: str | None = Field(default=None, sa_column=Column(Text, nullable=True))
+    friendly_name: str | None = Field(
+        default=None, sa_column=Column(Text, nullable=True)
+    )
    symbol: str = Field(sa_column=Column(Text, nullable=False))
    exchange_id: int = Field(foreign_key="exchanges.id", nullable=False, index=True)
    exchange: "Exchanges" = Relationship(back_populates="cycles")
-    underlying_currency: UnderlyingCurrency = Field(sa_column=Column(Text, nullable=False))
+    underlying_currency: UnderlyingCurrency = Field(
+        sa_column=Column(Text, nullable=False)
+    )
    status: CycleStatus = Field(sa_column=Column(Text, nullable=False))
    funding_source: FundingSource = Field(sa_column=Column(Text, nullable=True))
    capital_exposure_cents: int | None = Field(default=None, nullable=True)
@@ -127,23 +153,51 @@ class Cycles(SQLModel, table=True):
    loan_amount_cents: int | None = Field(default=None, nullable=True)
    loan_interest_rate_tenth_bps: int | None = Field(default=None, nullable=True)

-    latest_interest_accrued_date: date | None = Field(default=None, sa_column=Column(Date, nullable=True))
-    total_accrued_amount_cents: int = Field(default=0, sa_column=Column(Integer, nullable=False))
+    latest_interest_accrued_date: date | None = Field(
+        default=None, sa_column=Column(Date, nullable=True)
+    )
+    total_accrued_amount_cents: int = Field(
+        default=0, sa_column=Column(Integer, nullable=False)
+    )

-    loan_change_events: list["CycleLoanChangeEvents"] = Relationship(back_populates="cycle")
+    loan_change_events: list["CycleLoanChangeEvents"] = Relationship(
+        back_populates="cycle"
+    )
    daily_accruals: list["CycleDailyAccrual"] = Relationship(back_populates="cycle")


 class CycleLoanChangeEvents(SQLModel, table=True):
    __tablename__ = "cycle_loan_change_events"  # type: ignore[attr-defined]
+    __table_args__ = (
+        UniqueConstraint(
+            "cycle_id", "effective_date", name="uq_cycle_loan_change_cycle_date"
+        ),
+    )
+
    id: int | None = Field(default=None, primary_key=True)
-    cycle_id: int = Field(sa_column=Column(Integer, ForeignKey("cycles.id", ondelete="CASCADE"), nullable=False, index=True))
+    cycle_id: int = Field(
+        sa_column=Column(
+            Integer,
+            ForeignKey("cycles.id", ondelete="CASCADE"),
+            nullable=False,
+            index=True,
+        )
+    )
    effective_date: date = Field(sa_column=Column(Date, nullable=False))
-    loan_amount_cents: int | None = Field(default=None, sa_column=Column(Integer, nullable=True))
-    loan_interest_rate_tenth_bps: int | None = Field(default=None, sa_column=Column(Integer, nullable=True))
-    related_trade_id: int | None = Field(default=None, sa_column=Column(Integer, ForeignKey("trades.id"), nullable=True, unique=True))
+    loan_amount_cents: int | None = Field(
+        default=None, sa_column=Column(Integer, nullable=True)
+    )
+    loan_interest_rate_tenth_bps: int | None = Field(
+        default=None, sa_column=Column(Integer, nullable=True)
+    )
+    related_trade_id: int | None = Field(
+        default=None,
+        sa_column=Column(Integer, ForeignKey("trades.id"), nullable=True, unique=True),
+    )  # Not used for now.
    notes: str | None = Field(default=None, sa_column=Column(Text, nullable=True))
-    created_at: datetime = Field(sa_column=Column(DateTime(timezone=True), nullable=False))
+    created_at: datetime = Field(
+        sa_column=Column(DateTime(timezone=True), nullable=False)
+    )

    cycle: "Cycles" = Relationship(back_populates="loan_change_events")
    trade: Optional["Trades"] = Relationship(back_populates="related_loan_change_event")
@@ -151,20 +205,35 @@ class CycleLoanChangeEvents(SQLModel, table=True):

 class CycleDailyAccrual(SQLModel, table=True):
    __tablename__ = "cycle_daily_accrual"  # type: ignore[attr-defined]
-    __table_args__ = (UniqueConstraint("cycle_id", "accrual_date", name="uq_cycle_daily_accruals_cycle_date"),)
+    __table_args__ = (
+        UniqueConstraint(
+            "cycle_id", "accrual_date", name="uq_cycle_daily_accruals_cycle_date"
+        ),
+    )

    id: int | None = Field(default=None, primary_key=True)
-    cycle_id: int = Field(sa_column=Column(Integer, ForeignKey("cycles.id", ondelete="CASCADE"), nullable=False, index=True))
+    cycle_id: int = Field(
+        sa_column=Column(
+            Integer,
+            ForeignKey("cycles.id", ondelete="CASCADE"),
+            nullable=False,
+            index=True,
+        )
+    )
    accrual_date: date = Field(sa_column=Column(Date, nullable=False))
    accrual_amount_cents: int = Field(sa_column=Column(Integer, nullable=False))
-    created_at: datetime = Field(sa_column=Column(DateTime(timezone=True), nullable=False))
+    created_at: datetime = Field(
+        sa_column=Column(DateTime(timezone=True), nullable=False)
+    )

    cycle: "Cycles" = Relationship(back_populates="daily_accruals")


 class Exchanges(SQLModel, table=True):
    __tablename__ = "exchanges"  # type: ignore[attr-defined]
-    __table_args__ = (UniqueConstraint("user_id", "name", name="uq_exchanges_user_name"),)
+    __table_args__ = (
+        UniqueConstraint("user_id", "name", name="uq_exchanges_user_name"),
+    )
    id: int | None = Field(default=None, primary_key=True)
    user_id: int = Field(foreign_key="users.id", nullable=False, index=True)
    name: str = Field(sa_column=Column(Text, nullable=False))
@@ -190,10 +259,18 @@ class Sessions(SQLModel, table=True):
    id: int | None = Field(default=None, primary_key=True)
    user_id: int = Field(foreign_key="users.id", nullable=False, index=True)
    session_token_hash: str = Field(sa_column=Column(Text, nullable=False, unique=True))
-    created_at: datetime = Field(sa_column=Column(DateTime(timezone=True), nullable=False))
-    expires_at: datetime = Field(sa_column=Column(DateTime(timezone=True), nullable=False, index=True))
-    last_seen_at: datetime | None = Field(sa_column=Column(DateTime(timezone=True), nullable=True))
-    last_used_ip: str | None = Field(default=None, sa_column=Column(Text, nullable=True))
+    created_at: datetime = Field(
+        sa_column=Column(DateTime(timezone=True), nullable=False)
+    )
+    expires_at: datetime = Field(
+        sa_column=Column(DateTime(timezone=True), nullable=False, index=True)
+    )
+    last_seen_at: datetime | None = Field(
+        sa_column=Column(DateTime(timezone=True), nullable=True)
+    )
+    last_used_ip: str | None = Field(
+        default=None, sa_column=Column(Text, nullable=True)
+    )
    user_agent: str | None = Field(default=None, sa_column=Column(Text, nullable=True))
    device_name: str | None = Field(default=None, sa_column=Column(Text, nullable=True))
    user: "Users" = Relationship(back_populates="sessions")