service with accrual interest and loan update tested
All checks were successful
Backend CI / unit-test (push) Successful in 48s
All checks were successful
Backend CI / unit-test (push) Successful in 48s
This commit is contained in:
@@ -25,15 +25,9 @@ class FakeDBFactory:
|
||||
yield fake_session
|
||||
|
||||
|
||||
def verify_json_response(
|
||||
response: Response, expected_status: int, expected_detail: str
|
||||
) -> None:
|
||||
def verify_json_response(response: Response, expected_status: int, expected_detail: str) -> None:
|
||||
assert response.status_code == expected_status
|
||||
body_bytes = (
|
||||
response.body.tobytes()
|
||||
if isinstance(response.body, memoryview)
|
||||
else response.body
|
||||
)
|
||||
body_bytes = response.body.tobytes() if isinstance(response.body, memoryview) else response.body
|
||||
body_text = body_bytes.decode("utf-8")
|
||||
body_json = json.loads(body_text)
|
||||
assert body_json.get("detail") == expected_detail
|
||||
@@ -99,9 +93,7 @@ def test_auth_middleware_no_db() -> None:
|
||||
pytest.fail("call_next should not be called for invalid token")
|
||||
|
||||
response = asyncio.run(middleware.dispatch(request, call_next))
|
||||
verify_json_response(
|
||||
response, status.HTTP_500_INTERNAL_SERVER_ERROR, "db factory not configured"
|
||||
)
|
||||
verify_json_response(response, status.HTTP_500_INTERNAL_SERVER_ERROR, "db factory not configured")
|
||||
|
||||
|
||||
def test_auth_middleware_rejects_invalid_token() -> None:
|
||||
@@ -122,9 +114,7 @@ def test_auth_middleware_rejects_invalid_token() -> None:
|
||||
async def call_next(req: Request) -> Response: # noqa: ARG001
|
||||
pytest.fail("call_next should not be called for invalid token")
|
||||
|
||||
with patch(
|
||||
"trading_journal.crud.get_login_session_by_token_hash", return_value=None
|
||||
):
|
||||
with patch("trading_journal.crud.get_login_session_by_token_hash", return_value=None):
|
||||
response = asyncio.run(middleware.dispatch(request, call_next))
|
||||
verify_json_response(response, status.HTTP_401_UNAUTHORIZED, "Unauthorized")
|
||||
|
||||
@@ -335,12 +325,8 @@ def test_auth_middleware_allows_valid_token_and_updates_expires() -> None:
|
||||
_, kwargs = mock_update.call_args
|
||||
update_session = kwargs.get("update_session")
|
||||
assert update_session is not None
|
||||
assert (
|
||||
update_session.expires_at - datetime.now(timezone.utc)
|
||||
).total_seconds() > settings.session_expiry_seconds - 1
|
||||
assert (
|
||||
update_session.last_seen_at - datetime.now(timezone.utc)
|
||||
).total_seconds() < 1
|
||||
assert (update_session.expires_at - datetime.now(timezone.utc)).total_seconds() > settings.session_expiry_seconds - 1
|
||||
assert (update_session.last_seen_at - datetime.now(timezone.utc)).total_seconds() < 1
|
||||
assert update_session.last_used_ip == "testclient"
|
||||
assert update_session.user_agent == "test-agent"
|
||||
|
||||
@@ -354,14 +340,10 @@ def test_register_user_success() -> None:
|
||||
}
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_user_by_username", return_value=None
|
||||
) as mock_get,
|
||||
patch("trading_journal.crud.get_user_by_username", return_value=None) as mock_get,
|
||||
patch(
|
||||
"trading_journal.crud.create_user",
|
||||
return_value=SimpleNamespace(
|
||||
id=1, username=user_in.username, is_active=True
|
||||
),
|
||||
return_value=SimpleNamespace(id=1, username=user_in.username, is_active=True),
|
||||
) as mock_create,
|
||||
patch(
|
||||
"trading_journal.security.hash_password",
|
||||
@@ -381,9 +363,7 @@ def test_register_user_exists_raises() -> None:
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_user_by_username",
|
||||
return_value=SimpleNamespace(
|
||||
id=1, username=user_in.username, is_active=True
|
||||
),
|
||||
return_value=SimpleNamespace(id=1, username=user_in.username, is_active=True),
|
||||
) as mock_get,
|
||||
):
|
||||
with pytest.raises(service.UserAlreadyExistsError) as exc_info:
|
||||
@@ -394,13 +374,10 @@ def test_register_user_exists_raises() -> None:
|
||||
|
||||
def test_authenticate_user_success() -> None:
|
||||
user_in = dto.UserLogin(username="validuser", password="validpassword")
|
||||
stored_user = SimpleNamespace(
|
||||
id=1, username=user_in.username, is_active=True, password_hash="hashedpassword"
|
||||
)
|
||||
stored_user = SimpleNamespace(id=1, username=user_in.username, is_active=True, password_hash="hashedpassword")
|
||||
expected_login_session = dto.SessionsCreate(
|
||||
user_id=stored_user.id,
|
||||
expires_at=datetime.now(timezone.utc)
|
||||
+ timedelta(seconds=settings.session_expiry_seconds),
|
||||
expires_at=datetime.now(timezone.utc) + timedelta(seconds=settings.session_expiry_seconds),
|
||||
)
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
@@ -408,9 +385,7 @@ def test_authenticate_user_success() -> None:
|
||||
"trading_journal.crud.get_user_by_username",
|
||||
return_value=stored_user,
|
||||
) as mock_get,
|
||||
patch(
|
||||
"trading_journal.security.verify_password", return_value=True
|
||||
) as mock_verify,
|
||||
patch("trading_journal.security.verify_password", return_value=True) as mock_verify,
|
||||
patch(
|
||||
"trading_journal.security.generate_session_token",
|
||||
return_value="newsessiontoken",
|
||||
@@ -421,9 +396,7 @@ def test_authenticate_user_success() -> None:
|
||||
) as mock_hash_session_token,
|
||||
patch(
|
||||
"trading_journal.crud.create_login_session",
|
||||
return_value=SimpleNamespace(
|
||||
user_id=stored_user.id, expires_at=expected_login_session.expires_at
|
||||
),
|
||||
return_value=SimpleNamespace(user_id=stored_user.id, expires_at=expected_login_session.expires_at),
|
||||
) as mock_create_session,
|
||||
):
|
||||
user_out = service.authenticate_user_service(db, user_in)
|
||||
@@ -432,14 +405,7 @@ def test_authenticate_user_success() -> None:
|
||||
# assert fields instead of direct equality to avoid pydantic/model issues
|
||||
assert getattr(login_session, "user_id", None) == stored_user.id
|
||||
assert isinstance(getattr(login_session, "expires_at", None), datetime)
|
||||
assert (
|
||||
abs(
|
||||
(
|
||||
login_session.expires_at - expected_login_session.expires_at
|
||||
).total_seconds()
|
||||
)
|
||||
< 2
|
||||
)
|
||||
assert abs((login_session.expires_at - expected_login_session.expires_at).total_seconds()) < 2
|
||||
assert token == "newsessiontoken"
|
||||
assert login_session.user_id == stored_user.id
|
||||
mock_get.assert_called_once_with(db, user_in.username)
|
||||
@@ -470,18 +436,14 @@ def test_authenticate_user_not_found_returns_none() -> None:
|
||||
|
||||
def test_authenticate_user_invalid_password_returns_none() -> None:
|
||||
user_in = dto.UserLogin(username="validuser", password="invalidpassword")
|
||||
stored_user = SimpleNamespace(
|
||||
id=1, username=user_in.username, is_active=True, password_hash="hashedpassword"
|
||||
)
|
||||
stored_user = SimpleNamespace(id=1, username=user_in.username, is_active=True, password_hash="hashedpassword")
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_user_by_username",
|
||||
return_value=stored_user,
|
||||
) as mock_get,
|
||||
patch(
|
||||
"trading_journal.security.verify_password", return_value=False
|
||||
) as mock_verify,
|
||||
patch("trading_journal.security.verify_password", return_value=False) as mock_verify,
|
||||
):
|
||||
user_out = service.authenticate_user_service(db, user_in)
|
||||
assert user_out is None
|
||||
@@ -496,9 +458,7 @@ def test_create_exchange_duplicate_raises() -> None:
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_exchange_by_name_and_user_id",
|
||||
return_value=SimpleNamespace(
|
||||
id=1, user_id=1, name=exchange_in.name, notes="Existing exchange"
|
||||
),
|
||||
return_value=SimpleNamespace(id=1, user_id=1, name=exchange_in.name, notes="Existing exchange"),
|
||||
) as mock_get,
|
||||
):
|
||||
with pytest.raises(service.ExchangeAlreadyExistsError) as exc_info:
|
||||
@@ -508,10 +468,7 @@ def test_create_exchange_duplicate_raises() -> None:
|
||||
name=exchange_in.name,
|
||||
notes=exchange_in.notes,
|
||||
)
|
||||
assert (
|
||||
str(exc_info.value)
|
||||
== "Exchange with the same name already exists for this user"
|
||||
)
|
||||
assert str(exc_info.value) == "Exchange with the same name already exists for this user"
|
||||
mock_get.assert_called_once_with(db, exchange_in.name, exchange_in.user_id)
|
||||
|
||||
|
||||
@@ -552,9 +509,7 @@ def test_get_exchanges_by_user_id() -> None:
|
||||
"trading_journal.crud.get_all_exchanges_by_user_id",
|
||||
return_value=[
|
||||
SimpleNamespace(id=1, user_id=1, name="NYSE", notes="First exchange"),
|
||||
SimpleNamespace(
|
||||
id=2, user_id=1, name="NASDAQ", notes="Second exchange"
|
||||
),
|
||||
SimpleNamespace(id=2, user_id=1, name="NASDAQ", notes="Second exchange"),
|
||||
],
|
||||
) as mock_get,
|
||||
):
|
||||
@@ -601,9 +556,7 @@ def test_update_exchange_not_found() -> None:
|
||||
|
||||
def test_update_exchange_owner_mismatch_raises() -> None:
|
||||
exchange_update = dto.ExchangesBase(name="UpdatedName", notes="Updated notes")
|
||||
existing_exchange = SimpleNamespace(
|
||||
id=1, user_id=2, name="OldName", notes="Old notes"
|
||||
)
|
||||
existing_exchange = SimpleNamespace(id=1, user_id=2, name="OldName", notes="Old notes")
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
@@ -625,9 +578,7 @@ def test_update_exchange_owner_mismatch_raises() -> None:
|
||||
|
||||
def test_update_exchange_duplication() -> None:
|
||||
exchange_update = dto.ExchangesBase(name="DuplicateName", notes="Updated notes")
|
||||
existing_exchange = SimpleNamespace(
|
||||
id=1, user_id=1, name="OldName", notes="Old notes"
|
||||
)
|
||||
existing_exchange = SimpleNamespace(id=1, user_id=1, name="OldName", notes="Old notes")
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
@@ -636,9 +587,7 @@ def test_update_exchange_duplication() -> None:
|
||||
) as mock_get,
|
||||
patch(
|
||||
"trading_journal.crud.get_exchange_by_name_and_user_id",
|
||||
return_value=SimpleNamespace(
|
||||
id=2, user_id=1, name="DuplicateName", notes="Another exchange"
|
||||
),
|
||||
return_value=SimpleNamespace(id=2, user_id=1, name="DuplicateName", notes="Another exchange"),
|
||||
) as mock_get_by_name,
|
||||
):
|
||||
with pytest.raises(service.ExchangeAlreadyExistsError) as exc_info:
|
||||
@@ -649,19 +598,14 @@ def test_update_exchange_duplication() -> None:
|
||||
name=exchange_update.name,
|
||||
notes=exchange_update.notes,
|
||||
)
|
||||
assert (
|
||||
str(exc_info.value)
|
||||
== "Another exchange with the same name already exists for this user"
|
||||
)
|
||||
assert str(exc_info.value) == "Another exchange with the same name already exists for this user"
|
||||
mock_get.assert_called_once_with(db, 1)
|
||||
mock_get_by_name.assert_called_once_with(db, "DuplicateName", 1)
|
||||
|
||||
|
||||
def test_update_exchange_success() -> None:
|
||||
exchange_update = dto.ExchangesBase(name="UpdatedName", notes="Updated notes")
|
||||
existing_exchange = SimpleNamespace(
|
||||
id=1, user_id=1, name="OldName", notes="Old notes"
|
||||
)
|
||||
existing_exchange = SimpleNamespace(id=1, user_id=1, name="OldName", notes="Old notes")
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
@@ -674,9 +618,7 @@ def test_update_exchange_success() -> None:
|
||||
) as mock_get_by_name,
|
||||
patch(
|
||||
"trading_journal.crud.update_exchange",
|
||||
return_value=SimpleNamespace(
|
||||
id=1, user_id=1, name=exchange_update.name, notes=exchange_update.notes
|
||||
),
|
||||
return_value=SimpleNamespace(id=1, user_id=1, name=exchange_update.name, notes=exchange_update.notes),
|
||||
) as mock_update,
|
||||
):
|
||||
exchange_out = service.update_exchanges_service(
|
||||
@@ -741,9 +683,7 @@ def test_get_cycle_by_id_success() -> None:
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch("trading_journal.crud.get_cycle_by_id", return_value=cycle) as mock_get,
|
||||
):
|
||||
cycle_out = service.get_cycle_by_id_service(
|
||||
db, user_id=user_id, cycle_id=cycle_id
|
||||
)
|
||||
cycle_out = service.get_cycle_by_id_service(db, user_id=user_id, cycle_id=cycle_id)
|
||||
assert cycle_out.id == cycle_id
|
||||
assert cycle_out.user_id == user_id
|
||||
assert cycle_out.friendly_name == "Test Cycle"
|
||||
@@ -760,9 +700,7 @@ def test_get_cycles_by_user_no_cycles() -> None:
|
||||
user_id = 1
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_cycles_by_user_id", return_value=[]
|
||||
) as mock_get,
|
||||
patch("trading_journal.crud.get_cycles_by_user_id", return_value=[]) as mock_get,
|
||||
):
|
||||
cycles = service.get_cycles_by_user_service(db, user_id=user_id)
|
||||
assert isinstance(cycles, list)
|
||||
@@ -800,9 +738,7 @@ def test_get_cycles_by_user_with_cycles() -> None:
|
||||
)
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_cycles_by_user_id", return_value=[cycle1, cycle2]
|
||||
) as mock_get,
|
||||
patch("trading_journal.crud.get_cycles_by_user_id", return_value=[cycle1, cycle2]) as mock_get,
|
||||
):
|
||||
cycles = service.get_cycles_by_user_service(db, user_id=user_id)
|
||||
assert isinstance(cycles, list)
|
||||
@@ -840,9 +776,7 @@ def test_update_cycle_open_status_mismatch_raises() -> None:
|
||||
|
||||
|
||||
def test_update_cycle_invalid_capital_exposure_raises() -> None:
|
||||
cycle_data = dto.CycleUpdate(
|
||||
id=1, friendly_name="Updated Cycle", status="OPEN", capital_exposure_cents=-100
|
||||
)
|
||||
cycle_data = dto.CycleUpdate(id=1, friendly_name="Updated Cycle", status="OPEN", capital_exposure_cents=-100)
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
):
|
||||
@@ -864,10 +798,7 @@ def test_update_cycle_no_cash_no_loan_raises() -> None:
|
||||
):
|
||||
with pytest.raises(service.InvalidCycleDataError) as exc_info:
|
||||
service.update_cycle_service(db, user_id=1, cycle_data=cycle_data)
|
||||
assert (
|
||||
str(exc_info.value)
|
||||
== "loan_amount_cents and loan_interest_rate_tenth_bps are required when funding_source is not CASH"
|
||||
)
|
||||
assert str(exc_info.value) == "loan_amount_cents and loan_interest_rate_tenth_bps are required when funding_source is not CASH"
|
||||
|
||||
|
||||
def test_update_cycle_loan_missing_interest_raises() -> None:
|
||||
@@ -883,10 +814,7 @@ def test_update_cycle_loan_missing_interest_raises() -> None:
|
||||
):
|
||||
with pytest.raises(service.InvalidCycleDataError) as exc_info:
|
||||
service.update_cycle_service(db, user_id=1, cycle_data=cycle_data)
|
||||
assert (
|
||||
str(exc_info.value)
|
||||
== "loan_amount_cents and loan_interest_rate_tenth_bps are required when funding_source is not CASH"
|
||||
)
|
||||
assert str(exc_info.value) == "loan_amount_cents and loan_interest_rate_tenth_bps are required when funding_source is not CASH"
|
||||
|
||||
|
||||
def test_update_cycle_loan_negative_loan_raises() -> None:
|
||||
@@ -920,9 +848,7 @@ def test_update_cycle_loan_negative_interest_raises() -> None:
|
||||
):
|
||||
with pytest.raises(service.InvalidCycleDataError) as exc_info:
|
||||
service.update_cycle_service(db, user_id=1, cycle_data=cycle_data)
|
||||
assert (
|
||||
str(exc_info.value) == "loan_interest_rate_tenth_bps must be non-negative"
|
||||
)
|
||||
assert str(exc_info.value) == "loan_interest_rate_tenth_bps must be non-negative"
|
||||
|
||||
|
||||
def test_update_cycle_not_found_raises() -> None:
|
||||
@@ -942,9 +868,7 @@ def test_update_cycle_owner_mismatch_raises() -> None:
|
||||
existing_cycle = SimpleNamespace(id=1, user_id=2) # Owned by different user
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_cycle_by_id", return_value=existing_cycle
|
||||
) as mock_get,
|
||||
patch("trading_journal.crud.get_cycle_by_id", return_value=existing_cycle) as mock_get,
|
||||
):
|
||||
with pytest.raises(service.CycleNotFoundError) as exc_info:
|
||||
service.update_cycle_service(db, user_id=1, cycle_data=cycle_data)
|
||||
@@ -993,16 +917,13 @@ def test_update_cycle_success() -> None:
|
||||
)
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_cycle_by_id", return_value=existing_cycle
|
||||
) as mock_get,
|
||||
patch(
|
||||
"trading_journal.crud.update_cycle", return_value=updated_cycle
|
||||
) as mock_update,
|
||||
patch("trading_journal.crud.get_cycle_by_id", return_value=existing_cycle) as mock_get,
|
||||
patch("trading_journal.crud.update_cycle", return_value=updated_cycle) as mock_update,
|
||||
patch(
|
||||
"trading_journal.crud.get_loan_event_by_cycle_id_and_effective_date",
|
||||
return_value=None,
|
||||
) as mock_get_loan_event,
|
||||
patch("trading_journal.crud.create_cycle_loan_event"),
|
||||
):
|
||||
cycle_out = service.update_cycle_service(db, user_id=1, cycle_data=cycle_data)
|
||||
assert cycle_out.id == updated_cycle.id
|
||||
@@ -1011,10 +932,7 @@ def test_update_cycle_success() -> None:
|
||||
assert cycle_out.funding_source == updated_cycle.funding_source
|
||||
assert cycle_out.capital_exposure_cents == updated_cycle.capital_exposure_cents
|
||||
assert cycle_out.loan_amount_cents == updated_cycle.loan_amount_cents
|
||||
assert (
|
||||
cycle_out.loan_interest_rate_tenth_bps
|
||||
== updated_cycle.loan_interest_rate_tenth_bps
|
||||
)
|
||||
assert cycle_out.loan_interest_rate_tenth_bps == updated_cycle.loan_interest_rate_tenth_bps
|
||||
mock_get.assert_called_once_with(db, cycle_data.id)
|
||||
update_cycle_base = dto.CycleBase(
|
||||
friendly_name=cycle_data.friendly_name,
|
||||
@@ -1022,17 +940,49 @@ def test_update_cycle_success() -> None:
|
||||
funding_source=cycle_data.funding_source,
|
||||
capital_exposure_cents=cycle_data.capital_exposure_cents,
|
||||
loan_amount_cents=getattr(cycle_data, "loan_amount_cents", None),
|
||||
loan_interest_rate_tenth_bps=getattr(
|
||||
cycle_data, "loan_interest_rate_tenth_bps", None
|
||||
),
|
||||
loan_interest_rate_tenth_bps=getattr(cycle_data, "loan_interest_rate_tenth_bps", None),
|
||||
end_date=getattr(cycle_data, "end_date", None),
|
||||
)
|
||||
mock_update.assert_called_once_with(
|
||||
db, cycle_data.id, update_data=update_cycle_base
|
||||
)
|
||||
mock_update.assert_called_once_with(db, cycle_data.id, update_data=update_cycle_base)
|
||||
mock_get_loan_event.assert_called_once_with(db, cycle_data.id, today)
|
||||
|
||||
|
||||
def test_accrual_interest_service_cycle_not_found() -> None:
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch("trading_journal.crud.get_cycle_by_id", return_value=None) as mock_get_cycle,
|
||||
):
|
||||
with pytest.raises(service.CycleNotFoundError) as exc_info:
|
||||
service.accrual_interest_service(db, cycle_id=1)
|
||||
assert str(exc_info.value) == "Cycle not found"
|
||||
mock_get_cycle.assert_called_once_with(db, 1)
|
||||
|
||||
|
||||
def test_accrual_interest_service_success() -> None:
|
||||
today = datetime.now(timezone.utc).date()
|
||||
cycle = SimpleNamespace(
|
||||
id=1,
|
||||
user_id=1,
|
||||
friendly_name="Test Cycle",
|
||||
status="OPEN",
|
||||
funding_source="LOAN",
|
||||
loan_amount_cents=200000,
|
||||
loan_interest_rate_tenth_bps=500, # 0.5%
|
||||
start_date=today - timedelta(days=10),
|
||||
)
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch("trading_journal.crud.get_cycle_by_id", return_value=cycle) as mock_get_cycle,
|
||||
patch(
|
||||
"trading_journal.crud.create_cycle_daily_accrual",
|
||||
return_value=None,
|
||||
) as mock_accrual_interest,
|
||||
):
|
||||
service.accrual_interest_service(db, cycle_id=1)
|
||||
mock_get_cycle.assert_called_once_with(db, 1)
|
||||
mock_accrual_interest.assert_called_once_with(db, cycle_id=1, accrual_date=today, accrual_amount_cents=3)
|
||||
|
||||
|
||||
# --- Trade services ----------------------------------------------------------
|
||||
def test_create_trade_short_option_no_strike() -> None:
|
||||
trade_data = dto.TradeCreate(
|
||||
@@ -1058,10 +1008,7 @@ def test_create_trade_short_option_no_strike() -> None:
|
||||
):
|
||||
with pytest.raises(service.InvalidTradeDataError) as exc_info:
|
||||
service.create_trade_service(db, 1, trade_data)
|
||||
assert (
|
||||
str(exc_info.value)
|
||||
== "Invalid trade data: expiry_date and strike_price_cents are required for SELL_PUT and SELL_CALL trades"
|
||||
)
|
||||
assert str(exc_info.value) == "Invalid trade data: expiry_date and strike_price_cents are required for SELL_PUT and SELL_CALL trades"
|
||||
|
||||
|
||||
def test_create_trade_success() -> None:
|
||||
@@ -1104,9 +1051,7 @@ def test_create_trade_success() -> None:
|
||||
)
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.create_trade", return_value=created_trade
|
||||
) as mock_create_trade,
|
||||
patch("trading_journal.crud.create_trade", return_value=created_trade) as mock_create_trade,
|
||||
):
|
||||
trade_out = service.create_trade_service(db, user_id=1, trade_data=trade_data)
|
||||
assert trade_out.id == created_trade.id
|
||||
@@ -1115,18 +1060,10 @@ def test_create_trade_success() -> None:
|
||||
assert trade_out.trade_type == created_trade.trade_type
|
||||
mock_create_trade.assert_called_once()
|
||||
_, kwargs = mock_create_trade.call_args
|
||||
passed_trade = kwargs.get("trade_data") or (
|
||||
mock_create_trade.call_args[0][1]
|
||||
if len(mock_create_trade.call_args[0]) > 1
|
||||
else None
|
||||
)
|
||||
passed_trade = kwargs.get("trade_data") or (mock_create_trade.call_args[0][1] if len(mock_create_trade.call_args[0]) > 1 else None)
|
||||
assert passed_trade is not None
|
||||
# expected for SELL_PUT: gross = quantity * price * quantity_multiplier (positive), net = gross - commission
|
||||
expected_gross = (
|
||||
trade_data.quantity
|
||||
* trade_data.price_cents
|
||||
* (trade_data.quantity_multiplier or 1)
|
||||
)
|
||||
expected_gross = trade_data.quantity * trade_data.price_cents * (trade_data.quantity_multiplier or 1)
|
||||
expected_net = expected_gross - trade_data.commission_cents
|
||||
assert getattr(passed_trade, "gross_cash_flow_cents", None) == expected_gross
|
||||
assert getattr(passed_trade, "net_cash_flow_cents", None) == expected_net
|
||||
@@ -1147,9 +1084,7 @@ def test_get_trade_by_id_not_found_owner_mismatch() -> None:
|
||||
existing_trade = SimpleNamespace(id=2, user_id=2)
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_trade_by_id", return_value=existing_trade
|
||||
) as mock_get,
|
||||
patch("trading_journal.crud.get_trade_by_id", return_value=existing_trade) as mock_get,
|
||||
):
|
||||
with pytest.raises(service.TradeNotFoundError) as exc_info:
|
||||
service.get_trade_by_id_service(db, user_id=1, trade_id=2)
|
||||
@@ -1186,9 +1121,7 @@ def test_get_trade_by_id_success() -> None:
|
||||
)
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_trade_by_id", return_value=trade_obj
|
||||
) as mock_get,
|
||||
patch("trading_journal.crud.get_trade_by_id", return_value=trade_obj) as mock_get,
|
||||
):
|
||||
res = service.get_trade_by_id_service(db, user_id=1, trade_id=10)
|
||||
assert res.id == trade_obj.id
|
||||
@@ -1204,9 +1137,7 @@ def test_update_trade_friendly_name_not_found() -> None:
|
||||
patch("trading_journal.crud.get_trade_by_id", return_value=None) as mock_get,
|
||||
):
|
||||
with pytest.raises(service.TradeNotFoundError) as exc_info:
|
||||
service.update_trade_friendly_name_service(
|
||||
db, user_id=1, trade_id=10, friendly_name="New Name"
|
||||
)
|
||||
service.update_trade_friendly_name_service(db, user_id=1, trade_id=10, friendly_name="New Name")
|
||||
assert str(exc_info.value) == "Trade not found"
|
||||
mock_get.assert_called_once_with(db, 10)
|
||||
|
||||
@@ -1215,14 +1146,10 @@ def test_update_trade_friendly_name_owner_mismatch_raises() -> None:
|
||||
existing_trade = SimpleNamespace(id=10, user_id=2) # owned by another user
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_trade_by_id", return_value=existing_trade
|
||||
) as mock_get,
|
||||
patch("trading_journal.crud.get_trade_by_id", return_value=existing_trade) as mock_get,
|
||||
):
|
||||
with pytest.raises(service.TradeNotFoundError) as exc_info:
|
||||
service.update_trade_friendly_name_service(
|
||||
db, user_id=1, trade_id=10, friendly_name="New Name"
|
||||
)
|
||||
service.update_trade_friendly_name_service(db, user_id=1, trade_id=10, friendly_name="New Name")
|
||||
assert str(exc_info.value) == "Trade not found"
|
||||
mock_get.assert_called_once_with(db, 10)
|
||||
|
||||
@@ -1253,22 +1180,16 @@ def test_update_trade_friendly_name_success() -> None:
|
||||
notes="ok",
|
||||
cycle_id=None,
|
||||
)
|
||||
updated_trade = SimpleNamespace(
|
||||
**{**existing_trade.__dict__, "friendly_name": "New Friendly"}
|
||||
)
|
||||
updated_trade = SimpleNamespace(**{**existing_trade.__dict__, "friendly_name": "New Friendly"})
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_trade_by_id", return_value=existing_trade
|
||||
) as mock_get,
|
||||
patch("trading_journal.crud.get_trade_by_id", return_value=existing_trade) as mock_get,
|
||||
patch(
|
||||
"trading_journal.crud.update_trade_friendly_name",
|
||||
return_value=updated_trade,
|
||||
) as mock_update,
|
||||
):
|
||||
res = service.update_trade_friendly_name_service(
|
||||
db, user_id=1, trade_id=10, friendly_name="New Friendly"
|
||||
)
|
||||
res = service.update_trade_friendly_name_service(db, user_id=1, trade_id=10, friendly_name="New Friendly")
|
||||
assert res.friendly_name == "New Friendly"
|
||||
mock_get.assert_called_once_with(db, 10)
|
||||
mock_update.assert_called_once_with(db, 10, "New Friendly")
|
||||
@@ -1289,9 +1210,7 @@ def test_update_trade_note_owner_mismatch_raises() -> None:
|
||||
existing_trade = SimpleNamespace(id=20, user_id=2)
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_trade_by_id", return_value=existing_trade
|
||||
) as mock_get,
|
||||
patch("trading_journal.crud.get_trade_by_id", return_value=existing_trade) as mock_get,
|
||||
):
|
||||
with pytest.raises(service.TradeNotFoundError) as exc_info:
|
||||
service.update_trade_note_service(db, user_id=1, trade_id=20, note="x")
|
||||
@@ -1328,12 +1247,8 @@ def test_update_trade_note_success_and_none_becomes_empty() -> None:
|
||||
updated_trade = SimpleNamespace(**{**existing_trade.__dict__, "notes": ""})
|
||||
with (
|
||||
FakeDBFactory().get_session_ctx_manager() as db,
|
||||
patch(
|
||||
"trading_journal.crud.get_trade_by_id", return_value=existing_trade
|
||||
) as mock_get,
|
||||
patch(
|
||||
"trading_journal.crud.update_trade_note", return_value=updated_trade
|
||||
) as mock_update,
|
||||
patch("trading_journal.crud.get_trade_by_id", return_value=existing_trade) as mock_get,
|
||||
patch("trading_journal.crud.update_trade_note", return_value=updated_trade) as mock_update,
|
||||
):
|
||||
res = service.update_trade_note_service(db, user_id=1, trade_id=20, note=None)
|
||||
assert res.notes == ""
|
||||
|
||||
Reference in New Issue
Block a user