@marcos_feitoza/personal-finance-backen-trades-assets 1.0.1 → 1.0.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.0.3](https://github.com/MarcosOps/personal-finance-backend-trades-assets/compare/v1.0.2...v1.0.3) (2025-11-11)
+
+
+### Bug Fixes
+
+* crypto symbol working ([9c61bf9](https://github.com/MarcosOps/personal-finance-backend-trades-assets/commit/9c61bf91b382fc7563985c1973fc6a37e9e361c1))
+
+## [1.0.2](https://github.com/MarcosOps/personal-finance-backend-trades-assets/compare/v1.0.1...v1.0.2) (2025-10-17)
+
+
+### Bug Fixes
+
+* invest working ([d0ca897](https://github.com/MarcosOps/personal-finance-backend-trades-assets/commit/d0ca897cf8018aeecd2c10d037d94e987e241a58))
+
 ## [1.0.1](https://github.com/MarcosOps/personal-finance-backend-trades-assets/compare/v1.0.0...v1.0.1) (2025-09-24)
 
 

package/package.json

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

package/personal_finance_trades_assets/routers/assets.py

@@ -18,7 +18,13 @@ def create_asset(asset: schemas.AssetCreate, db: Session = Depends(get_db)):
     db_asset = db.query(models.Asset).filter(models.Asset.symbol == asset.symbol).first()
     if db_asset:
         raise HTTPException(status_code=400, detail="Asset with this symbol already exists")
-    db_asset = models.Asset(**asset.dict())
+    db_asset = models.Asset(
+        symbol=asset.symbol,
+        name=asset.name,
+        asset_type=asset.asset_type,
+        industry=asset.industry,
+        id_crypto=asset.id_crypto
+    )
     db.add(db_asset)
     db.commit()
     db.refresh(db_asset)

package/personal_finance_trades_assets/routers/trades.py

@@ -5,6 +5,7 @@ from personal_finance_shared.database import get_db
 import logging
 import requests
 import os
+import httpx
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -14,79 +15,68 @@ router = APIRouter(
     tags=["trades"],
 )
 
-MARKET_DATA_SERVICE_URL = os.getenv("MARKET_DATA_SERVICE_URL", "http://personal-finance-backend-market-data:8000")
+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) # Using POST as per the new endpoint
-        response.raise_for_status() # Raises HTTPError for bad responses (4xx or 5xx)
+        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)
-def create_trade(trade: schemas.TradeCreate, db: Session = Depends(get_db)):
+async def create_trade(trade: schemas.TradeCreate, db: Session = Depends(get_db)):
     trade_symbol = trade.symbol.upper()
     logger.info(f"Processing trade for symbol: {trade_symbol}")
 
-    # Check if asset exists with the provided symbol or its canonical variations
     db_asset = db.query(models.Asset).filter(models.Asset.symbol == trade_symbol).first()
-    if not db_asset and '.' not in trade_symbol:
-        db_asset = db.query(models.Asset).filter(models.Asset.symbol == f"{trade_symbol}.TO").first()
 
     if not db_asset:
-        logger.info(f"Asset with symbol {trade_symbol} not found. Fetching details...")
-        
-        asset_details = _get_asset_details_from_service(trade_symbol)
-        canonical_symbol = asset_details.get("canonical_symbol", trade_symbol)
-
-        # Double-check if an asset with the canonical symbol already exists
-        db_asset = db.query(models.Asset).filter(models.Asset.symbol == canonical_symbol).first()
-
-        if not db_asset:
-            logger.info(f"Creating new asset with canonical symbol: {canonical_symbol}")
-            db_asset = models.Asset(
-                symbol=canonical_symbol,
-                name=asset_details.get("name", canonical_symbol),
-                asset_type=asset_details.get("asset_type", "Unknown"),
-                industry=asset_details.get("industry", "N/A")
-            )
-            db.add(db_asset)
-            db.commit()
-            db.refresh(db_asset)
-            logger.info(f"Created new asset with ID: {db_asset.id}")
-        else:
-            logger.info(f"Found existing asset with canonical symbol: {canonical_symbol}")
+        logger.info(f"Asset with symbol {trade_symbol} not found. Creating new asset...")
+        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
+        )
+        db.add(db_asset)
+        db.commit()
+        db.refresh(db_asset)
+        logger.info(f"Created new asset with ID: {db_asset.id}")
     else:
         logger.info(f"Found existing asset with ID: {db_asset.id}")
 
-    # --- Balance Validation for 'buy' trades ---
     if trade.trade_type == 'buy':
         investment_account_name = trade.investment_account
         trade_cost = trade.shares * trade.price
-        
-        current_balance = crud.get_investment_account_balance(db=db, account_name=investment_account_name)
-        logger.info(f"Calculated cash balance for '{investment_account_name}' is {current_balance}")
-
-        if current_balance < trade_cost:
+        current_balance = 0
+        try:
+            async with httpx.AsyncClient() as client:
+                response = await client.get(f"{BALANCE_SERVICE_URL}/api/balance/{investment_account_name}")
+                response.raise_for_status()
+                data = response.json()
+                current_balance = data['balance']
+                logger.info(f"Calculated cash balance for '{investment_account_name}' is {current_balance}")
+        except Exception as e:
+            logger.error(f"Could not retrieve balance for validation: {e}")
+
+        if float(current_balance) < float(trade_cost):
             logger.warning(f"Insufficient funds in '{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."
             )
-    # --- End Validation Logic ---
 
-    # Create the trade record, linking it to the asset via asset_id
-    trade_data = trade.dict(exclude={'symbol', 'name', 'asset_type', 'industry'})
+    trade_data = trade.dict(exclude={'symbol', 'name', 'asset_type', 'industry', 'id_crypto'})
     db_trade = models.Trade(**trade_data, asset_id=db_asset.id)
     
-    # Log for stock purchase/sale
     if db_trade.trade_type == 'buy':
         logger.info(f"STOCK PURCHASE: Bought {db_trade.shares} shares of {trade_symbol} at ${db_trade.price:.2f} each.")
     elif db_trade.trade_type == 'sell':
@@ -111,4 +101,4 @@ def read_trades(
     
     trades = query.order_by(models.Trade.date.desc()).offset(skip).limit(limit).all()
     logger.info(f"Found {len(trades)} trades")
-    return trades
+    return trades