service with accrual interest and loan update tested

backend/trading_journal/crud.py

@@ -52,9 +52,7 @@ def _data_to_dict(data: AnyModel) -> dict[str, AnyModel]:
 
 
 # Trades
-def create_trade(
-    session: Session, trade_data: Mapping[str, Any] | BaseModel
-) -> models.Trades:
+def create_trade(session: Session, trade_data: Mapping[str, Any] | BaseModel) -> models.Trades:
     data = _data_to_dict(trade_data)
     allowed = _allowed_columns(models.Trades)
     payload = {k: v for k, v in data.items() if k in allowed}
@@ -74,19 +72,13 @@ def create_trade(
             raise ValueError("exchange.user_id does not match trade.user_id")
     if "underlying_currency" not in payload:
         raise ValueError("underlying_currency is required")
-    payload["underlying_currency"] = _check_enum(
-        models.UnderlyingCurrency, payload["underlying_currency"], "underlying_currency"
-    )
+    payload["underlying_currency"] = _check_enum(models.UnderlyingCurrency, payload["underlying_currency"], "underlying_currency")
     if "trade_type" not in payload:
         raise ValueError("trade_type is required")
-    payload["trade_type"] = _check_enum(
-        models.TradeType, payload["trade_type"], "trade_type"
-    )
+    payload["trade_type"] = _check_enum(models.TradeType, payload["trade_type"], "trade_type")
     if "trade_strategy" not in payload:
         raise ValueError("trade_strategy is required")
-    payload["trade_strategy"] = _check_enum(
-        models.TradeStrategy, payload["trade_strategy"], "trade_strategy"
-    )
+    payload["trade_strategy"] = _check_enum(models.TradeStrategy, payload["trade_strategy"], "trade_strategy")
     # trade_time_utc is the creation moment: always set to now (caller shouldn't provide)
     now = datetime.now(timezone.utc)
     payload.pop("trade_time_utc", None)
@@ -113,8 +105,7 @@ def create_trade(
             "symbol": payload["symbol"],
             "exchange_id": payload["exchange_id"],
             "underlying_currency": payload["underlying_currency"],
-            "friendly_name": "Auto-created Cycle by trade "
-            + payload.get("friendly_name", ""),
+            "friendly_name": "Auto-created Cycle by trade " + payload.get("friendly_name", ""),
             "status": models.CycleStatus.OPEN,
             "start_date": payload["trade_date"],
         }
@@ -128,9 +119,7 @@ def create_trade(
 
         if cycle is None:
             raise ValueError("cycle_id does not exist")
-        payload.pop(
-            "exchange_id", None
-        )  # ignore exchange_id if provided; use cycle's exchange_id
+        payload.pop("exchange_id", None)  # ignore exchange_id if provided; use cycle's exchange_id
         payload["exchange_id"] = cycle.exchange_id
         if cycle.user_id != user_id:
             raise ValueError("cycle.user_id does not match trade.user_id")
@@ -158,9 +147,7 @@ def get_trade_by_id(session: Session, trade_id: int) -> models.Trades | None:
     return session.get(models.Trades, trade_id)
 
 
-def get_trade_by_user_id_and_friendly_name(
-    session: Session, user_id: int, friendly_name: str
-) -> models.Trades | None:
+def get_trade_by_user_id_and_friendly_name(session: Session, user_id: int, friendly_name: str) -> models.Trades | None:
     statement = select(models.Trades).where(
         models.Trades.user_id == user_id,
         models.Trades.friendly_name == friendly_name,
@@ -175,9 +162,7 @@ def get_trades_by_user_id(session: Session, user_id: int) -> list[models.Trades]
     return list(session.exec(statement).all())
 
 
-def update_trade_friendly_name(
-    session: Session, trade_id: int, friendly_name: str
-) -> models.Trades:
+def update_trade_friendly_name(session: Session, trade_id: int, friendly_name: str) -> models.Trades:
     trade: models.Trades | None = session.get(models.Trades, trade_id)
     if trade is None:
         raise ValueError("trade_id does not exist")
@@ -225,9 +210,7 @@ def invalidate_trade(session: Session, trade_id: int) -> models.Trades:
     return trade
 
 
-def replace_trade(
-    session: Session, old_trade_id: int, new_trade_data: Mapping[str, Any] | BaseModel
-) -> models.Trades:
+def replace_trade(session: Session, old_trade_id: int, new_trade_data: Mapping[str, Any] | BaseModel) -> models.Trades:
     invalidate_trade(session, old_trade_id)
     data = _data_to_dict(new_trade_data)
     data["replaced_by_trade_id"] = old_trade_id
@@ -235,9 +218,7 @@ def replace_trade(
 
 
 # Cycles
-def create_cycle(
-    session: Session, cycle_data: Mapping[str, Any] | BaseModel
-) -> models.Cycles:
+def create_cycle(session: Session, cycle_data: Mapping[str, Any] | BaseModel) -> models.Cycles:
     data = _data_to_dict(cycle_data)
     allowed = _allowed_columns(models.Cycles)
     payload = {k: v for k, v in data.items() if k in allowed}
@@ -255,9 +236,7 @@ def create_cycle(
         raise ValueError("exchange.user_id does not match cycle.user_id")
     if "underlying_currency" not in payload:
         raise ValueError("underlying_currency is required")
-    payload["underlying_currency"] = _check_enum(
-        models.UnderlyingCurrency, payload["underlying_currency"], "underlying_currency"
-    )
+    payload["underlying_currency"] = _check_enum(models.UnderlyingCurrency, payload["underlying_currency"], "underlying_currency")
     if "status" not in payload:
         raise ValueError("status is required")
     payload["status"] = _check_enum(models.CycleStatus, payload["status"], "status")
@@ -289,9 +268,7 @@ def get_cycles_by_user_id(session: Session, user_id: int) -> list[models.Cycles]
     return list(session.exec(statement).all())
 
 
-def update_cycle(
-    session: Session, cycle_id: int, update_data: Mapping[str, Any] | BaseModel
-) -> models.Cycles:
+def update_cycle(session: Session, cycle_id: int, update_data: Mapping[str, Any] | BaseModel) -> models.Cycles:
     cycle: models.Cycles | None = session.get(models.Cycles, cycle_id)
     if cycle is None:
         raise ValueError("cycle_id does not exist")
@@ -327,9 +304,7 @@ def update_cycle(
 
 
 # Cycle loan and interest
-def create_cycle_loan_event(
-    session: Session, loan_data: Mapping[str, Any] | BaseModel
-) -> models.CycleLoanChangeEvents:
+def create_cycle_loan_event(session: Session, loan_data: Mapping[str, Any] | BaseModel) -> models.CycleLoanChangeEvents:
     data = _data_to_dict(loan_data)
     allowed = _allowed_columns(models.CycleLoanChangeEvents)
     payload = {k: v for k, v in data.items() if k in allowed}
@@ -339,9 +314,7 @@ def create_cycle_loan_event(
     if cycle is None:
         raise ValueError("cycle_id does not exist")
 
-    payload["effective_date"] = (
-        payload.get("effective_date") or datetime.now(timezone.utc).date()
-    )
+    payload["effective_date"] = payload.get("effective_date") or datetime.now(timezone.utc).date()
     payload["created_at"] = datetime.now(timezone.utc)
     cle = models.CycleLoanChangeEvents(**payload)
     session.add(cle)
@@ -354,9 +327,7 @@ def create_cycle_loan_event(
     return cle
 
 
-def get_loan_events_by_cycle_id(
-    session: Session, cycle_id: int
-) -> list[models.CycleLoanChangeEvents]:
+def get_loan_events_by_cycle_id(session: Session, cycle_id: int) -> list[models.CycleLoanChangeEvents]:
     eff_col = cast("ColumnElement", models.CycleLoanChangeEvents.effective_date)
     id_col = cast("ColumnElement", models.CycleLoanChangeEvents.id)
     statement = (
@@ -369,9 +340,7 @@ def get_loan_events_by_cycle_id(
     return list(session.exec(statement).all())
 
 
-def get_loan_event_by_cycle_id_and_effective_date(
-    session: Session, cycle_id: int, effective_date: date
-) -> models.CycleLoanChangeEvents | None:
+def get_loan_event_by_cycle_id_and_effective_date(session: Session, cycle_id: int, effective_date: date) -> models.CycleLoanChangeEvents | None:
     statement = select(models.CycleLoanChangeEvents).where(
         models.CycleLoanChangeEvents.cycle_id == cycle_id,
         models.CycleLoanChangeEvents.effective_date == effective_date,
@@ -379,12 +348,8 @@ def get_loan_event_by_cycle_id_and_effective_date(
     return session.exec(statement).first()
 
 
-def update_cycle_loan_event(
-    session: Session, event_id: int, update_data: Mapping[str, Any] | BaseModel
-) -> models.CycleLoanChangeEvents:
-    event: models.CycleLoanChangeEvents | None = session.get(
-        models.CycleLoanChangeEvents, event_id
-    )
+def update_cycle_loan_event(session: Session, event_id: int, update_data: Mapping[str, Any] | BaseModel) -> models.CycleLoanChangeEvents:
+    event: models.CycleLoanChangeEvents | None = session.get(models.CycleLoanChangeEvents, event_id)
     if event is None:
         raise ValueError("event_id does not exist")
     data = _data_to_dict(update_data)
@@ -406,9 +371,7 @@ def update_cycle_loan_event(
     return event
 
 
-def create_cycle_daily_accrual(
-    session: Session, cycle_id: int, accrual_date: date, accrual_amount_cents: int
-) -> models.CycleDailyAccrual:
+def create_cycle_daily_accrual(session: Session, cycle_id: int, accrual_date: date, accrual_amount_cents: int) -> models.CycleDailyAccrual:
     cycle = session.get(models.Cycles, cycle_id)
     if cycle is None:
         raise ValueError("cycle_id does not exist")
@@ -438,9 +401,7 @@ def create_cycle_daily_accrual(
     return row
 
 
-def get_cycle_daily_accruals_by_cycle_id(
-    session: Session, cycle_id: int
-) -> list[models.CycleDailyAccrual]:
+def get_cycle_daily_accruals_by_cycle_id(session: Session, cycle_id: int) -> list[models.CycleDailyAccrual]:
     date_col = cast("ColumnElement", models.CycleDailyAccrual.accrual_date)
     statement = (
         select(models.CycleDailyAccrual)
@@ -452,9 +413,7 @@ def get_cycle_daily_accruals_by_cycle_id(
     return list(session.exec(statement).all())
 
 
-def get_cycle_daily_accrual_by_cycle_id_and_date(
-    session: Session, cycle_id: int, accrual_date: date
-) -> models.CycleDailyAccrual | None:
+def get_cycle_daily_accrual_by_cycle_id_and_date(session: Session, cycle_id: int, accrual_date: date) -> models.CycleDailyAccrual | None:
     statement = select(models.CycleDailyAccrual).where(
         models.CycleDailyAccrual.cycle_id == cycle_id,
         models.CycleDailyAccrual.accrual_date == accrual_date,
@@ -466,9 +425,7 @@ def get_cycle_daily_accrual_by_cycle_id_and_date(
 IMMUTABLE_EXCHANGE_FIELDS = {"id"}
 
 
-def create_exchange(
-    session: Session, exchange_data: Mapping[str, Any] | BaseModel
-) -> models.Exchanges:
+def create_exchange(session: Session, exchange_data: Mapping[str, Any] | BaseModel) -> models.Exchanges:
     data = _data_to_dict(exchange_data)
     allowed = _allowed_columns(models.Exchanges)
     payload = {k: v for k, v in data.items() if k in allowed}
@@ -490,9 +447,7 @@ def get_exchange_by_id(session: Session, exchange_id: int) -> models.Exchanges |
     return session.get(models.Exchanges, exchange_id)
 
 
-def get_exchange_by_name_and_user_id(
-    session: Session, name: str, user_id: int
-) -> models.Exchanges | None:
+def get_exchange_by_name_and_user_id(session: Session, name: str, user_id: int) -> models.Exchanges | None:
     statement = select(models.Exchanges).where(
         models.Exchanges.name == name,
         models.Exchanges.user_id == user_id,
@@ -505,18 +460,14 @@ def get_all_exchanges(session: Session) -> list[models.Exchanges]:
     return list(session.exec(statement).all())
 
 
-def get_all_exchanges_by_user_id(
-    session: Session, user_id: int
-) -> list[models.Exchanges]:
+def get_all_exchanges_by_user_id(session: Session, user_id: int) -> list[models.Exchanges]:
     statement = select(models.Exchanges).where(
         models.Exchanges.user_id == user_id,
     )
     return list(session.exec(statement).all())
 
 
-def update_exchange(
-    session: Session, exchange_id: int, update_data: Mapping[str, Any] | BaseModel
-) -> models.Exchanges:
+def update_exchange(session: Session, exchange_id: int, update_data: Mapping[str, Any] | BaseModel) -> models.Exchanges:
     exchange: models.Exchanges | None = session.get(models.Exchanges, exchange_id)
     if exchange is None:
         raise ValueError("exchange_id does not exist")
@@ -553,9 +504,7 @@ def delete_exchange(session: Session, exchange_id: int) -> None:
 IMMUTABLE_USER_FIELDS = {"id", "username", "created_at"}
 
 
-def create_user(
-    session: Session, user_data: Mapping[str, Any] | BaseModel
-) -> models.Users:
+def create_user(session: Session, user_data: Mapping[str, Any] | BaseModel) -> models.Users:
     data = _data_to_dict(user_data)
     allowed = _allowed_columns(models.Users)
     payload = {k: v for k, v in data.items() if k in allowed}
@@ -586,9 +535,7 @@ def get_user_by_username(session: Session, username: str) -> models.Users | None
     return session.exec(statement).first()
 
 
-def update_user(
-    session: Session, user_id: int, update_data: Mapping[str, Any] | BaseModel
-) -> models.Users:
+def update_user(session: Session, user_id: int, update_data: Mapping[str, Any] | BaseModel) -> models.Users:
     user: models.Users | None = session.get(models.Users, user_id)
     if user is None:
         raise ValueError("user_id does not exist")
@@ -645,9 +592,7 @@ def create_login_session(
     return s
 
 
-def get_login_session_by_token_hash_and_user_id(
-    session: Session, session_token_hash: str, user_id: int
-) -> models.Sessions | None:
+def get_login_session_by_token_hash_and_user_id(session: Session, session_token_hash: str, user_id: int) -> models.Sessions | None:
     statement = select(models.Sessions).where(
         models.Sessions.session_token_hash == session_token_hash,
         models.Sessions.user_id == user_id,
@@ -657,9 +602,7 @@ def get_login_session_by_token_hash_and_user_id(
     return session.exec(statement).first()
 
 
-def get_login_session_by_token_hash(
-    session: Session, session_token_hash: str
-) -> models.Sessions | None:
+def get_login_session_by_token_hash(session: Session, session_token_hash: str) -> models.Sessions | None:
     statement = select(models.Sessions).where(
         models.Sessions.session_token_hash == session_token_hash,
         models.Sessions.expires_at > datetime.now(timezone.utc),