tliu93/trading-journal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip loan update
Some checks failed
Backend CI / unit-test (push) Failing after 44s
Details

Browse Source
This commit is contained in:
Tianyu Liu
2025-10-03 11:55:30 +02:00
parent 5e7d801075
commit 0ca660f268
9 changed files with 1100 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

271
backend/trading_journal/service.py
View File

@@ -13,6 +13,7 @@ from trading_journal import crud, security
from trading_journal.dto import (
CycleBase,
CycleCreate,
CycleLoanChangeEventBase,
CycleRead,
CycleUpdate,
ExchangesBase,
@@ -26,6 +27,17 @@ from trading_journal.dto import (
UserLogin,
UserRead,
)
from trading_journal.service_error import (
CycleLoanEventExistsError,
CycleNotFoundError,
ExchangeAlreadyExistsError,
ExchangeNotFoundError,
InvalidCycleDataError,
InvalidTradeDataError,
ServiceError,
TradeNotFoundError,
UserAlreadyExistsError,
)
if TYPE_CHECKING:
from sqlmodel import Session
@@ -44,7 +56,9 @@ logger = logging.getLogger(__name__)
class AuthMiddleWare(BaseHTTPMiddleware):
async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -> Response: # noqa: PLR0911
async def dispatch(
self, request: Request, call_next: RequestResponseEndpoint
) -> Response: # noqa: PLR0911
if request.url.path in EXCEPT_PATHS:
return await call_next(request)
@@ -62,22 +76,44 @@ class AuthMiddleWare(BaseHTTPMiddleware):
db_factory: Database | None = getattr(request.app.state, "db_factory", None)
if db_factory is None:
return JSONResponse(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, content={"detail": "db factory not configured"})
return JSONResponse(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
content={"detail": "db factory not configured"},
)
try:
with db_factory.get_session_ctx_manager() as request_session:
hashed_token = security.hash_session_token_sha256(token)
request.state.db_session = request_session
login_session: Sessions | None = crud.get_login_session_by_token_hash(request_session, hashed_token)
login_session: Sessions | None = crud.get_login_session_by_token_hash(
request_session, hashed_token
)
if not login_session:
return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content={"detail": "Unauthorized"})
session_expires_utc = login_session.expires_at.replace(tzinfo=timezone.utc)
return JSONResponse(
status_code=status.HTTP_401_UNAUTHORIZED,
content={"detail": "Unauthorized"},
)
session_expires_utc = login_session.expires_at.replace(
tzinfo=timezone.utc
)
if session_expires_utc < datetime.now(timezone.utc):
crud.delete_login_session(request_session, login_session.session_token_hash)
return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content={"detail": "Unauthorized"})
crud.delete_login_session(
request_session, login_session.session_token_hash
)
return JSONResponse(
status_code=status.HTTP_401_UNAUTHORIZED,
content={"detail": "Unauthorized"},
)
if login_session.user.is_active is False:
return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content={"detail": "Unauthorized"})
if session_expires_utc - datetime.now(timezone.utc) < timedelta(seconds=3600):
updated_expiry = datetime.now(timezone.utc) + timedelta(seconds=settings.settings.session_expiry_seconds)
return JSONResponse(
status_code=status.HTTP_401_UNAUTHORIZED,
content={"detail": "Unauthorized"},
)
if session_expires_utc - datetime.now(timezone.utc) < timedelta(
seconds=3600
):
updated_expiry = datetime.now(timezone.utc) + timedelta(
seconds=settings.settings.session_expiry_seconds
)
else:
updated_expiry = session_expires_utc
updated_session: SessionsUpdate = SessionsUpdate(
@@ -88,46 +124,19 @@ class AuthMiddleWare(BaseHTTPMiddleware):
)
user_id = login_session.user_id
request.state.user_id = user_id
crud.update_login_session(request_session, hashed_token, update_session=updated_session)
crud.update_login_session(
request_session, hashed_token, update_session=updated_session
)
except Exception:
logger.exception("Failed to authenticate user: \n")
return JSONResponse(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, content={"detail": "Internal server error"})
return JSONResponse(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
content={"detail": "Internal server error"},
)
return await call_next(request)
class ServiceError(Exception):
pass
class UserAlreadyExistsError(ServiceError):
pass
class ExchangeAlreadyExistsError(ServiceError):
pass
class ExchangeNotFoundError(ServiceError):
pass
class CycleNotFoundError(ServiceError):
pass
class TradeNotFoundError(ServiceError):
pass
class InvalidTradeDataError(ServiceError):
pass
class InvalidCycleDataError(ServiceError):
pass
# User service
def register_user_service(db_session: Session, user_in: UserCreate) -> UserRead:
if crud.get_user_by_username(db_session, user_in.username):
@@ -151,7 +160,9 @@ def register_user_service(db_session: Session, user_in: UserCreate) -> UserRead:
return user
def authenticate_user_service(db_session: Session, user_in: UserLogin) -> tuple[SessionsCreate, str] | None:
def authenticate_user_service(
db_session: Session, user_in: UserLogin
) -> tuple[SessionsCreate, str] | None:
user = crud.get_user_by_username(db_session, user_in.username)
if not user:
return None
@@ -176,10 +187,14 @@ def authenticate_user_service(db_session: Session, user_in: UserLogin) -> tuple[
# Exchanges service
def create_exchange_service(db_session: Session, user_id: int, name: str, notes: str | None) -> ExchangesCreate:
def create_exchange_service(
db_session: Session, user_id: int, name: str, notes: str | None
) -> ExchangesCreate:
existing_exchange = crud.get_exchange_by_name_and_user_id(db_session, name, user_id)
if existing_exchange:
raise ExchangeAlreadyExistsError("Exchange with the same name already exists for this user")
raise ExchangeAlreadyExistsError(
"Exchange with the same name already exists for this user"
)
exchange_data = ExchangesCreate(
user_id=user_id,
name=name,
@@ -198,12 +213,20 @@ def create_exchange_service(db_session: Session, user_id: int, name: str, notes:
return exchange_dto
def get_exchanges_by_user_service(db_session: Session, user_id: int) -> list[ExchangesRead]:
def get_exchanges_by_user_service(
db_session: Session, user_id: int
) -> list[ExchangesRead]:
exchanges = crud.get_all_exchanges_by_user_id(db_session, user_id)
return [ExchangesRead.model_validate(exchange) for exchange in exchanges]
def update_exchanges_service(db_session: Session, user_id: int, exchange_id: int, name: str | None, notes: str | None) -> ExchangesBase:
def update_exchanges_service(
db_session: Session,
user_id: int,
exchange_id: int,
name: str | None,
notes: str | None,
) -> ExchangesBase:
existing_exchange = crud.get_exchange_by_id(db_session, exchange_id)
if not existing_exchange:
raise ExchangeNotFoundError("Exchange not found")
@@ -211,16 +234,22 @@ def update_exchanges_service(db_session: Session, user_id: int, exchange_id: int
raise ExchangeNotFoundError("Exchange not found")
if name:
other_exchange = crud.get_exchange_by_name_and_user_id(db_session, name, user_id)
other_exchange = crud.get_exchange_by_name_and_user_id(
db_session, name, user_id
)
if other_exchange and other_exchange.id != existing_exchange.id:
raise ExchangeAlreadyExistsError("Another exchange with the same name already exists for this user")
raise ExchangeAlreadyExistsError(
"Another exchange with the same name already exists for this user"
)
exchange_data = ExchangesBase(
name=name or existing_exchange.name,
notes=notes or existing_exchange.notes,
)
try:
exchange = crud.update_exchange(db_session, cast("int", existing_exchange.id), update_data=exchange_data)
exchange = crud.update_exchange(
db_session, cast("int", existing_exchange.id), update_data=exchange_data
)
except Exception as e:
logger.exception("Failed to update exchange: \n")
raise ServiceError("Failed to update exchange") from e
@@ -228,7 +257,9 @@ def update_exchanges_service(db_session: Session, user_id: int, exchange_id: int
# Cycle Service
def create_cycle_service(db_session: Session, user_id: int, cycle_data: CycleBase) -> CycleRead:
def create_cycle_service(
db_session: Session, user_id: int, cycle_data: CycleBase
) -> CycleRead:
raise NotImplementedError("Cycle creation not implemented")
cycle_data_dict = cycle_data.model_dump()
cycle_data_dict["user_id"] = user_id
@@ -237,7 +268,9 @@ def create_cycle_service(db_session: Session, user_id: int, cycle_data: CycleBas
return CycleRead.model_validate(created_cycle)
def get_cycle_by_id_service(db_session: Session, user_id: int, cycle_id: int) -> CycleRead:
def get_cycle_by_id_service(
db_session: Session, user_id: int, cycle_id: int
) -> CycleRead:
cycle = crud.get_cycle_by_id(db_session, cycle_id)
if not cycle:
raise CycleNotFoundError("Cycle not found")
@@ -256,22 +289,65 @@ def _validate_cycle_update_data(cycle_data: CycleUpdate) -> tuple[bool, str]: #
return False, "end_date is required when status is CLOSED"
if cycle_data.status == "OPEN" and cycle_data.end_date is not None:
return False, "end_date must be empty when status is OPEN"
if cycle_data.capital_exposure_cents is not None and cycle_data.capital_exposure_cents < 0:
if (
cycle_data.capital_exposure_cents is not None
and cycle_data.capital_exposure_cents < 0
):
return False, "capital_exposure_cents must be non-negative"
if (
cycle_data.funding_source is not None
and cycle_data.funding_source != "CASH"
and (cycle_data.loan_amount_cents is None or cycle_data.loan_interest_rate_tenth_bps is None)
and (
cycle_data.loan_amount_cents is None
or cycle_data.loan_interest_rate_tenth_bps is None
)
):
return False, "loan_amount_cents and loan_interest_rate_tenth_bps are required when funding_source is not CASH"
return (
False,
"loan_amount_cents and loan_interest_rate_tenth_bps are required when funding_source is not CASH",
)
if cycle_data.loan_amount_cents is not None and cycle_data.loan_amount_cents < 0:
return False, "loan_amount_cents must be non-negative"
if cycle_data.loan_interest_rate_tenth_bps is not None and cycle_data.loan_interest_rate_tenth_bps < 0:
if (
cycle_data.loan_interest_rate_tenth_bps is not None
and cycle_data.loan_interest_rate_tenth_bps < 0
):
return False, "loan_interest_rate_tenth_bps must be non-negative"
return True, ""
def update_cycle_service(db_session: Session, user_id: int, cycle_data: CycleUpdate) -> CycleRead:
def _create_cycle_loan_event(
db_session: Session,
cycle_id: int,
loan_amount_cents: int | None,
loan_interest_rate_tenth_bps: int | None,
) -> None:
now = datetime.now(timezone.utc)
today = now.date()
existing_loan_event = crud.get_loan_event_by_cycle_id_and_effective_date(
db_session, cycle_id, today
)
if existing_loan_event:
raise CycleLoanEventExistsError(
"A loan event with the same effective_date already exists for this cycle."
)
loan_event_data = CycleLoanChangeEventBase(
cycle_id=cycle_id,
effective_date=today,
loan_amount_cents=loan_amount_cents,
loan_interest_rate_tenth_bps=loan_interest_rate_tenth_bps,
created_at=now,
)
try:
crud.create_cycle_loan_event(db_session, loan_event_data)
except Exception as e:
logger.exception("Failed to create cycle loan event: \n")
raise ServiceError("Failed to create cycle loan event") from e
def update_cycle_service(
db_session: Session, user_id: int, cycle_data: CycleUpdate
) -> CycleRead:
is_valid, err_msg = _validate_cycle_update_data(cycle_data)
if not is_valid:
raise InvalidCycleDataError(err_msg)
@@ -281,22 +357,68 @@ def update_cycle_service(db_session: Session, user_id: int, cycle_data: CycleUpd
raise CycleNotFoundError("Cycle not found")
if existing_cycle.user_id != user_id:
raise CycleNotFoundError("Cycle not found")
if (
cycle_data.loan_amount_cents is not None
or cycle_data.loan_interest_rate_tenth_bps is not None
):
_create_cycle_loan_event(
db_session,
cycle_id,
cycle_data.loan_amount_cents,
cycle_data.loan_interest_rate_tenth_bps,
)
provided_data_dict = cycle_data.model_dump(exclude_unset=True)
cycle_data_with_user_id: CycleBase = CycleBase.model_validate(provided_data_dict)
try:
updated_cycle = crud.update_cycle(db_session, cycle_id, update_data=cycle_data_with_user_id)
updated_cycle = crud.update_cycle(
db_session, cycle_id, update_data=cycle_data_with_user_id
)
except Exception as e:
logger.exception("Failed to update cycle: \n")
raise ServiceError("Failed to update cycle") from e
return CycleRead.model_validate(updated_cycle)
def accural_interest_service(db_session: Session, cycle_id: int) -> None:
cycle = crud.get_cycle_by_id(db_session, cycle_id)
if not cycle:
logger.exception("Cycle not found for interest accrual")
raise CycleNotFoundError("Cycle not found")
if cycle.loan_amount_cents is None or cycle.loan_interest_rate_tenth_bps is None:
logger.info("Cycle has no loan, skipping interest accrual")
return
today = datetime.now(timezone.utc).date()
amount_cents = round(
cycle.loan_amount_cents * cycle.loan_interest_rate_tenth_bps / 100000 / 365
)
try:
crud.create_cycle_daily_accrual(
db_session,
cycle_id=cycle_id,
accrual_date=today,
accrual_amount_cents=amount_cents,
)
except Exception as e:
logger.exception("Failed to create cycle interest accrual: \n")
raise ServiceError("Failed to create cycle interest accrual") from e
def flush_interest_accruals_service(db_session: Session) -> None:
pass
# Trades service
def _append_cashflows(trade_data: TradeCreate) -> TradeCreate:
sign_multipler: int
if trade_data.trade_type in ("SELL_PUT", "SELL_CALL", "EXERCISE_CALL", "CLOSE_LONG_SPOT", "SHORT_SPOT"):
if trade_data.trade_type in (
"SELL_PUT",
"SELL_CALL",
"EXERCISE_CALL",
"CLOSE_LONG_SPOT",
"SHORT_SPOT",
):
sign_multipler = 1
else:
sign_multipler = -1
@@ -310,13 +432,18 @@ def _append_cashflows(trade_data: TradeCreate) -> TradeCreate:
def _validate_trade_data(trade_data: TradeCreate) -> bool:
return not (
trade_data.trade_type in ("SELL_PUT", "SELL_CALL") and (trade_data.expiry_date is None or trade_data.strike_price_cents is None)
trade_data.trade_type in ("SELL_PUT", "SELL_CALL")
and (trade_data.expiry_date is None or trade_data.strike_price_cents is None)
)
def create_trade_service(db_session: Session, user_id: int, trade_data: TradeCreate) -> TradeRead:
def create_trade_service(
db_session: Session, user_id: int, trade_data: TradeCreate
) -> TradeRead:
if not _validate_trade_data(trade_data):
raise InvalidTradeDataError("Invalid trade data: expiry_date and strike_price_cents are required for SELL_PUT and SELL_CALL trades")
raise InvalidTradeDataError(
"Invalid trade data: expiry_date and strike_price_cents are required for SELL_PUT and SELL_CALL trades"
)
trade_data_dict = trade_data.model_dump()
trade_data_dict["user_id"] = user_id
trade_data_with_user_id: TradeCreate = TradeCreate.model_validate(trade_data_dict)
@@ -325,7 +452,9 @@ def create_trade_service(db_session: Session, user_id: int, trade_data: TradeCre
return TradeRead.model_validate(created_trade)
def get_trade_by_id_service(db_session: Session, user_id: int, trade_id: int) -> TradeRead:
def get_trade_by_id_service(
db_session: Session, user_id: int, trade_id: int
) -> TradeRead:
trade = crud.get_trade_by_id(db_session, trade_id)
if not trade:
raise TradeNotFoundError("Trade not found")
@@ -334,21 +463,27 @@ def get_trade_by_id_service(db_session: Session, user_id: int, trade_id: int) ->
return TradeRead.model_validate(trade)
def update_trade_friendly_name_service(db_session: Session, user_id: int, trade_id: int, friendly_name: str) -> TradeRead:
def update_trade_friendly_name_service(
db_session: Session, user_id: int, trade_id: int, friendly_name: str
) -> TradeRead:
existing_trade = crud.get_trade_by_id(db_session, trade_id)
if not existing_trade:
raise TradeNotFoundError("Trade not found")
if existing_trade.user_id != user_id:
raise TradeNotFoundError("Trade not found")
try:
updated_trade = crud.update_trade_friendly_name(db_session, trade_id, friendly_name)
updated_trade = crud.update_trade_friendly_name(
db_session, trade_id, friendly_name
)
except Exception as e:
logger.exception("Failed to update trade friendly name: \n")
raise ServiceError("Failed to update trade friendly name") from e
return TradeRead.model_validate(updated_trade)
def update_trade_note_service(db_session: Session, user_id: int, trade_id: int, note: str | None) -> TradeRead:
def update_trade_note_service(
db_session: Session, user_id: int, trade_id: int, note: str | None
) -> TradeRead:
existing_trade = crud.get_trade_by_id(db_session, trade_id)
if not existing_trade:
raise TradeNotFoundError("Trade not found")