Merge pull request #48 from dat515-2025/47-move-the-currency-api-and-mock-bank-to-backend

fix(tests): fixed test runtime errors regarding database connection

.github/workflows/deploy-pr.yaml

@@ -85,6 +85,7 @@ jobs:
           DOMAIN_SCHEME: "${{ needs.get_urls.outputs.backend_url_scheme }}"
           FRONTEND_DOMAIN: "${{ needs.get_urls.outputs.frontend_url }}"
           FRONTEND_DOMAIN_SCHEME: "${{ needs.get_urls.outputs.frontend_url_scheme }}"
+          UNIRATE_API_KEY: ${{ secrets.UNIRATE_API_KEY }}
         run: |
           PR=${{ github.event.pull_request.number }}
           RELEASE=myapp-pr-$PR
@@ -102,7 +103,8 @@ jobs:
             --set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
             --set-string database.password="$DB_PASSWORD" \
             --set-string database.encryptionSecret="$PR" \
-            --set-string app.name="finance-tracker-pr-$PR"
+            --set-string app.name="finance-tracker-pr-$PR" \
+            --set-string unirate.key="$UNIRATE_API_KEY"
 
       - name: Post preview URLs as PR comment
         uses: actions/github-script@v7

.github/workflows/deploy-prod.yaml

@@ -99,6 +99,7 @@ jobs:
           SMTP_USE_TLS: ${{ secrets.SMTP_USE_TLS }}
           SMTP_USE_SSL: ${{ secrets.SMTP_USE_SSL }}
           SMTP_FROM: ${{ secrets.SMTP_FROM }}
+          UNIRATE_API_KEY: ${{ secrets.UNIRATE_API_KEY }}
         run: |
           helm upgrade --install myapp ./7project/charts/myapp-chart \
             -n prod --create-namespace \
@@ -125,4 +126,5 @@ jobs:
             --set-string smtp.password="$SMTP_PASSWORD" \
             --set-string smtp.tls="$SMTP_USE_TLS" \
             --set-string smtp.ssl="$SMTP_USE_SSL" \
-            --set-string smtp.from="$SMTP_FROM"
+            --set-string smtp.from="$SMTP_FROM" \
+            --set-string unirate.key="$UNIRATE_API_KEY"

.github/workflows/run-tests.yml

@@ -31,6 +31,9 @@ jobs:
       MARIADB_DB: group_project
       MARIADB_USER: appuser
       MARIADB_PASSWORD: apppass
+      # Ensure the application uses MariaDB (async) during tests
+      DATABASE_URL: mysql+asyncmy://appuser:apppass@127.0.0.1:3306/group_project
+      DISABLE_METRICS: "1"
 
     steps:
       - name: Check out repository code

7project/backend/app/api/exchange_rates.py

@@ -0,0 +1,66 @@
+import os
+from typing import List
+
+import httpx
+from fastapi import APIRouter, HTTPException, Query, status
+
+router = APIRouter(prefix="/exchange-rates", tags=["exchange-rates"]) 
+
+
+@router.get("/", status_code=status.HTTP_200_OK)
+async def get_exchange_rates(symbols: str = Query("EUR,USD,NOK", description="Comma-separated currency codes to fetch vs CZK")):
+    """
+    Fetch exchange rates from UniRate API on the backend and return CZK-per-target rates.
+    - Always requests CZK in addition to requested symbols to compute conversion from USD-base.
+    - Returns a list of {currencyCode, rate} where rate is CZK per 1 unit of the target currency.
+    """
+    api_key = os.getenv("UNIRATE_API_KEY")
+    if not api_key:
+        raise HTTPException(status_code=500, detail="Server is not configured with UNIRATE_API_KEY")
+
+    # Ensure CZK is included for conversion
+    requested = [s.strip().upper() for s in symbols.split(",") if s.strip()]
+    if "CZK" not in requested:
+        requested.append("CZK")
+    query_symbols = ",".join(sorted(set(requested)))
+
+    url = f"https://unirateapi.com/api/rates?api_key={api_key}&symbols={query_symbols}"
+
+    try:
+        async with httpx.AsyncClient(timeout=httpx.Timeout(15.0)) as client:
+            resp = await client.get(url)
+            if resp.status_code != httpx.codes.OK:
+                raise HTTPException(status_code=502, detail=f"Upstream UniRate error: HTTP {resp.status_code}")
+            data = resp.json()
+    except httpx.HTTPError as e:
+        raise HTTPException(status_code=502, detail=f"Failed to contact UniRate: {str(e)}")
+
+    # Validate response structure
+    rates = data.get("rates") if isinstance(data, dict) else None
+    base = data.get("base") if isinstance(data, dict) else None
+    if not rates or base != "USD" or "CZK" not in rates:
+        # Prefer upstream message when available
+        detail = data.get("message") if isinstance(data, dict) else None
+        if not detail and isinstance(data, dict):
+            err = data.get("error")
+            if isinstance(err, dict):
+                detail = err.get("info")
+        raise HTTPException(status_code=502, detail=detail or "Invalid response from UniRate API")
+
+    czk_per_usd = rates["CZK"]
+
+    # Build result excluding CZK itself
+    result = []
+    for code in requested:
+        if code == "CZK":
+            continue
+        target_per_usd = rates.get(code)
+        if target_per_usd in (None, 0):
+            # Skip unavailable or invalid
+            continue
+        czk_per_target = czk_per_usd / target_per_usd
+        result.append({"currencyCode": code, "rate": czk_per_target})
+
+    return result
+
+

7project/backend/app/api/mock_bank.py

@@ -0,0 +1,143 @@
+from datetime import datetime, timedelta
+from typing import List, Optional
+import random
+
+from fastapi import APIRouter, Depends, Response, status
+from pydantic import BaseModel, Field, conint, confloat, validator
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.services.db import get_async_session
+from app.services.user_service import current_active_user
+from app.models.user import User
+from app.models.transaction import Transaction
+from app.models.categories import Category
+from app.schemas.transaction import TransactionRead
+
+router = APIRouter(prefix="/mock-bank", tags=["mock-bank"])
+
+
+class GenerateOptions(BaseModel):
+    count: conint(strict=True, gt=0) = Field(default=10, description="Number of transactions to generate")
+    minAmount: confloat(strict=True) = Field(default=-200.0, description="Minimum transaction amount")
+    maxAmount: confloat(strict=True) = Field(default=200.0, description="Maximum transaction amount")
+    startDate: Optional[str] = Field(None, description="Earliest date (YYYY-MM-DD)")
+    endDate: Optional[str] = Field(None, description="Latest date (YYYY-MM-DD)")
+    categoryIds: List[int] = Field(default_factory=list, description="Optional category IDs to assign randomly")
+
+    @validator("maxAmount")
+    def _validate_amounts(cls, v, values):
+        min_amt = values.get("minAmount")
+        if min_amt is not None and v < min_amt:
+            raise ValueError("maxAmount must be greater than or equal to minAmount")
+        return v
+
+    @validator("endDate")
+    def _validate_dates(cls, v, values):
+        sd = values.get("startDate")
+        if v and sd:
+            try:
+                ed = datetime.strptime(v, "%Y-%m-%d").date()
+                st = datetime.strptime(sd, "%Y-%m-%d").date()
+            except ValueError:
+                raise ValueError("Invalid date format, expected YYYY-MM-DD")
+            if ed < st:
+                raise ValueError("endDate must be greater than or equal to startDate")
+        return v
+
+
+class GeneratedTransaction(BaseModel):
+    amount: float
+    date: str  # YYYY-MM-DD
+    category_ids: List[int] = []
+    description: Optional[str] = None
+
+
+@router.post("/generate", response_model=List[GeneratedTransaction])
+async def generate_mock_transactions(
+    options: GenerateOptions,
+    user: User = Depends(current_active_user),
+):
+    # Seed randomness per user to make results less erratic across multiple calls in quick succession
+    seed = int(datetime.utcnow().timestamp()) ^ int(user.id)
+    rnd = random.Random(seed)
+
+    # Determine date range
+    if options.startDate:
+        start_date = datetime.strptime(options.startDate, "%Y-%m-%d").date()
+    else:
+        start_date = (datetime.utcnow() - timedelta(days=365)).date()
+    if options.endDate:
+        end_date = datetime.strptime(options.endDate, "%Y-%m-%d").date()
+    else:
+        end_date = datetime.utcnow().date()
+
+    span_days = max(0, (end_date - start_date).days)
+
+    results: List[GeneratedTransaction] = []
+    for _ in range(options.count):
+        amount = round(rnd.uniform(options.minAmount, options.maxAmount), 2)
+        # Pick a random date in the inclusive range
+        rand_day = rnd.randint(0, span_days) if span_days > 0 else 0
+        tx_date = start_date + timedelta(days=rand_day)
+        # Pick category randomly from provided list, or empty
+        if options.categoryIds:
+            cat = [rnd.choice(options.categoryIds)]
+        else:
+            cat = []
+        # Optional simple description for flavor
+        desc = None
+        # Assemble
+        results.append(GeneratedTransaction(
+            amount=amount,
+            date=tx_date.isoformat(),
+            category_ids=cat,
+            description=desc,
+        ))
+
+    return results
+
+
+
+@router.get("/scrape", response_model=Optional[TransactionRead])
+async def scrape_mock_bank(
+    session: AsyncSession = Depends(get_async_session),
+    user: User = Depends(current_active_user),
+):
+    # 95% of the time: nothing to scrape
+    if random.random() < 0.95:
+        return Response(status_code=status.HTTP_204_NO_CONTENT)
+
+    # 5% chance: create a new transaction and return it
+    amount = round(random.uniform(-200.0, 200.0), 2)
+    tx_date = datetime.utcnow().date()
+
+    # Optionally attach a random category owned by this user (if any)
+    res = await session.execute(select(Category).where(Category.user_id == user.id))
+    user_categories = list(res.scalars())
+    chosen_categories = []
+    if user_categories:
+        chosen_categories = [random.choice(user_categories)]
+
+    # Build and persist transaction
+    tx = Transaction(
+        amount=amount,
+        description="Mock bank scrape",
+        user_id=user.id,
+        date=tx_date,
+    )
+    if chosen_categories:
+        tx.categories = chosen_categories
+
+    session.add(tx)
+    await session.commit()
+    await session.refresh(tx)
+    await session.refresh(tx, attribute_names=["categories"])  # ensure categories are loaded
+
+    return TransactionRead(
+        id=tx.id,
+        amount=float(tx.amount),
+        description=tx.description,
+        date=tx.date,
+        category_ids=[c.id for c in (tx.categories or [])],
+    )

7project/backend/app/app.py

@@ -21,6 +21,7 @@ from app.api.auth import router as auth_router
 from app.api.csas import router as csas_router
 from app.api.categories import router as categories_router
 from app.api.transactions import router as transactions_router
+from app.api.exchange_rates import router as exchange_rates_router
 from app.services.user_service import auth_backend, current_active_verified_user, fastapi_users, get_oauth_provider, \
     UserManager, get_jwt_strategy
 from app.core.security import extract_bearer_token, is_token_revoked, decode_and_verify_jwt
@@ -29,7 +30,8 @@ from app.services.user_service import SECRET
 from fastapi import FastAPI
 import sentry_sdk
 from fastapi_users.db import SQLAlchemyUserDatabase
-from app.core.db import async_session_maker
+from app.core.db import async_session_maker, engine
+from app.core.base import Base
 
 sentry_sdk.init(
     dsn=os.getenv("SENTRY_DSN"),
@@ -65,6 +67,9 @@ if not os.getenv("PYTEST_RUN_CONFIG"):
 fastApi.include_router(auth_router)
 fastApi.include_router(categories_router)
 fastApi.include_router(transactions_router)
+fastApi.include_router(exchange_rates_router)
+from app.api.mock_bank import router as mock_bank_router
+fastApi.include_router(mock_bank_router)
 
 for h in list(logging.root.handlers):
     logging.root.removeHandler(h)

7project/charts/myapp-chart/templates/app-deployment.yaml

@@ -90,6 +90,11 @@ spec:
                 secretKeyRef:
                   name: prod
                   key: CSAS_CLIENT_SECRET
+            - name: UNIRATE_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: prod
+                  key: UNIRATE_API_KEY
             - name: DOMAIN
               value: {{ required "Set .Values.domain" .Values.domain | quote }}
             - name: DOMAIN_SCHEME

7project/charts/myapp-chart/templates/prod.yaml

@@ -26,3 +26,4 @@ stringData:
   SMTP_USE_TLS: {{ .Values.smtp.tls | default false | quote }}
   SMTP_USE_SSL: {{ .Values.smtp.ssl | default false | quote }}
   SMTP_FROM: {{ .Values.smtp.from | default "" | quote }}
+  UNIRATE_API_KEY: {{ .Values.unirate.key | default "" | quote }}

7project/charts/myapp-chart/values.yaml

@@ -13,6 +13,9 @@ deployment: ""
 domain: ""
 domain_scheme: ""
 
+unirate:
+  key: ""
+
 frontend_domain: ""
 frontend_domain_scheme: ""
 

7project/frontend/src/pages/Dashboard.tsx

@@ -6,7 +6,7 @@ import BalanceChart from './BalanceChart';
 import ManualManagement from './ManualManagement';
 import CategoryPieChart from './CategoryPieChart';
 import MockBankModal, { type MockGenerationOptions } from './MockBankModal';
-import { BACKEND_URL, VITE_UNIRATE_API_KEY } from '../config';
+import { BACKEND_URL } from '../config';
 
 function formatAmount(n: number) {
   return new Intl.NumberFormat(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(n);
@@ -21,17 +21,6 @@ type RateData = {
   rate: number;
 };
 
-// The part of the API response structure we need
-type UnirateApiResponse = {
-  base: string;
-  rates: { [key: string]: number };
-  // We'll also check for error formats just in case
-  message?: string;
-  error?: {
-    info: string;
-  };
-};
-
 // The currencies you want to display
 const TARGET_CURRENCIES = ['EUR', 'USD', 'NOK'];
 
@@ -45,49 +34,20 @@ function CurrencyRates() {
       setLoading(true);
       setError(null);
 
-      const API_KEY = VITE_UNIRATE_API_KEY;
-
-      // We need to get the CZK rate as well, to use it for conversion
-      const allSymbols = [...TARGET_CURRENCIES, 'CZK'].join(',');
-
-      // We remove the `base` param, as the API seems to force base=USD
-      const UNIRATE_API_URL = `https://unirateapi.com/api/rates?api_key=${API_KEY}&symbols=${allSymbols}`;
-
       try {
-        const res = await fetch(UNIRATE_API_URL);
-        const data: UnirateApiResponse = await res.json();
-
-        // --- THIS IS THE NEW, CORRECTED LOGIC ---
-
-        // 1. Check if the 'rates' object exists. If not, it's an error.
-        if (!data.rates) {
-          let errorMessage = data.message || (data.error ? data.error.info : 'Invalid API response');
-          throw new Error(errorMessage || 'Could not load rates');
-        }
-
-        // 2. Check that we got the base currency (USD) and our conversion currency (CZK)
-        if (data.base !== 'USD' || !data.rates.CZK) {
-          throw new Error('API response is missing required data for conversion (USD or CZK)');
-        }
-
-        // 3. Get our main conversion factor
-        const czkPerUsd = data.rates.CZK; // e.g., 23.0
-
-        // 4. Calculate the rates for our target currencies
-        const formattedRates = TARGET_CURRENCIES.map(code => {
-          const targetPerUsd = data.rates[code]; // e.g., 0.9 for EUR
-
-          // This calculates: (CZK per USD) / (TARGET per USD) = CZK per TARGET
-          // e.g. (23.0 CZK / 1 USD) / (0.9 EUR / 1 USD) = 25.55 CZK / 1 EUR
-          const rate = czkPerUsd / targetPerUsd;
-
-          return {
-            currencyCode: code,
-            rate: rate,
-          };
+        const base = BACKEND_URL.replace(/\/$/, '');
+        const url = `${base}/exchange-rates?symbols=${TARGET_CURRENCIES.join(',')}`;
+        const token = localStorage.getItem('token');
+        const res = await fetch(url, {
+          headers: token ? { Authorization: `Bearer ${token}` } : undefined,
+          credentials: 'include',
         });
-
-        setRates(formattedRates);
+        if (!res.ok) {
+          const text = await res.text();
+          throw new Error(text || `Failed to load rates (${res.status})`);
+        }
+        const data: RateData[] = await res.json();
+        setRates(data);
       } catch (err: any) {
         setError(err.message || 'Could not load rates');
       } finally {
@@ -235,45 +195,51 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
     setIsGenerating(true);
     setMockModalOpen(false);
 
-    const { count, minAmount, maxAmount, startDate, endDate, categoryIds } = options;
-    const newTransactions: Transaction[] = [];
-
-    const startDateTime = new Date(startDate).getTime();
-    const endDateTime = new Date(endDate).getTime();
-
-    for (let i = 0; i < count; i++) {
-      // Generate random data based on user input
-      const amount = parseFloat((Math.random() * (maxAmount - minAmount) + minAmount).toFixed(2));
-
-      const randomTime = Math.random() * (endDateTime - startDateTime) + startDateTime;
-      const date = new Date(randomTime);
-      const dateString = date.toISOString().split('T')[0];
-
-      const randomCategory = categoryIds.length > 0
-        ? [categoryIds[Math.floor(Math.random() * categoryIds.length)]]
-        : [];
-
-      const payload = {
-        amount,
-        date: dateString,
-        category_ids: randomCategory,
-      };
-
     try {
-        const created = await createTransaction(payload);
+      const base = BACKEND_URL.replace(/\/$/, '');
+      const url = `${base}/mock-bank/generate`;
+      const token = localStorage.getItem('token');
+      const res = await fetch(url, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          ...(token ? { Authorization: `Bearer ${token}` } : {}),
+        },
+        credentials: 'include',
+        body: JSON.stringify(options),
+      });
+      if (!res.ok) {
+        const text = await res.text();
+        throw new Error(text || `Failed to generate mock transactions (${res.status})`);
+      }
+      const generated: Array<{ amount: number; date: string; category_ids: number[]; description?: string | null }>
+        = await res.json();
+
+      const newTransactions: Transaction[] = [];
+      for (const g of generated) {
+        try {
+          const created = await createTransaction({
+            amount: g.amount,
+            date: g.date,
+            category_ids: g.category_ids || [],
+            description: g.description || undefined,
+          });
           newTransactions.push(created);
         } catch (err) {
-        console.error("Failed to create mock transaction:", err);
-        alert('An error occurred while generating transactions. Check the console.');
-        break;
+          console.error('Failed to create mock transaction:', err);
+          // continue creating others
         }
       }
 
-    setIsGenerating(false);
       alert(`${newTransactions.length} mock transactions were successfully generated!`);
-
+    } catch (err: any) {
+      console.error(err);
+      alert(err?.message || 'Failed to generate mock transactions');
+    } finally {
+      setIsGenerating(false);
       await loadAll();
     }
+  }
 
   useEffect(() => { loadAll(); }, [startDate, endDate]);