@marcos_feitoza/personal-finance-backen-trades-assets 1.1.0 → 1.2.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.2.0](https://github.com/MarcosOps/personal-finance-backend-trades-assets/compare/v1.1.1...v1.2.0) (2025-11-28)
+
+
+### Features
+
+* add confirmation dialog for deletion operations ([1a568c8](https://github.com/MarcosOps/personal-finance-backend-trades-assets/commit/1a568c880a79b438dd421e9314b5785c88db6c36))
+* update readme.me ([82c5d27](https://github.com/MarcosOps/personal-finance-backend-trades-assets/commit/82c5d279aeea11ca73103178c84727c1a0d33e7a))
+
+## [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)
 
 

package/README.md

@@ -1,22 +1,34 @@
-# Biblioteca de Trades e Ativos - Personal Finance
+# Biblioteca de Trades e Ativos - Personal Finance Backend
 
-Este projeto contém a lógica de negócios específica para o gerenciamento de `Trades` (transações de compra/venda) e `Assets` (ativos como ações, ETFs, etc.).
+Este projeto contém a lógica de negócios e os modelos de dados específicos para o gerenciamento de `Trades` (transações de compra/venda de ativos) e `Assets` (ativos como ações, criptomoedas, etc.).
 
 ## Propósito
 
-Esta biblioteca encapsula as regras para criar e validar trades. Sua principal responsabilidade é, ao receber um novo trade para um símbolo de ação que ainda não existe no banco de dados, buscar os detalhes desse ativo (nome, setor, etc.) usando uma API externa e salvá-lo corretamente.
+O objetivo desta biblioteca é encapsular toda a lógica de criação, leitura, atualização e exclusão (soft-delete) de trades e ativos. Ela interage com serviços externos (como o `market-data-service` para buscar detalhes de ativos) e com o banco de dados via `personal-finance-backend-shared`.
+
+## Conteúdo Principal
+
+- **`routers/trades.py`**: Define endpoints para a criação, listagem e exclusão (soft-delete) de trades.
+- **`routers/assets.py`**: Define endpoints para a listagem e gerenciamento de ativos.
 
 ## Tecnologias
 
-- **Busca de Dados:** Usa a biblioteca `yfinance` para buscar os detalhes de novos ativos.
-- **Banco de Dados:** Interage com o banco de dados através da `personal-finance-backend-shared`.
+- **Framework**: FastAPI (seus routers são usados por outros serviços)
+- **Busca de Dados Externos**: Utiliza `httpx` para comunicação com o `market-data-service`.
+- **Banco de Dados**: Interage com o PostgreSQL através da `personal-finance-backend-shared`.
+- **Dependências Locais**:
+  - `personal-finance-backend-shared`: Para acesso aos modelos, `crud` e utilitários.
 
-## Como Usar
+---
 
-Este projeto não é um serviço executável. Ele é projetado para ser instalado como uma dependência local pelo serviço principal (`core-transactions-service`).
+## Como Usar (Instalação como Dependência)
 
-No `requirements.txt` do serviço principal, adicione a seguinte linha para incluí-lo:
+Este projeto não é um serviço executável por si só. Ele é projetado para ser instalado como uma dependência local por outros serviços do backend (ex: `personal-finance-backend-core`).
+
+Para incluir esta biblioteca como uma dependência editável em outro serviço (por exemplo, no `requirements.txt` do `personal-finance-backend-core`), adicione a seguinte linha no `requirements.txt` do serviço consumidor:
 
 ```
--e ./trades-assets-library
+-e ./personal-finance-backend-trades-assets
 ```
+
+**Importante:** Certifique-se de que o contexto de build do Docker (`Dockerfile`) ou o script de build (`dockerbuild.sh`) do serviço consumidor está copiando corretamente o diretório `personal-finance-backend-trades-assets` para o local esperado para que o `pip install -e` funcione.

package/package.json

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

package/personal_finance_trades_assets/routers/trades.py

@@ -3,15 +3,13 @@ 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",
@@ -21,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, 
@@ -40,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': float(db_trade.shares), 'symbol': trade_symbol, 'price': float(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': float(db_trade.shares), 'symbol': trade_symbol, 'price': float(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])
@@ -108,16 +102,16 @@ 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}")
+    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)
     )
     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}")
+    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)
@@ -126,20 +120,20 @@ def delete_trade(
     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}")
+    logger.info("Attempting soft-delete for trade", extra={'user_id': current_user.id, 'trade_id': trade_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
+        models.Trade.deleted_at.is_(None)
     ).first()
 
     if not db_trade:
-        logger.warning(f"Trade ID: {trade_id} not found or already deleted for user: {current_user.id}")
+        logger.warning("Trade not found or already deleted for soft-delete", extra={'user_id': current_user.id, 'trade_id': trade_id})
         raise HTTPException(status_code=404, detail="Trade not found or already deleted")
 
-    db_trade.deleted_at = datetime.utcnow() # Set deletion timestamp
+    db_trade.deleted_at = datetime.utcnow()
     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}")
+    logger.info("Successfully soft-deleted trade", extra={'user_id': current_user.id, 'trade_id': trade_id})
     return db_trade