Open-source personal finance manager. Self-hosted, privacy-first.
fix: prevent date field self-shadowing in AssetTransactionUpdate (#482)
Jyasapara35e7eb3dbe08
diff --git a/backend/app/schemas/asset.py b/backend/app/schemas/asset.pyindex d182853f..b3e50574 100644--- a/backend/app/schemas/asset.py+++ b/backend/app/schemas/asset.py@@ -1,5 +1,5 @@import uuid-from datetime import date, datetime+from datetime import date as _date, datetimefrom decimal import Decimalfrom typing import Optional@@ -12,15 +12,15 @@ class AssetCreate(BaseModel):currency: str = "USD"units: Optional[Decimal] = Nonevaluation_method: str = "manual"- purchase_date: Optional[date] = None+ purchase_date: Optional[_date] = Nonepurchase_price: Optional[Decimal] = None- sell_date: Optional[date] = None+ sell_date: Optional[_date] = Nonesell_price: Optional[Decimal] = Nonecurrent_value: Optional[Decimal] = None # convenience: creates initial AssetValuegrowth_type: Optional[str] = Nonegrowth_rate: Optional[Decimal] = Nonegrowth_frequency: Optional[str] = None- growth_start_date: Optional[date] = None+ growth_start_date: Optional[_date] = Noneis_archived: bool = Falseposition: int = 0group_id: Optional[uuid.UUID] = None@@ -28,7 +28,7 @@ class AssetCreate(BaseModel):# fetches the live quote on create and seeds the first AssetValue.ticker: Optional[str] = Noneticker_exchange: Optional[str] = None- maturity_date: Optional[date] = None+ maturity_date: Optional[_date] = None# Per-unit price for the opening buy of a market-priced holding (preço# médio model, consistent with the transaction ledger). When omitted, the# service seeds the buy at the live quote ("bought at market now").@@ -41,14 +41,14 @@ class AssetUpdate(BaseModel):currency: Optional[str] = Noneunits: Optional[Decimal] = Nonevaluation_method: Optional[str] = None- purchase_date: Optional[date] = None+ purchase_date: Optional[_date] = Nonepurchase_price: Optional[Decimal] = None- sell_date: Optional[date] = None+ sell_date: Optional[_date] = Nonesell_price: Optional[Decimal] = Nonegrowth_type: Optional[str] = Nonegrowth_rate: Optional[Decimal] = Nonegrowth_frequency: Optional[str] = None- growth_start_date: Optional[date] = None+ growth_start_date: Optional[_date] = Noneis_archived: Optional[bool] = Noneposition: Optional[int] = None# Use a sentinel to differentiate "don't change group" (field omitted)@@ -67,14 +67,14 @@ class AssetRead(BaseModel):currency: strunits: Optional[float] = Nonevaluation_method: str- purchase_date: Optional[date] = None+ purchase_date: Optional[_date] = Nonepurchase_price: Optional[float] = None- sell_date: Optional[date] = None+ sell_date: Optional[_date] = Nonesell_price: Optional[float] = Nonegrowth_type: Optional[str] = Nonegrowth_rate: Optional[float] = Nonegrowth_frequency: Optional[str] = None- growth_start_date: Optional[date] = None+ growth_start_date: Optional[_date] = Noneis_archived: boolposition: intcurrent_value: Optional[float] = None@@ -85,7 +85,7 @@ class AssetRead(BaseModel):source: str = "manual"connection_id: Optional[uuid.UUID] = Noneisin: Optional[str] = None- maturity_date: Optional[date] = None+ maturity_date: Optional[_date] = Nonegroup_id: Optional[uuid.UUID] = Noneticker: Optional[str] = Noneticker_exchange: Optional[str] = None@@ -109,7 +109,7 @@ class AssetTransactionCreate(BaseModel):quantity: Decimalprice: Decimalfee: Decimal = Decimal("0")- date: date+ date: _datenotes: Optional[str] = None@@ -118,7 +118,7 @@ class AssetTransactionUpdate(BaseModel):quantity: Optional[Decimal] = Noneprice: Optional[Decimal] = Nonefee: Optional[Decimal] = None- date: Optional[date] = None+ date: Optional[_date] = Nonenotes: Optional[str] = None@@ -129,7 +129,7 @@ class AssetBuyCreate(BaseModel):quantity: Decimalprice: Decimalfee: Decimal = Decimal("0")- date: date+ date: _datename: Optional[str] = Nonegroup_id: Optional[uuid.UUID] = Nonenotes: Optional[str] = None@@ -142,7 +142,7 @@ class AssetTransactionRead(BaseModel):quantity: floatprice: floatfee: float- date: date+ date: _datesource: strnotes: Optional[str] = None# Denormalized holding context so the global transactions tab can render@@ -180,14 +180,14 @@ class MarketSymbolMatch(BaseModel):class AssetValueCreate(BaseModel):amount: Decimal- date: date+ date: _dateclass AssetValueRead(BaseModel):id: uuid.UUIDasset_id: uuid.UUIDamount: float- date: date+ date: _datesource: strmodel_config = ConfigDict(from_attributes=True)diff --git a/backend/tests/test_asset_transactions_api.py b/backend/tests/test_asset_transactions_api.pyindex 50b86860..5ae616dc 100644--- a/backend/tests/test_asset_transactions_api.py+++ b/backend/tests/test_asset_transactions_api.py@@ -103,6 +103,39 @@ async def test_update_and_delete_transaction_via_api(assert r.json()["average_price"] is None+async def test_update_transaction_all_fields_via_api(+ client: AsyncClient, auth_headers: dict, market_asset_api: Asset+):+ r = await client.post(+ f"/api/assets/{market_asset_api.id}/transactions",+ headers=auth_headers,+ json={"kind": "buy", "quantity": 10, "price": 20, "date": "2026-01-01"},+ )+ assert r.status_code == 201+ tx_id = (+ await client.get(f"/api/assets/{market_asset_api.id}/transactions", headers=auth_headers)+ ).json()[0]["id"]++ r = await client.patch(+ f"/api/assets/transactions/{tx_id}",+ headers=auth_headers,+ json={"kind": "buy", "quantity": 119, "price": 43.47, "fee": 0, "date": "2025-04-15"},+ )+ assert r.status_code == 200+ body = r.json()+ assert body["units"] == 119+ assert round(body["average_price"], 2) == 43.47++ r = await client.get(f"/api/assets/{market_asset_api.id}/transactions", headers=auth_headers)+ tx = r.json()[0]+ assert tx["kind"] == "buy"+ assert tx["quantity"] == 119+ assert round(tx["price"], 2) == 43.47+ assert tx["fee"] == 0+ assert tx["date"] == "2025-04-15"++@pytest.mark.asyncioasync def test_buy_consolidates_existing_ticker_via_api(client: AsyncClient, auth_headers: dict, session: AsyncSession, market_asset_api: Asset