@marcos_feitoza/personal-finance-backen-trades-assets 1.0.4 → 1.1.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.1.1](https://github.com/MarcosOps/personal-finance-backend-trades-assets/compare/v1.1.0...v1.1.1) (2025-11-26)
+
+
+### Bug Fixes
+
+* update logs ([5bfcc96](https://github.com/MarcosOps/personal-finance-backend-trades-assets/commit/5bfcc965be907ec04583dc86e8a04caeb1ef8cb5))
+
+# [1.1.0](https://github.com/MarcosOps/personal-finance-backend-trades-assets/compare/v1.0.4...v1.1.0) (2025-11-25)
+
+
+### Features
+
+* add Schema for updating a Trade ([315b157](https://github.com/MarcosOps/personal-finance-backend-trades-assets/commit/315b157d5de5d5db82570fc941fb117a80f4cbfe))
+
 ## [1.0.4](https://github.com/MarcosOps/personal-finance-backend-trades-assets/compare/v1.0.3...v1.0.4) (2025-11-21)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@marcos_feitoza/personal-finance-backen-trades-assets",
-    "version": "1.0.4",
+    "version": "1.1.1",
     "publishConfig": {
         "access": "public"
     },

package/personal_finance_trades_assets/routers/trades.py

@@ -1,16 +1,15 @@
 from fastapi import APIRouter, Depends, HTTPException
 from sqlalchemy.orm import Session
+from datetime import datetime
 from personal_finance_shared import models, schemas, crud
 from personal_finance_shared.database import get_db
-import logging
 import requests
 import os
 import httpx
 from personal_finance_shared.dependencies import get_current_user, get_current_token
+from personal_finance_shared.logging_utils import get_logger, REQUEST_ID_CTX
 
-
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_logger("personal_finance_trades_assets.routers.trades")
 
 router = APIRouter(
     prefix="/api/trades",
@@ -20,18 +19,6 @@ router = APIRouter(
 MARKET_DATA_SERVICE_URL = os.getenv("MARKET_DATA_SERVICE_URL", "http://personal-finance-backend-market-data.app.svc.cluster.local:8000")
 BALANCE_SERVICE_URL = os.getenv("BALANCE_SERVICE_URL", "http://personal-finance-backend-balance-service.app.svc.cluster.local:8000")
 
-def _get_asset_details_from_service(symbol: str) -> dict:
-    """Fetches asset details from the market-data service."""
-    try:
-        url = f"{MARKET_DATA_SERVICE_URL}/api/market-data/details/{symbol.upper()}"
-        logger.info(f"Fetching details from: {url}")
-        response = requests.post(url, timeout=10)
-        response.raise_for_status()
-        return response.json()
-    except requests.exceptions.RequestException as e:
-        logger.error(f"Error calling market-data service for {symbol}: {e}")
-        return {}
-
 @router.post("/", response_model=schemas.TradeResponse)
 async def create_trade(
     trade: schemas.TradeCreate, 
@@ -39,64 +26,72 @@ async def create_trade(
     current_user: models.User = Depends(get_current_user),
     token: str = Depends(get_current_token)
 ):
+    correlation_id = REQUEST_ID_CTX.get()
     trade_symbol = trade.symbol.upper()
-    logger.info(f"Processing trade for user {current_user.id}, symbol: {trade_symbol}")
+    logger.info("Processing trade", extra={'user_id': current_user.id, 'symbol': trade_symbol, 'trade_data': trade.dict()})
 
-    # Search for the asset globally, not by user_id
     db_asset = db.query(models.Asset).filter(
         models.Asset.symbol == trade_symbol
     ).first()
 
     if not db_asset:
-        logger.info(f"Asset with symbol {trade_symbol} not found globally. Creating new asset...")
+        logger.info("Asset not found globally, creating new asset", extra={'user_id': current_user.id, 'symbol': trade_symbol})
         db_asset = models.Asset(
             symbol=trade_symbol,
             name=trade.name,
             asset_type=trade.asset_type,
             industry=trade.industry,
             id_crypto=trade.id_crypto if hasattr(trade, 'id_crypto') else None,
-            # user_id is no longer part of Asset model
         )
         db.add(db_asset)
         db.commit()
         db.refresh(db_asset)
-        logger.info(f"Created new global asset with ID: {db_asset.id}")
+        logger.info("Created new global asset", extra={'user_id': current_user.id, 'asset_id': db_asset.id, 'symbol': db_asset.symbol})
     else:
-        logger.info(f"Found existing global asset with ID: {db_asset.id}")
+        logger.info("Found existing global asset", extra={'user_id': current_user.id, 'asset_id': db_asset.id, 'symbol': db_asset.symbol})
 
     if trade.trade_type == 'buy':
         investment_account_name = trade.investment_account
         trade_cost = trade.shares * trade.price
         current_balance = 0
         headers = {"Authorization": f"Bearer {token}"}
+        if correlation_id:
+            headers["X-Correlation-ID"] = correlation_id
         try:
             async with httpx.AsyncClient() as client:
                 response = await client.get(f"{BALANCE_SERVICE_URL}/api/balance/{investment_account_name}", headers=headers)
                 response.raise_for_status()
                 data = response.json()
                 current_balance = data['balance']
-                logger.info(f"Calculated cash balance for '{investment_account_name}' is {current_balance}")
+                logger.info("Calculated cash balance for account", extra={'user_id': current_user.id, 'account': investment_account_name, 'balance': current_balance})
         except Exception as e:
-            logger.error(f"Could not retrieve balance for validation for user {current_user.id}: {e}")
+            logger.error("Could not retrieve balance for validation", extra={'user_id': current_user.id, 'error': str(e), 'account': investment_account_name})
 
         if float(current_balance) < float(trade_cost):
-            logger.warning(f"Insufficient funds in '{investment_account_name}' for user {current_user.id}. Balance: {current_balance}, Required: {trade_cost}")
+            error_detail = f"Insufficient cash balance in '{investment_account_name}'. Balance: {current_balance}, Required: {trade_cost}"
+            logger.warning("Insufficient funds for trade", extra={'user_id': current_user.id, 'account': investment_account_name, 'balance': current_balance, 'required': trade_cost})
             raise HTTPException(
                 status_code=400,
-                detail=f"Insufficient cash balance in '{investment_account_name}' to complete trade."
+                detail=error_detail
             )
 
     trade_data = trade.dict(exclude={'symbol', 'name', 'asset_type', 'industry', 'id_crypto'})
     db_trade = models.Trade(**trade_data, asset_id=db_asset.id, user_id=current_user.id)
     
     if db_trade.trade_type == 'buy':
-        logger.info(f"STOCK PURCHASE for user {current_user.id}: Bought {db_trade.shares} shares of {trade_symbol} at ${db_trade.price:.2f} each.")
+        logger.info("STOCK PURCHASE recorded", extra={'user_id': current_user.id, 'shares': db_trade.shares, 'symbol': trade_symbol, 'price': db_trade.price})
     elif db_trade.trade_type == 'sell':
-        logger.info(f"STOCK SALE for user {current_user.id}: Sold {db_trade.shares} shares of {trade_symbol} at ${db_trade.price:.2f} each.")
+        logger.info("STOCK SALE recorded", extra={'user_id': current_user.id, 'shares': db_trade.shares, 'symbol': trade_symbol, 'price': db_trade.price})
 
     db.add(db_trade)
     db.commit()
     db.refresh(db_trade)
+    logger.info("Trade created successfully", extra={'user_id': current_user.id, 'trade_id': db_trade.id})
+
+    # Get and log asset summary after trade
+    account_summary = crud.get_account_summary(db=db, user_id=current_user.id, account_name=trade.investment_account)
+    logger.info("Account asset summary after trade", extra={'user_id': current_user.id, 'account': trade.investment_account, 'summary': account_summary})
+
     return db_trade
 
 @router.get("/", response_model=list[schemas.TradeResponse])
@@ -107,11 +102,41 @@ def read_trades(
     db: Session = Depends(get_db),
     current_user: models.User = Depends(get_current_user)
 ):
-    logger.info(f"Reading trades for user {current_user.id}, account: {investment_account}")
-    query = db.query(models.Trade).filter(models.Trade.user_id == current_user.id)
+    logger.info("Reading trades", extra={'user_id': current_user.id, 'account': investment_account, 'skip': skip, 'limit': limit})
+    query = db.query(models.Trade).filter(
+        
+        models.Trade.user_id == current_user.id,
+        models.Trade.deleted_at.is_(None) # Filter out soft-deleted trades
+    ,
+        models.Trade.deleted_at.is_(None) # Filter out soft-deleted trades
+    )
     if investment_account:
         query = query.filter(models.Trade.investment_account == investment_account)
     
     trades = query.order_by(models.Trade.date.desc()).offset(skip).limit(limit).all()
-    logger.info(f"Found {len(trades)} trades for user {current_user.id}")
-    return trades
+    logger.info("Trades found", extra={'user_id': current_user.id, 'count': len(trades), 'account': investment_account})
+    return trades
+
+@router.delete("/{trade_id}", response_model=schemas.TradeResponse)
+def delete_trade(
+    trade_id: int,
+    db: Session = Depends(get_db),
+    current_user: models.User = Depends(get_current_user)
+):
+    logger.info(f"Attempting soft-delete for trade ID: {trade_id} by user: {current_user.id}")
+    db_trade = db.query(models.Trade).filter(
+        models.Trade.id == trade_id,
+        models.Trade.user_id == current_user.id,
+        models.Trade.deleted_at.is_(None) # Ensure it's not already deleted
+    ).first()
+
+    if not db_trade:
+        logger.warning(f"Trade ID: {trade_id} not found or already deleted for user: {current_user.id}")
+        raise HTTPException(status_code=404, detail="Trade not found or already deleted")
+
+    db_trade.deleted_at = datetime.utcnow() # Set deletion timestamp
+    db.add(db_trade)
+    db.commit()
+    db.refresh(db_trade)
+    logger.info(f"Successfully soft-deleted trade ID: {trade_id} for user: {current_user.id}")
+    return db_trade