mirror of
https://github.com/dat515-2025/Group-8.git
synced 2026-03-22 15:12:08 +01:00
Compare commits
46 Commits
merge/prom
...
96ebc27001
| Author | SHA1 | Date | |
|---|---|---|---|
| 96ebc27001 | |||
|
|
922651fdbf | ||
|
|
e164b185e0 | ||
|
|
186b4fd09a | ||
|
|
280d495335 | ||
|
|
e73233c90a | ||
|
|
aade78bf3f | ||
|
|
50e489a8e0 | ||
|
|
1679abb71f | ||
| 573404dead | |||
| d57dd82a64 | |||
| 50f37c1161 | |||
| ae22d2ee5f | |||
| 509608f8c9 | |||
| ed723d1d13 | |||
| b0dee5e289 | |||
| 640da2ee04 | |||
| ab9aefd140 | |||
|
|
4eaf46e77e | ||
|
|
a30ae4d010 | ||
|
|
ef26e88713 | ||
|
|
2e1dddb4f8 | ||
|
|
25e587cea8 | ||
|
|
3cdefc33fc | ||
|
|
5954e56956 | ||
|
|
8575ef8ff5 | ||
| c53e314b2a | |||
| c0bc44622f | |||
| 3d31ff4631 | |||
|
|
8b92b9bd18 | ||
|
|
3d26ed6a62 | ||
|
|
67b44539f2 | ||
|
|
ff9cc712db | ||
| dc7ce9e6a1 | |||
| 188cdf5727 | |||
| 4cf0d2a981 | |||
| 9986cce8f9 | |||
| b3b5717e9e | |||
|
|
1da927dc07 | ||
| 537d050080 | |||
| 1e4f342176 | |||
| c62e0adcf3 | |||
| 24d86abfc4 | |||
| 21305f18e2 | |||
| e708f7b18b | |||
| f58083870f |
4
.github/workflows/deploy-pr.yaml
vendored
4
.github/workflows/deploy-pr.yaml
vendored
@@ -85,6 +85,7 @@ jobs:
|
|||||||
DOMAIN_SCHEME: "${{ needs.get_urls.outputs.backend_url_scheme }}"
|
DOMAIN_SCHEME: "${{ needs.get_urls.outputs.backend_url_scheme }}"
|
||||||
FRONTEND_DOMAIN: "${{ needs.get_urls.outputs.frontend_url }}"
|
FRONTEND_DOMAIN: "${{ needs.get_urls.outputs.frontend_url }}"
|
||||||
FRONTEND_DOMAIN_SCHEME: "${{ needs.get_urls.outputs.frontend_url_scheme }}"
|
FRONTEND_DOMAIN_SCHEME: "${{ needs.get_urls.outputs.frontend_url_scheme }}"
|
||||||
|
UNIRATE_API_KEY: ${{ secrets.UNIRATE_API_KEY }}
|
||||||
run: |
|
run: |
|
||||||
PR=${{ github.event.pull_request.number }}
|
PR=${{ github.event.pull_request.number }}
|
||||||
RELEASE=myapp-pr-$PR
|
RELEASE=myapp-pr-$PR
|
||||||
@@ -102,7 +103,8 @@ jobs:
|
|||||||
--set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
|
--set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
|
||||||
--set-string database.password="$DB_PASSWORD" \
|
--set-string database.password="$DB_PASSWORD" \
|
||||||
--set-string database.encryptionSecret="$PR" \
|
--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
|
- name: Post preview URLs as PR comment
|
||||||
uses: actions/github-script@v7
|
uses: actions/github-script@v7
|
||||||
|
|||||||
20
.github/workflows/deploy-prod.yaml
vendored
20
.github/workflows/deploy-prod.yaml
vendored
@@ -27,6 +27,7 @@ jobs:
|
|||||||
|
|
||||||
build:
|
build:
|
||||||
name: Build and push image (reusable)
|
name: Build and push image (reusable)
|
||||||
|
needs: [test]
|
||||||
uses: ./.github/workflows/build-image.yaml
|
uses: ./.github/workflows/build-image.yaml
|
||||||
with:
|
with:
|
||||||
mode: prod
|
mode: prod
|
||||||
@@ -36,6 +37,7 @@ jobs:
|
|||||||
|
|
||||||
get_urls:
|
get_urls:
|
||||||
name: Generate Production URLs
|
name: Generate Production URLs
|
||||||
|
needs: [test]
|
||||||
uses: ./.github/workflows/url_generator.yml
|
uses: ./.github/workflows/url_generator.yml
|
||||||
with:
|
with:
|
||||||
mode: prod
|
mode: prod
|
||||||
@@ -92,6 +94,14 @@ jobs:
|
|||||||
CSAS_CLIENT_ID: ${{ secrets.CSAS_CLIENT_ID }}
|
CSAS_CLIENT_ID: ${{ secrets.CSAS_CLIENT_ID }}
|
||||||
CSAS_CLIENT_SECRET: ${{ secrets.CSAS_CLIENT_SECRET }}
|
CSAS_CLIENT_SECRET: ${{ secrets.CSAS_CLIENT_SECRET }}
|
||||||
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
|
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
|
||||||
|
SMTP_HOST: ${{ secrets.SMTP_HOST }}
|
||||||
|
SMTP_PORT: ${{ secrets.SMTP_PORT }}
|
||||||
|
SMTP_USERNAME: ${{ secrets.SMTP_USERNAME }}
|
||||||
|
SMTP_PASSWORD: ${{ secrets.SMTP_PASSWORD }}
|
||||||
|
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: |
|
run: |
|
||||||
helm upgrade --install myapp ./7project/charts/myapp-chart \
|
helm upgrade --install myapp ./7project/charts/myapp-chart \
|
||||||
-n prod --create-namespace \
|
-n prod --create-namespace \
|
||||||
@@ -111,4 +121,12 @@ jobs:
|
|||||||
--set-string oauth.csas.clientId="$CSAS_CLIENT_ID" \
|
--set-string oauth.csas.clientId="$CSAS_CLIENT_ID" \
|
||||||
--set-string oauth.csas.clientSecret="$CSAS_CLIENT_SECRET" \
|
--set-string oauth.csas.clientSecret="$CSAS_CLIENT_SECRET" \
|
||||||
--set-string sentry_dsn="$SENTRY_DSN" \
|
--set-string sentry_dsn="$SENTRY_DSN" \
|
||||||
--set-string database.encryptionSecret="${{ secrets.PROD_DB_ENCRYPTION_KEY }}"
|
--set-string database.encryptionSecret="${{ secrets.PROD_DB_ENCRYPTION_KEY }}" \
|
||||||
|
--set-string smtp.host="$SMTP_HOST" \
|
||||||
|
--set smtp.port="$SMTP_PORT" \
|
||||||
|
--set-string smtp.username="$SMTP_USERNAME" \
|
||||||
|
--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 unirate.key="$UNIRATE_API_KEY"
|
||||||
5
.github/workflows/run-tests.yml
vendored
5
.github/workflows/run-tests.yml
vendored
@@ -31,6 +31,9 @@ jobs:
|
|||||||
MARIADB_DB: group_project
|
MARIADB_DB: group_project
|
||||||
MARIADB_USER: appuser
|
MARIADB_USER: appuser
|
||||||
MARIADB_PASSWORD: apppass
|
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:
|
steps:
|
||||||
- name: Check out repository code
|
- name: Check out repository code
|
||||||
@@ -57,5 +60,7 @@ jobs:
|
|||||||
working-directory: ./7project/backend
|
working-directory: ./7project/backend
|
||||||
|
|
||||||
- name: Run tests with pytest
|
- name: Run tests with pytest
|
||||||
|
env:
|
||||||
|
PYTEST_RUN_CONFIG: "True"
|
||||||
run: pytest
|
run: pytest
|
||||||
working-directory: ./7project/backend
|
working-directory: ./7project/backend
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM python:3.11-slim
|
FROM python:3.11-trixie
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY requirements.txt .
|
COPY requirements.txt .
|
||||||
|
|||||||
66
7project/backend/app/api/exchange_rates.py
Normal file
66
7project/backend/app/api/exchange_rates.py
Normal file
@@ -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
|
||||||
|
|
||||||
|
|
||||||
116
7project/backend/app/api/mock_bank.py
Normal file
116
7project/backend/app/api/mock_bank.py
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
from datetime import datetime, timedelta
|
||||||
|
from typing import List, Optional
|
||||||
|
import random
|
||||||
|
|
||||||
|
from fastapi import APIRouter, Depends
|
||||||
|
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")
|
||||||
|
async def scrape_mock_bank():
|
||||||
|
# 80% of the time: nothing to scrape
|
||||||
|
if random.random() < 0.8:
|
||||||
|
return []
|
||||||
|
|
||||||
|
transactions = []
|
||||||
|
count = random.randint(1, 10)
|
||||||
|
for _ in range(count):
|
||||||
|
transactions.append({
|
||||||
|
"amount": round(random.uniform(-200.0, 200.0), 2),
|
||||||
|
"date": (datetime.utcnow().date() - timedelta(days=random.randint(0, 30))).isoformat(),
|
||||||
|
"description": "Mock transaction",
|
||||||
|
})
|
||||||
|
|
||||||
|
return transactions
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
|
import json
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from pythonjsonlogger import jsonlogger
|
from pythonjsonlogger import jsonlogger
|
||||||
|
|
||||||
from fastapi import Depends, FastAPI
|
from fastapi import Depends, FastAPI, HTTPException
|
||||||
from fastapi.middleware.cors import CORSMiddleware
|
from fastapi.middleware.cors import CORSMiddleware
|
||||||
from prometheus_fastapi_instrumentator import Instrumentator, metrics
|
from prometheus_fastapi_instrumentator import Instrumentator, metrics
|
||||||
from starlette.requests import Request
|
from starlette.requests import Request
|
||||||
@@ -20,6 +21,7 @@ from app.api.auth import router as auth_router
|
|||||||
from app.api.csas import router as csas_router
|
from app.api.csas import router as csas_router
|
||||||
from app.api.categories import router as categories_router
|
from app.api.categories import router as categories_router
|
||||||
from app.api.transactions import router as transactions_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, \
|
from app.services.user_service import auth_backend, current_active_verified_user, fastapi_users, get_oauth_provider, \
|
||||||
UserManager, get_jwt_strategy
|
UserManager, get_jwt_strategy
|
||||||
from app.core.security import extract_bearer_token, is_token_revoked, decode_and_verify_jwt
|
from app.core.security import extract_bearer_token, is_token_revoked, decode_and_verify_jwt
|
||||||
@@ -28,7 +30,8 @@ from app.services.user_service import SECRET
|
|||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
import sentry_sdk
|
import sentry_sdk
|
||||||
from fastapi_users.db import SQLAlchemyUserDatabase
|
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(
|
sentry_sdk.init(
|
||||||
dsn=os.getenv("SENTRY_DSN"),
|
dsn=os.getenv("SENTRY_DSN"),
|
||||||
@@ -50,21 +53,23 @@ fastApi.add_middleware(
|
|||||||
allow_headers=["*"],
|
allow_headers=["*"],
|
||||||
)
|
)
|
||||||
|
|
||||||
prometheus = Instrumentator().instrument(fastApi)
|
|
||||||
|
|
||||||
# Register custom metrics
|
if not os.getenv("PYTEST_RUN_CONFIG"):
|
||||||
prometheus.add(number_of_users()).add(number_of_transactions())
|
prometheus = Instrumentator().instrument(fastApi)
|
||||||
|
# Register custom metrics
|
||||||
prometheus.expose(
|
prometheus.add(number_of_users()).add(number_of_transactions())
|
||||||
|
prometheus.expose(
|
||||||
fastApi,
|
fastApi,
|
||||||
endpoint="/metrics",
|
endpoint="/metrics",
|
||||||
include_in_schema=True,
|
include_in_schema=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
fastApi.include_router(auth_router)
|
fastApi.include_router(auth_router)
|
||||||
fastApi.include_router(categories_router)
|
fastApi.include_router(categories_router)
|
||||||
fastApi.include_router(transactions_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):
|
for h in list(logging.root.handlers):
|
||||||
logging.root.removeHandler(h)
|
logging.root.removeHandler(h)
|
||||||
@@ -78,7 +83,6 @@ _log_handler.setFormatter(_formatter)
|
|||||||
logging.root.setLevel(logging.INFO)
|
logging.root.setLevel(logging.INFO)
|
||||||
logging.root.addHandler(_log_handler)
|
logging.root.addHandler(_log_handler)
|
||||||
|
|
||||||
|
|
||||||
for _name in ("uvicorn", "uvicorn.error", "uvicorn.access"):
|
for _name in ("uvicorn", "uvicorn.error", "uvicorn.access"):
|
||||||
_logger = logging.getLogger(_name)
|
_logger = logging.getLogger(_name)
|
||||||
_logger.handlers = [_log_handler]
|
_logger.handlers = [_log_handler]
|
||||||
@@ -161,16 +165,12 @@ async def authenticated_route(user: User = Depends(current_active_verified_user)
|
|||||||
return {"message": f"Hello {user.email}!"}
|
return {"message": f"Hello {user.email}!"}
|
||||||
|
|
||||||
|
|
||||||
@fastApi.get("/debug/scrape/csas/all", tags=["debug"])
|
@fastApi.get("/_cron", include_in_schema=False)
|
||||||
async def debug_scrape_csas_all():
|
async def handle_cron(request: Request):
|
||||||
logging.info("[Debug] Queueing CSAS scrape for all users via HTTP endpoint (Celery)")
|
# endpoint accessed by Clodflare => return 404
|
||||||
|
if request.headers.get("cf-connecting-ip"):
|
||||||
|
raise HTTPException(status_code=404)
|
||||||
|
|
||||||
|
logging.info("[Cron] Triggering scheduled tasks via HTTP endpoint")
|
||||||
task = load_all_transactions.delay()
|
task = load_all_transactions.delay()
|
||||||
return {"status": "queued", "action": "csas_scrape_all", "task_id": getattr(task, 'id', None)}
|
return {"status": "queued", "action": "csas_scrape_all", "task_id": getattr(task, 'id', None)}
|
||||||
|
|
||||||
|
|
||||||
@fastApi.post("/debug/scrape/csas/{user_id}", tags=["debug"])
|
|
||||||
async def debug_scrape_csas_user(user_id: str, user: User = Depends(current_active_verified_user)):
|
|
||||||
logging.info("[Debug] Queueing CSAS scrape for single user via HTTP endpoint (Celery) | user_id=%s", user_id)
|
|
||||||
task = load_transactions.delay(user_id)
|
|
||||||
return {"status": "queued", "action": "csas_scrape_single", "user_id": user_id,
|
|
||||||
"task_id": getattr(task, 'id', None)}
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
import os
|
import os
|
||||||
from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker
|
from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker
|
||||||
|
from sqlalchemy import create_engine
|
||||||
|
from sqlalchemy.orm import sessionmaker
|
||||||
from app.core.base import Base
|
from app.core.base import Base
|
||||||
|
|
||||||
DATABASE_URL = os.getenv("DATABASE_URL")
|
DATABASE_URL = os.getenv("DATABASE_URL")
|
||||||
@@ -23,6 +25,7 @@ host_env = os.getenv("MARIADB_HOST", "localhost")
|
|||||||
ssl_enabled = host_env not in {"localhost", "127.0.0.1"}
|
ssl_enabled = host_env not in {"localhost", "127.0.0.1"}
|
||||||
connect_args = {"ssl": {"ssl": True}} if ssl_enabled else {}
|
connect_args = {"ssl": {"ssl": True}} if ssl_enabled else {}
|
||||||
|
|
||||||
|
# Async engine/session for the async parts of the app
|
||||||
engine = create_async_engine(
|
engine = create_async_engine(
|
||||||
DATABASE_URL,
|
DATABASE_URL,
|
||||||
pool_pre_ping=True,
|
pool_pre_ping=True,
|
||||||
@@ -30,3 +33,13 @@ engine = create_async_engine(
|
|||||||
connect_args=connect_args,
|
connect_args=connect_args,
|
||||||
)
|
)
|
||||||
async_session_maker = async_sessionmaker(engine, expire_on_commit=False)
|
async_session_maker = async_sessionmaker(engine, expire_on_commit=False)
|
||||||
|
|
||||||
|
# Synchronous engine/session for sync utilities (e.g., bank_scraper)
|
||||||
|
SYNC_DATABASE_URL = DATABASE_URL.replace("+asyncmy", "+pymysql")
|
||||||
|
engine_sync = create_engine(
|
||||||
|
SYNC_DATABASE_URL,
|
||||||
|
pool_pre_ping=True,
|
||||||
|
echo=os.getenv("SQL_ECHO", "0") == "1",
|
||||||
|
connect_args=connect_args,
|
||||||
|
)
|
||||||
|
sync_session_maker = sessionmaker(bind=engine_sync, expire_on_commit=False)
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
|
import os
|
||||||
from os.path import dirname, join
|
from os.path import dirname, join
|
||||||
from time import strptime
|
from time import strptime
|
||||||
from uuid import UUID
|
from uuid import UUID
|
||||||
@@ -7,7 +8,7 @@ from uuid import UUID
|
|||||||
import httpx
|
import httpx
|
||||||
from sqlalchemy import select
|
from sqlalchemy import select
|
||||||
|
|
||||||
from app.core.db import async_session_maker
|
from app.core.db import sync_session_maker
|
||||||
from app.models.transaction import Transaction
|
from app.models.transaction import Transaction
|
||||||
from app.models.user import User
|
from app.models.user import User
|
||||||
|
|
||||||
@@ -20,26 +21,78 @@ CERTS = (
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
async def aload_ceska_sporitelna_transactions(user_id: str) -> None:
|
def load_mock_bank_transactions(user_id: str) -> None:
|
||||||
try:
|
try:
|
||||||
uid = UUID(str(user_id))
|
uid = UUID(str(user_id))
|
||||||
except Exception:
|
except Exception:
|
||||||
logger.error("Invalid user_id provided to bank_scraper (async): %r", user_id)
|
logger.error("Invalid user_id provided to bank_scraper (sync): %r", user_id)
|
||||||
return
|
return
|
||||||
|
|
||||||
await _aload_ceska_sporitelna_transactions(uid)
|
_load_mock_bank_transactions(uid)
|
||||||
|
|
||||||
|
|
||||||
async def aload_all_ceska_sporitelna_transactions() -> None:
|
def load_all_mock_bank_transactions() -> None:
|
||||||
async with async_session_maker() as session:
|
with sync_session_maker() as session:
|
||||||
result = await session.execute(select(User))
|
users = session.execute(select(User)).unique().scalars().all()
|
||||||
users = result.unique().scalars().all()
|
logger.info("[BankScraper] Starting Mock Bank scrape for all users | count=%d", len(users))
|
||||||
|
|
||||||
|
processed = 0
|
||||||
|
for user in users:
|
||||||
|
try:
|
||||||
|
_load_mock_bank_transactions(user.id)
|
||||||
|
processed += 1
|
||||||
|
except Exception:
|
||||||
|
logger.exception("[BankScraper] Error scraping for user id=%s email=%s", user.id,
|
||||||
|
getattr(user, 'email', None))
|
||||||
|
logger.info("[BankScraper] Finished Mock Bank scrape for all users | processed=%d", processed)
|
||||||
|
|
||||||
|
|
||||||
|
def _load_mock_bank_transactions(user_id: UUID) -> None:
|
||||||
|
with sync_session_maker() as session:
|
||||||
|
user: User | None = session.execute(select(User).where(User.id == user_id)).unique().scalar_one_or_none()
|
||||||
|
if user is None:
|
||||||
|
logger.warning("User not found for id=%s", user_id)
|
||||||
|
return
|
||||||
|
|
||||||
|
transactions = []
|
||||||
|
with httpx.Client() as client:
|
||||||
|
response = client.get(f"{os.getenv('APP_POD_URL')}/mock-bank/scrape")
|
||||||
|
if response.status_code != httpx.codes.OK:
|
||||||
|
return
|
||||||
|
for transaction in response.json():
|
||||||
|
transactions.append(
|
||||||
|
Transaction(
|
||||||
|
amount=transaction["amount"],
|
||||||
|
description=transaction.get("description"),
|
||||||
|
date=strptime(transaction["date"], "%Y-%m-%d"),
|
||||||
|
user_id=user_id,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
for transaction in transactions:
|
||||||
|
session.add(transaction)
|
||||||
|
session.commit()
|
||||||
|
|
||||||
|
|
||||||
|
def load_ceska_sporitelna_transactions(user_id: str) -> None:
|
||||||
|
try:
|
||||||
|
uid = UUID(str(user_id))
|
||||||
|
except Exception:
|
||||||
|
logger.error("Invalid user_id provided to bank_scraper (sync): %r", user_id)
|
||||||
|
return
|
||||||
|
|
||||||
|
_load_ceska_sporitelna_transactions(uid)
|
||||||
|
|
||||||
|
|
||||||
|
def load_all_ceska_sporitelna_transactions() -> None:
|
||||||
|
with sync_session_maker() as session:
|
||||||
|
users = session.execute(select(User)).unique().scalars().all()
|
||||||
logger.info("[BankScraper] Starting CSAS scrape for all users | count=%d", len(users))
|
logger.info("[BankScraper] Starting CSAS scrape for all users | count=%d", len(users))
|
||||||
|
|
||||||
processed = 0
|
processed = 0
|
||||||
for user in users:
|
for user in users:
|
||||||
try:
|
try:
|
||||||
await _aload_ceska_sporitelna_transactions(user.id)
|
_load_ceska_sporitelna_transactions(user.id)
|
||||||
processed += 1
|
processed += 1
|
||||||
except Exception:
|
except Exception:
|
||||||
logger.exception("[BankScraper] Error scraping for user id=%s email=%s", user.id,
|
logger.exception("[BankScraper] Error scraping for user id=%s email=%s", user.id,
|
||||||
@@ -47,10 +100,9 @@ async def aload_all_ceska_sporitelna_transactions() -> None:
|
|||||||
logger.info("[BankScraper] Finished CSAS scrape for all users | processed=%d", processed)
|
logger.info("[BankScraper] Finished CSAS scrape for all users | processed=%d", processed)
|
||||||
|
|
||||||
|
|
||||||
async def _aload_ceska_sporitelna_transactions(user_id: UUID) -> None:
|
def _load_ceska_sporitelna_transactions(user_id: UUID) -> None:
|
||||||
async with (async_session_maker() as session):
|
with sync_session_maker() as session:
|
||||||
result = await session.execute(select(User).where(User.id == user_id))
|
user: User | None = session.execute(select(User).where(User.id == user_id)).unique().scalar_one_or_none()
|
||||||
user: User = result.unique().scalar_one_or_none()
|
|
||||||
if user is None:
|
if user is None:
|
||||||
logger.warning("User not found for id=%s", user_id)
|
logger.warning("User not found for id=%s", user_id)
|
||||||
return
|
return
|
||||||
@@ -65,8 +117,8 @@ async def _aload_ceska_sporitelna_transactions(user_id: UUID) -> None:
|
|||||||
|
|
||||||
accounts = []
|
accounts = []
|
||||||
try:
|
try:
|
||||||
async with httpx.AsyncClient(cert=CERTS, timeout=httpx.Timeout(20.0)) as client:
|
with httpx.Client(cert=CERTS, timeout=httpx.Timeout(20.0)) as client:
|
||||||
response = await client.get(
|
response = client.get(
|
||||||
"https://webapi.developers.erstegroup.com/api/csas/sandbox/v4/account-information/my/accounts?size=10&page=0&sort=iban&order=desc",
|
"https://webapi.developers.erstegroup.com/api/csas/sandbox/v4/account-information/my/accounts?size=10&page=0&sort=iban&order=desc",
|
||||||
headers={
|
headers={
|
||||||
"Authorization": f"Bearer {cfg['access_token']}",
|
"Authorization": f"Bearer {cfg['access_token']}",
|
||||||
@@ -77,7 +129,7 @@ async def _aload_ceska_sporitelna_transactions(user_id: UUID) -> None:
|
|||||||
if response.status_code != httpx.codes.OK:
|
if response.status_code != httpx.codes.OK:
|
||||||
return
|
return
|
||||||
|
|
||||||
for account in response.json()["accounts"]:
|
for account in response.json().get("accounts", []):
|
||||||
accounts.append(account)
|
accounts.append(account)
|
||||||
|
|
||||||
except (httpx.HTTPError,) as e:
|
except (httpx.HTTPError,) as e:
|
||||||
@@ -85,11 +137,13 @@ async def _aload_ceska_sporitelna_transactions(user_id: UUID) -> None:
|
|||||||
return
|
return
|
||||||
|
|
||||||
for account in accounts:
|
for account in accounts:
|
||||||
id = account["id"]
|
acc_id = account.get("id")
|
||||||
|
if not acc_id:
|
||||||
|
continue
|
||||||
|
|
||||||
url = f"https://webapi.developers.erstegroup.com/api/csas/sandbox/v4/account-information/my/accounts/{id}/transactions?size=100&page=0&sort=bookingdate&order=desc"
|
url = f"https://webapi.developers.erstegroup.com/api/csas/sandbox/v4/account-information/my/accounts/{acc_id}/transactions?size=100&page=0&sort=bookingdate&order=desc"
|
||||||
async with httpx.AsyncClient(cert=CERTS) as client:
|
with httpx.Client(cert=CERTS) as client:
|
||||||
response = await client.get(
|
response = client.get(
|
||||||
url,
|
url,
|
||||||
headers={
|
headers={
|
||||||
"Authorization": f"Bearer {cfg['access_token']}",
|
"Authorization": f"Bearer {cfg['access_token']}",
|
||||||
@@ -100,7 +154,7 @@ async def _aload_ceska_sporitelna_transactions(user_id: UUID) -> None:
|
|||||||
if response.status_code != httpx.codes.OK:
|
if response.status_code != httpx.codes.OK:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
transactions = response.json()["transactions"]
|
transactions = response.json().get("transactions", [])
|
||||||
|
|
||||||
for transaction in transactions:
|
for transaction in transactions:
|
||||||
description = transaction.get("entryDetails", {}).get("transactionDetails", {}).get(
|
description = transaction.get("entryDetails", {}).get("transactionDetails", {}).get(
|
||||||
@@ -108,9 +162,12 @@ async def _aload_ceska_sporitelna_transactions(user_id: UUID) -> None:
|
|||||||
date_str = transaction.get("bookingDate", {}).get("date")
|
date_str = transaction.get("bookingDate", {}).get("date")
|
||||||
date = strptime(date_str, "%Y-%m-%d") if date_str else None
|
date = strptime(date_str, "%Y-%m-%d") if date_str else None
|
||||||
amount = transaction.get("amount", {}).get("value")
|
amount = transaction.get("amount", {}).get("value")
|
||||||
if transaction.get("creditDebitIndicator") == "DBIT":
|
if transaction.get("creditDebitIndicator") == "DBIT" and amount is not None:
|
||||||
amount = -abs(amount)
|
amount = -abs(amount)
|
||||||
|
|
||||||
|
if amount is None:
|
||||||
|
continue
|
||||||
|
|
||||||
obj = Transaction(
|
obj = Transaction(
|
||||||
amount=amount,
|
amount=amount,
|
||||||
description=description,
|
description=description,
|
||||||
@@ -118,7 +175,4 @@ async def _aload_ceska_sporitelna_transactions(user_id: UUID) -> None:
|
|||||||
user_id=user_id,
|
user_id=user_id,
|
||||||
)
|
)
|
||||||
session.add(obj)
|
session.add(obj)
|
||||||
await session.commit()
|
session.commit()
|
||||||
|
|
||||||
pass
|
|
||||||
pass
|
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import logging
|
import logging
|
||||||
import asyncio
|
import os
|
||||||
|
import smtplib
|
||||||
from celery import shared_task
|
from email.message import EmailMessage
|
||||||
|
|
||||||
import app.services.bank_scraper
|
import app.services.bank_scraper
|
||||||
|
from app.celery_app import celery_app
|
||||||
|
|
||||||
logger = logging.getLogger("celery_tasks")
|
logger = logging.getLogger("celery_tasks")
|
||||||
if not logger.handlers:
|
if not logger.handlers:
|
||||||
@@ -12,96 +13,74 @@ if not logger.handlers:
|
|||||||
logger.setLevel(logging.INFO)
|
logger.setLevel(logging.INFO)
|
||||||
|
|
||||||
|
|
||||||
def run_coro(coro) -> None:
|
@celery_app.task(name="workers.send_email")
|
||||||
"""Run an async coroutine in a fresh event loop without using run_until_complete.
|
|
||||||
Primary strategy runs in a new loop in the current thread. If that fails due to
|
|
||||||
debugger patches (e.g., Bad file descriptor from pydevd_nest_asyncio), fall back
|
|
||||||
to running in a dedicated thread with its own event loop.
|
|
||||||
"""
|
|
||||||
import threading
|
|
||||||
|
|
||||||
def _cleanup_loop(loop):
|
|
||||||
try:
|
|
||||||
pending = [t for t in asyncio.all_tasks(loop) if not t.done()]
|
|
||||||
for t in pending:
|
|
||||||
t.cancel()
|
|
||||||
if pending:
|
|
||||||
loop.run_until_complete(asyncio.gather(*pending, return_exceptions=True))
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
finally:
|
|
||||||
try:
|
|
||||||
loop.close()
|
|
||||||
finally:
|
|
||||||
asyncio.set_event_loop(None)
|
|
||||||
|
|
||||||
# First attempt: Run in current thread with a fresh event loop
|
|
||||||
try:
|
|
||||||
loop = asyncio.get_event_loop_policy().new_event_loop()
|
|
||||||
try:
|
|
||||||
asyncio.set_event_loop(loop)
|
|
||||||
task = loop.create_task(coro)
|
|
||||||
task.add_done_callback(lambda _t: loop.stop())
|
|
||||||
loop.run_forever()
|
|
||||||
exc = task.exception()
|
|
||||||
if exc:
|
|
||||||
raise exc
|
|
||||||
return
|
|
||||||
finally:
|
|
||||||
_cleanup_loop(loop)
|
|
||||||
except OSError as e:
|
|
||||||
logger.warning("run_coro primary strategy failed (%s). Falling back to thread runner.", e)
|
|
||||||
except Exception:
|
|
||||||
# For any other unexpected errors, try thread fallback as well
|
|
||||||
logger.exception("run_coro primary strategy raised; attempting thread fallback")
|
|
||||||
|
|
||||||
# Fallback: Run in a dedicated thread with its own event loop
|
|
||||||
error = {"exc": None}
|
|
||||||
|
|
||||||
def _thread_target():
|
|
||||||
loop = asyncio.new_event_loop()
|
|
||||||
try:
|
|
||||||
asyncio.set_event_loop(loop)
|
|
||||||
task = loop.create_task(coro)
|
|
||||||
task.add_done_callback(lambda _t: loop.stop())
|
|
||||||
loop.run_forever()
|
|
||||||
exc = task.exception()
|
|
||||||
if exc:
|
|
||||||
error["exc"] = exc
|
|
||||||
finally:
|
|
||||||
_cleanup_loop(loop)
|
|
||||||
|
|
||||||
th = threading.Thread(target=_thread_target, name="celery-async-runner", daemon=True)
|
|
||||||
th.start()
|
|
||||||
th.join()
|
|
||||||
if error["exc"] is not None:
|
|
||||||
raise error["exc"]
|
|
||||||
|
|
||||||
|
|
||||||
@shared_task(name="workers.send_email")
|
|
||||||
def send_email(to: str, subject: str, body: str) -> None:
|
def send_email(to: str, subject: str, body: str) -> None:
|
||||||
if not (to and subject and body):
|
if not (to and subject and body):
|
||||||
logger.error("Email task missing fields. to=%r subject=%r body_len=%r", to, subject, len(body) if body else 0)
|
logger.error("Email task missing fields. to=%r subject=%r body_len=%r", to, subject, len(body) if body else 0)
|
||||||
return
|
return
|
||||||
|
|
||||||
# Placeholder for real email sending logic
|
host = os.getenv("SMTP_HOST")
|
||||||
|
if not host:
|
||||||
|
logger.error("SMTP_HOST is not configured; cannot send email")
|
||||||
|
return
|
||||||
|
|
||||||
|
# Configuration
|
||||||
|
port = int(os.getenv("SMTP_PORT", "25"))
|
||||||
|
username = os.getenv("SMTP_USERNAME")
|
||||||
|
password = os.getenv("SMTP_PASSWORD")
|
||||||
|
use_tls = os.getenv("SMTP_USE_TLS", "0").lower() in {"1", "true", "yes"}
|
||||||
|
use_ssl = os.getenv("SMTP_USE_SSL", "0").lower() in {"1", "true", "yes"}
|
||||||
|
timeout = int(os.getenv("SMTP_TIMEOUT", "10"))
|
||||||
|
mail_from = os.getenv("SMTP_FROM") or username or "noreply@localhost"
|
||||||
|
|
||||||
|
# Build message
|
||||||
|
msg = EmailMessage()
|
||||||
|
msg["To"] = to
|
||||||
|
msg["From"] = mail_from
|
||||||
|
msg["Subject"] = subject
|
||||||
|
msg.set_content(body)
|
||||||
|
|
||||||
|
try:
|
||||||
|
if use_ssl:
|
||||||
|
with smtplib.SMTP_SSL(host=host, port=port, timeout=timeout) as smtp:
|
||||||
|
if username and password:
|
||||||
|
smtp.login(username, password)
|
||||||
|
smtp.send_message(msg)
|
||||||
|
else:
|
||||||
|
with smtplib.SMTP(host=host, port=port, timeout=timeout) as smtp:
|
||||||
|
# STARTTLS if requested
|
||||||
|
if use_tls:
|
||||||
|
smtp.starttls()
|
||||||
|
if username and password:
|
||||||
|
smtp.login(username, password)
|
||||||
|
smtp.send_message(msg)
|
||||||
logger.info("[Celery] Email sent | to=%s | subject=%s | body_len=%d", to, subject, len(body))
|
logger.info("[Celery] Email sent | to=%s | subject=%s | body_len=%d", to, subject, len(body))
|
||||||
|
except Exception:
|
||||||
|
logger.exception("Failed to send email via SMTP to=%s subject=%s host=%s port=%s tls=%s ssl=%s", to, subject,
|
||||||
|
host, port, use_tls, use_ssl)
|
||||||
|
|
||||||
|
|
||||||
@shared_task(name="workers.load_transactions")
|
@celery_app.task(name="workers.load_transactions")
|
||||||
def load_transactions(user_id: str) -> None:
|
def load_transactions(user_id: str) -> None:
|
||||||
if not user_id:
|
if not user_id:
|
||||||
logger.error("Load transactions task missing user_id.")
|
logger.error("Load transactions task missing user_id.")
|
||||||
return
|
return
|
||||||
|
|
||||||
run_coro(app.services.bank_scraper.aload_ceska_sporitelna_transactions(user_id))
|
logger.info("[Celery] Starting load_transactions | user_id=%s", user_id)
|
||||||
|
try:
|
||||||
# Placeholder for real transaction loading logic
|
# Use synchronous bank scraper functions directly, mirroring load_all_transactions
|
||||||
logger.info("[Celery] Transactions loaded for user_id=%s", user_id)
|
app.services.bank_scraper.load_mock_bank_transactions(user_id)
|
||||||
|
app.services.bank_scraper.load_ceska_sporitelna_transactions(user_id)
|
||||||
|
except Exception:
|
||||||
|
logger.exception("Failed to load transactions for user_id=%s", user_id)
|
||||||
|
else:
|
||||||
|
logger.info("[Celery] Finished load_transactions | user_id=%s", user_id)
|
||||||
|
|
||||||
|
|
||||||
@shared_task(name="workers.load_all_transactions")
|
@celery_app.task(name="workers.load_all_transactions")
|
||||||
def load_all_transactions() -> None:
|
def load_all_transactions() -> None:
|
||||||
logger.info("[Celery] Starting load_all_transactions")
|
logger.info("[Celery] Starting load_all_transactions")
|
||||||
run_coro(app.services.bank_scraper.aload_all_ceska_sporitelna_transactions())
|
# Now use synchronous bank scraper functions directly
|
||||||
|
app.services.bank_scraper.load_all_mock_bank_transactions()
|
||||||
|
app.services.bank_scraper.load_all_ceska_sporitelna_transactions()
|
||||||
logger.info("[Celery] Finished load_all_transactions")
|
logger.info("[Celery] Finished load_all_transactions")
|
||||||
|
|||||||
20
7project/backend/docker-compose.test.yml
Normal file
20
7project/backend/docker-compose.test.yml
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
version: "3.9"
|
||||||
|
services:
|
||||||
|
mariadb:
|
||||||
|
image: mariadb:11.4
|
||||||
|
container_name: test-mariadb
|
||||||
|
environment:
|
||||||
|
MARIADB_ROOT_PASSWORD: rootpw
|
||||||
|
MARIADB_DATABASE: group_project
|
||||||
|
MARIADB_USER: appuser
|
||||||
|
MARIADB_PASSWORD: apppass
|
||||||
|
ports:
|
||||||
|
- "3307:3306" # host:container (use 3307 on host to avoid conflicts)
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "mariadb-admin", "ping", "-h", "127.0.0.1", "-u", "root", "-prootpw", "--silent"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 2s
|
||||||
|
retries: 20
|
||||||
|
# Truly ephemeral, fast storage (removed when container stops)
|
||||||
|
tmpfs:
|
||||||
|
- /var/lib/mysql
|
||||||
113
7project/backend/test-with-ephemeral-mariadb.sh
Executable file
113
7project/backend/test-with-ephemeral-mariadb.sh
Executable file
@@ -0,0 +1,113 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# Run tests against a disposable local MariaDB on host port 3307 using Docker Compose.
|
||||||
|
# Requirements: Docker, docker compose plugin, Python, Alembic, pytest.
|
||||||
|
# Usage:
|
||||||
|
# chmod +x ./test-with-ephemeral-mariadb.sh
|
||||||
|
# # From 7project/backend directory
|
||||||
|
# ./test-with-ephemeral-mariadb.sh [--only-unit|--only-integration|--only-e2e] [pytest-args...]
|
||||||
|
# # Examples:
|
||||||
|
# ./test-with-ephemeral-mariadb.sh --only-unit -q
|
||||||
|
# ./test-with-ephemeral-mariadb.sh --only-integration -k "login"
|
||||||
|
# ./test-with-ephemeral-mariadb.sh --only-e2e -vv
|
||||||
|
#
|
||||||
|
# This script will:
|
||||||
|
# 1) Start a MariaDB 11.4 container (ephemeral storage, port 3307)
|
||||||
|
# 2) Wait until it's healthy
|
||||||
|
# 3) Export env vars expected by the app (DATABASE_URL etc.)
|
||||||
|
# 4) Run Alembic migrations
|
||||||
|
# 5) Run pytest
|
||||||
|
# 6) Tear everything down (containers and tmpfs data)
|
||||||
|
|
||||||
|
COMPOSE_FILE="docker-compose.test.yml"
|
||||||
|
SERVICE_NAME="mariadb"
|
||||||
|
CONTAINER_NAME="test-mariadb"
|
||||||
|
|
||||||
|
if ! command -v docker >/dev/null 2>&1; then
|
||||||
|
echo "Docker is required but not found in PATH" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if ! docker compose version >/dev/null 2>&1; then
|
||||||
|
echo "Docker Compose V2 plugin is required (docker compose)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Bring up the DB
|
||||||
|
echo "Starting MariaDB (port 3307) with docker compose..."
|
||||||
|
docker compose -f "$COMPOSE_FILE" up -d
|
||||||
|
|
||||||
|
# Ensure we clean up on exit
|
||||||
|
cleanup() {
|
||||||
|
echo "\nTearing down docker compose stack..."
|
||||||
|
docker compose -f "$COMPOSE_FILE" down -v || true
|
||||||
|
}
|
||||||
|
trap cleanup EXIT
|
||||||
|
|
||||||
|
# Wait for healthy container
|
||||||
|
echo -n "Waiting for MariaDB to become healthy"
|
||||||
|
for i in {1..60}; do
|
||||||
|
status=$(docker inspect -f '{{.State.Health.Status}}' "$CONTAINER_NAME" 2>/dev/null || echo "")
|
||||||
|
if [ "$status" = "healthy" ]; then
|
||||||
|
echo " -> healthy"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
echo -n "."
|
||||||
|
sleep 1
|
||||||
|
if [ $i -eq 60 ]; then
|
||||||
|
echo "\nMariaDB did not become healthy in time" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# Export env vars for the app/tests (match app/core/db.py expectations)
|
||||||
|
export MARIADB_HOST=127.0.0.1
|
||||||
|
export MARIADB_PORT=3307
|
||||||
|
export MARIADB_DB=group_project
|
||||||
|
export MARIADB_USER=appuser
|
||||||
|
export MARIADB_PASSWORD=apppass
|
||||||
|
export DATABASE_URL="mysql+asyncmy://$MARIADB_USER:$MARIADB_PASSWORD@$MARIADB_HOST:$MARIADB_PORT/$MARIADB_DB"
|
||||||
|
export PYTEST_RUN_CONFIG="True"
|
||||||
|
|
||||||
|
# Determine which tests to run based on flags
|
||||||
|
UNIT_TESTS="tests/test_unit_user_service.py"
|
||||||
|
INTEGRATION_TESTS="tests/test_integration_app.py"
|
||||||
|
E2E_TESTS="tests/test_e2e.py"
|
||||||
|
|
||||||
|
FLAG_COUNT=0
|
||||||
|
TEST_TARGET=""
|
||||||
|
declare -a PYTEST_ARGS=()
|
||||||
|
for arg in "$@"; do
|
||||||
|
case "$arg" in
|
||||||
|
--only-unit)
|
||||||
|
TEST_TARGET="$UNIT_TESTS"; FLAG_COUNT=$((FLAG_COUNT+1));;
|
||||||
|
--only-integration)
|
||||||
|
TEST_TARGET="$INTEGRATION_TESTS"; FLAG_COUNT=$((FLAG_COUNT+1));;
|
||||||
|
--only-e2e)
|
||||||
|
TEST_TARGET="$E2E_TESTS"; FLAG_COUNT=$((FLAG_COUNT+1));;
|
||||||
|
*)
|
||||||
|
PYTEST_ARGS+=("$arg");;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ "$FLAG_COUNT" -gt 1 ]; then
|
||||||
|
echo "Error: Use only one of --only-unit, --only-integration, or --only-e2e" >&2
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Run Alembic migrations then tests
|
||||||
|
pushd . >/dev/null
|
||||||
|
echo "Running Alembic migrations..."
|
||||||
|
alembic upgrade head
|
||||||
|
|
||||||
|
echo "Running pytest..."
|
||||||
|
if [ -n "$TEST_TARGET" ]; then
|
||||||
|
# Use "${PYTEST_ARGS[@]:-}" to safely expand empty array with 'set -u'
|
||||||
|
pytest "$TEST_TARGET" "${PYTEST_ARGS[@]:-}"
|
||||||
|
else
|
||||||
|
# Use "${PYTEST_ARGS[@]:-}" to safely expand empty array with 'set -u'
|
||||||
|
pytest "${PYTEST_ARGS[@]:-}"
|
||||||
|
fi
|
||||||
|
popd >/dev/null
|
||||||
|
|
||||||
|
# Cleanup handled by trap
|
||||||
@@ -3,17 +3,6 @@ import pytest
|
|||||||
from httpx import AsyncClient, ASGITransport
|
from httpx import AsyncClient, ASGITransport
|
||||||
|
|
||||||
|
|
||||||
def test_root_ok(client):
|
|
||||||
resp = client.get("/")
|
|
||||||
assert resp.status_code == status.HTTP_200_OK
|
|
||||||
assert resp.json() == {"status": "ok"}
|
|
||||||
|
|
||||||
|
|
||||||
def test_authenticated_route_requires_auth(client):
|
|
||||||
resp = client.get("/authenticated-route")
|
|
||||||
assert resp.status_code in (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_create_and_get_category(fastapi_app, test_user):
|
async def test_create_and_get_category(fastapi_app, test_user):
|
||||||
# Use AsyncClient for async tests
|
# Use AsyncClient for async tests
|
||||||
@@ -165,6 +154,6 @@ async def test_delete_transaction_not_found(fastapi_app, test_user):
|
|||||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||||
token = (await ac.post("/auth/jwt/login", data=test_user)).json()["access_token"]
|
token = (await ac.post("/auth/jwt/login", data=test_user)).json()["access_token"]
|
||||||
h = {"Authorization": f"Bearer {token}"}
|
h = {"Authorization": f"Bearer {token}"}
|
||||||
r = await ac.delete("/transactions/999999/delete", headers=h)
|
r = await ac.delete("/transactions/9999999/delete", headers=h)
|
||||||
assert r.status_code == status.HTTP_404_NOT_FOUND
|
assert r.status_code == status.HTTP_404_NOT_FOUND
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
import types
|
|
||||||
import asyncio
|
|
||||||
import pytest
|
import pytest
|
||||||
|
from fastapi import status
|
||||||
from app.services import user_service
|
from app.services import user_service
|
||||||
|
|
||||||
|
|
||||||
@@ -22,6 +20,15 @@ def test_get_jwt_strategy_lifetime():
|
|||||||
# Basic smoke check: strategy has a lifetime set to 604800
|
# Basic smoke check: strategy has a lifetime set to 604800
|
||||||
assert getattr(strategy, "lifetime_seconds", None) in (604800,)
|
assert getattr(strategy, "lifetime_seconds", None) in (604800,)
|
||||||
|
|
||||||
|
def test_root_ok(client):
|
||||||
|
resp = client.get("/")
|
||||||
|
assert resp.status_code == status.HTTP_200_OK
|
||||||
|
assert resp.json() == {"status": "ok"}
|
||||||
|
|
||||||
|
|
||||||
|
def test_authenticated_route_requires_auth(client):
|
||||||
|
resp = client.get("/authenticated-route")
|
||||||
|
assert resp.status_code in (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_on_after_request_verify_enqueues_email(monkeypatch):
|
async def test_on_after_request_verify_enqueues_email(monkeypatch):
|
||||||
|
|||||||
@@ -90,6 +90,11 @@ spec:
|
|||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: prod
|
name: prod
|
||||||
key: CSAS_CLIENT_SECRET
|
key: CSAS_CLIENT_SECRET
|
||||||
|
- name: UNIRATE_API_KEY
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: UNIRATE_API_KEY
|
||||||
- name: DOMAIN
|
- name: DOMAIN
|
||||||
value: {{ required "Set .Values.domain" .Values.domain | quote }}
|
value: {{ required "Set .Values.domain" .Values.domain | quote }}
|
||||||
- name: DOMAIN_SCHEME
|
- name: DOMAIN_SCHEME
|
||||||
|
|||||||
25
7project/charts/myapp-chart/templates/cron.yaml
Normal file
25
7project/charts/myapp-chart/templates/cron.yaml
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
{{- if .Values.cron.enabled }}
|
||||||
|
apiVersion: batch/v1
|
||||||
|
kind: CronJob
|
||||||
|
metadata:
|
||||||
|
name: cronjob
|
||||||
|
spec:
|
||||||
|
schedule: {{ .Values.cron.schedule | quote }}
|
||||||
|
concurrencyPolicy: {{ .Values.cron.concurrencyPolicy | quote }}
|
||||||
|
jobTemplate:
|
||||||
|
spec:
|
||||||
|
template:
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: cronjob
|
||||||
|
image: curlimages/curl:latest
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
|
args:
|
||||||
|
- -sS
|
||||||
|
- -o
|
||||||
|
- /dev/null
|
||||||
|
- -w
|
||||||
|
- "%{http_code}"
|
||||||
|
- {{ printf "%s://%s.%s.svc.cluster.local%s" .Values.cron.scheme .Values.app.name .Release.Namespace .Values.cron.endpoint | quote }}
|
||||||
|
restartPolicy: OnFailure
|
||||||
|
{{- end }}
|
||||||
@@ -19,3 +19,11 @@ stringData:
|
|||||||
RABBITMQ_USERNAME: {{ .Values.rabbitmq.username | quote }}
|
RABBITMQ_USERNAME: {{ .Values.rabbitmq.username | quote }}
|
||||||
SENTRY_DSN: {{ .Values.sentry_dsn | quote }}
|
SENTRY_DSN: {{ .Values.sentry_dsn | quote }}
|
||||||
DB_ENCRYPTION_KEY: {{ required "Set .Values.database.encryptionSecret" .Values.database.encryptionSecret | quote }}
|
DB_ENCRYPTION_KEY: {{ required "Set .Values.database.encryptionSecret" .Values.database.encryptionSecret | quote }}
|
||||||
|
SMTP_HOST: {{ .Values.smtp.host | default "" | quote }}
|
||||||
|
SMTP_PORT: {{ .Values.smtp.port | default 587 | quote }}
|
||||||
|
SMTP_USERNAME: {{ .Values.smtp.username | default "" | quote }}
|
||||||
|
SMTP_PASSWORD: {{ .Values.smtp.password | default "" | quote }}
|
||||||
|
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 }}
|
||||||
|
|||||||
@@ -85,3 +85,40 @@ spec:
|
|||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: prod
|
name: prod
|
||||||
key: DB_ENCRYPTION_KEY
|
key: DB_ENCRYPTION_KEY
|
||||||
|
- name: SMTP_HOST
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: SMTP_HOST
|
||||||
|
- name: SMTP_PORT
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: SMTP_PORT
|
||||||
|
- name: SMTP_USERNAME
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: SMTP_USERNAME
|
||||||
|
- name: SMTP_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: SMTP_PASSWORD
|
||||||
|
- name: SMTP_USE_TLS
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: SMTP_USE_TLS
|
||||||
|
- name: SMTP_USE_SSL
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: SMTP_USE_SSL
|
||||||
|
- name: SMTP_FROM
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: prod
|
||||||
|
key: SMTP_FROM
|
||||||
|
- name: APP_POD_URL
|
||||||
|
value: {{ printf "http://%s.%s.svc.cluster.local" .Values.app.name .Release.Namespace | quote }}
|
||||||
|
|||||||
@@ -5,3 +5,6 @@ app:
|
|||||||
|
|
||||||
worker:
|
worker:
|
||||||
replicas: 3
|
replicas: 3
|
||||||
|
|
||||||
|
cron:
|
||||||
|
enabled: true
|
||||||
|
|||||||
@@ -13,6 +13,9 @@ deployment: ""
|
|||||||
domain: ""
|
domain: ""
|
||||||
domain_scheme: ""
|
domain_scheme: ""
|
||||||
|
|
||||||
|
unirate:
|
||||||
|
key: ""
|
||||||
|
|
||||||
frontend_domain: ""
|
frontend_domain: ""
|
||||||
frontend_domain_scheme: ""
|
frontend_domain_scheme: ""
|
||||||
|
|
||||||
@@ -35,6 +38,23 @@ worker:
|
|||||||
# Queue name for Celery worker and for CRD Queue
|
# Queue name for Celery worker and for CRD Queue
|
||||||
mailQueueName: "mail_queue"
|
mailQueueName: "mail_queue"
|
||||||
|
|
||||||
|
cron:
|
||||||
|
enabled: false
|
||||||
|
schedule: "*/5 * * * *" # every 5 minutes
|
||||||
|
scheme: "http"
|
||||||
|
endpoint: "/_cron"
|
||||||
|
concurrencyPolicy: "Forbid"
|
||||||
|
|
||||||
|
smtp:
|
||||||
|
host:
|
||||||
|
port: 587
|
||||||
|
username: ""
|
||||||
|
password: ""
|
||||||
|
tls: false
|
||||||
|
ssl: false
|
||||||
|
from: ""
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
service:
|
service:
|
||||||
port: 80
|
port: 80
|
||||||
|
|||||||
@@ -133,6 +133,9 @@ export type User = {
|
|||||||
is_active: boolean;
|
is_active: boolean;
|
||||||
is_superuser: boolean;
|
is_superuser: boolean;
|
||||||
is_verified: boolean;
|
is_verified: boolean;
|
||||||
|
// Optional JSON config object for user-level integrations and settings
|
||||||
|
// Example: { csas: "{\"expires_at\": 1761824615, ...}" } or { csas: { expires_at: 1761824615, ... } }
|
||||||
|
config?: Record<string, any> | null;
|
||||||
};
|
};
|
||||||
|
|
||||||
export async function getMe(): Promise<User> {
|
export async function getMe(): Promise<User> {
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState, useCallback } from 'react';
|
||||||
import { type Category, type Transaction, type BalancePoint, deleteTransaction, getCategories, getTransactions, createTransaction, updateTransaction, getBalanceSeries } from '../api';
|
import { type Category, type Transaction, type BalancePoint, getMe, deleteTransaction, getCategories, getTransactions, createTransaction, updateTransaction, getBalanceSeries } from '../api';
|
||||||
import AccountPage from './AccountPage';
|
import AccountPage from './AccountPage';
|
||||||
import AppearancePage from './AppearancePage';
|
import AppearancePage from './AppearancePage';
|
||||||
import BalanceChart from './BalanceChart';
|
import BalanceChart from './BalanceChart';
|
||||||
import ManualManagement from './ManualManagement';
|
import ManualManagement from './ManualManagement';
|
||||||
import CategoryPieChart from './CategoryPieChart';
|
import CategoryPieChart from './CategoryPieChart';
|
||||||
import MockBankModal, { type MockGenerationOptions } from './MockBankModal';
|
import MockBankModal, { type MockGenerationOptions } from './MockBankModal';
|
||||||
import { BACKEND_URL, VITE_UNIRATE_API_KEY } from '../config';
|
import { BACKEND_URL } from '../config';
|
||||||
|
|
||||||
function formatAmount(n: number) {
|
function formatAmount(n: number) {
|
||||||
return new Intl.NumberFormat(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(n);
|
return new Intl.NumberFormat(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(n);
|
||||||
@@ -21,17 +21,6 @@ type RateData = {
|
|||||||
rate: number;
|
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
|
// The currencies you want to display
|
||||||
const TARGET_CURRENCIES = ['EUR', 'USD', 'NOK'];
|
const TARGET_CURRENCIES = ['EUR', 'USD', 'NOK'];
|
||||||
|
|
||||||
@@ -45,49 +34,20 @@ function CurrencyRates() {
|
|||||||
setLoading(true);
|
setLoading(true);
|
||||||
setError(null);
|
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 {
|
try {
|
||||||
const res = await fetch(UNIRATE_API_URL);
|
const base = BACKEND_URL.replace(/\/$/, '');
|
||||||
const data: UnirateApiResponse = await res.json();
|
const url = `${base}/exchange-rates?symbols=${TARGET_CURRENCIES.join(',')}`;
|
||||||
|
const token = localStorage.getItem('token');
|
||||||
// --- THIS IS THE NEW, CORRECTED LOGIC ---
|
const res = await fetch(url, {
|
||||||
|
headers: token ? { Authorization: `Bearer ${token}` } : undefined,
|
||||||
// 1. Check if the 'rates' object exists. If not, it's an error.
|
credentials: 'include',
|
||||||
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,
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
|
if (!res.ok) {
|
||||||
setRates(formattedRates);
|
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) {
|
} catch (err: any) {
|
||||||
setError(err.message || 'Could not load rates');
|
setError(err.message || 'Could not load rates');
|
||||||
} finally {
|
} finally {
|
||||||
@@ -158,6 +118,47 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
|||||||
const [isMockModalOpen, setMockModalOpen] = useState(false);
|
const [isMockModalOpen, setMockModalOpen] = useState(false);
|
||||||
const [isGenerating, setIsGenerating] = useState(false);
|
const [isGenerating, setIsGenerating] = useState(false);
|
||||||
|
|
||||||
|
// Current user and CSAS connection status
|
||||||
|
const [csasConnected, setCsasConnected] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
(async () => {
|
||||||
|
try {
|
||||||
|
const u = await getMe();
|
||||||
|
// Determine CSAS connection validity
|
||||||
|
const csas = (u as any)?.config?.csas;
|
||||||
|
let obj: any = null;
|
||||||
|
if (csas) {
|
||||||
|
if (typeof csas === 'string') {
|
||||||
|
try { obj = JSON.parse(csas); } catch {}
|
||||||
|
} else if (typeof csas === 'object') {
|
||||||
|
obj = csas;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let exp: number | null = null;
|
||||||
|
const raw = obj?.expires_at;
|
||||||
|
if (typeof raw === 'number') {
|
||||||
|
exp = raw;
|
||||||
|
} else if (typeof raw === 'string') {
|
||||||
|
const asNum = Number(raw);
|
||||||
|
if (!Number.isNaN(asNum)) {
|
||||||
|
exp = asNum;
|
||||||
|
} else {
|
||||||
|
const ms = Date.parse(raw);
|
||||||
|
if (!Number.isNaN(ms)) exp = Math.floor(ms / 1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (exp && exp > Math.floor(Date.now() / 1000)) {
|
||||||
|
setCsasConnected(true);
|
||||||
|
} else {
|
||||||
|
setCsasConnected(false);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
// ignore, user may not be loaded; keep button enabled
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
}, []);
|
||||||
|
|
||||||
// Start CSAS (George) OAuth after login
|
// Start CSAS (George) OAuth after login
|
||||||
async function startOauthCsas() {
|
async function startOauthCsas() {
|
||||||
const base = BACKEND_URL.replace(/\/$/, '');
|
const base = BACKEND_URL.replace(/\/$/, '');
|
||||||
@@ -208,7 +209,14 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
|||||||
// Sidebar toggle for mobile
|
// Sidebar toggle for mobile
|
||||||
const [sidebarOpen, setSidebarOpen] = useState(false);
|
const [sidebarOpen, setSidebarOpen] = useState(false);
|
||||||
|
|
||||||
|
// Multi-select state for transactions and bulk category assignment
|
||||||
|
const [selectedTxIds, setSelectedTxIds] = useState<number[]>([]);
|
||||||
|
const [bulkCategoryIds, setBulkCategoryIds] = useState<number[]>([]);
|
||||||
|
const toggleSelectTx = useCallback((id: number) => {
|
||||||
|
setSelectedTxIds(prev => prev.includes(id) ? prev.filter(x => x !== id) : [...prev, id]);
|
||||||
|
}, []);
|
||||||
|
const clearSelection = useCallback(() => setSelectedTxIds([]), []);
|
||||||
|
const selectAllVisible = useCallback((ids: number[]) => setSelectedTxIds(ids), []);
|
||||||
|
|
||||||
async function loadAll() {
|
async function loadAll() {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
@@ -235,47 +243,53 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
|||||||
setIsGenerating(true);
|
setIsGenerating(true);
|
||||||
setMockModalOpen(false);
|
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 {
|
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);
|
newTransactions.push(created);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error("Failed to create mock transaction:", err);
|
console.error('Failed to create mock transaction:', err);
|
||||||
alert('An error occurred while generating transactions. Check the console.');
|
// continue creating others
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setIsGenerating(false);
|
|
||||||
alert(`${newTransactions.length} mock transactions were successfully generated!`);
|
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();
|
await loadAll();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
useEffect(() => { loadAll(); }, [startDate, endDate]);
|
useEffect(() => { loadAll(); clearSelection(); }, [startDate, endDate]);
|
||||||
|
|
||||||
const filtered = useMemo(() => {
|
const filtered = useMemo(() => {
|
||||||
let arr = [...transactions];
|
let arr = [...transactions];
|
||||||
@@ -301,6 +315,9 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
|||||||
const pageEnd = pageStart + pageSize;
|
const pageEnd = pageStart + pageSize;
|
||||||
const visible = sortedDesc.slice(pageStart, pageEnd);
|
const visible = sortedDesc.slice(pageStart, pageEnd);
|
||||||
|
|
||||||
|
// Reset selection when page or filters impacting visible set change
|
||||||
|
useEffect(() => { clearSelection(); }, [page, minAmount, maxAmount, filterCategoryId, searchText]);
|
||||||
|
|
||||||
function categoryNameById(id: number) { return categories.find(c => c.id === id)?.name || `#${id}`; }
|
function categoryNameById(id: number) { return categories.find(c => c.id === id)?.name || `#${id}`; }
|
||||||
|
|
||||||
|
|
||||||
@@ -388,7 +405,7 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
|||||||
<h3>Bank connections</h3>
|
<h3>Bank connections</h3>
|
||||||
<div className="connection-row">
|
<div className="connection-row">
|
||||||
<p className="muted" style={{ margin: 0 }}>Connect your CSAS (George) account.</p>
|
<p className="muted" style={{ margin: 0 }}>Connect your CSAS (George) account.</p>
|
||||||
<button className="btn primary" onClick={startOauthCsas}>Connect CSAS (George)</button>
|
<button className="btn primary" onClick={startOauthCsas} disabled={csasConnected}>{csasConnected ? 'Successfully connected to CSAS' : 'Connect CSAS (George)'}</button>
|
||||||
</div>
|
</div>
|
||||||
<div className="connection-row">
|
<div className="connection-row">
|
||||||
<p className="muted" style={{ margin: 0 }}>Generate data from a mock bank.</p>
|
<p className="muted" style={{ margin: 0 }}>Generate data from a mock bank.</p>
|
||||||
@@ -450,7 +467,55 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
|||||||
<div className="muted">
|
<div className="muted">
|
||||||
Showing {visible.length} of {filtered.length} (page {Math.min(page + 1, Math.max(1, totalPages))}/{Math.max(1, totalPages)})
|
Showing {visible.length} of {filtered.length} (page {Math.min(page + 1, Math.max(1, totalPages))}/{Math.max(1, totalPages)})
|
||||||
</div>
|
</div>
|
||||||
<div className="actions">
|
<div className="actions" style={{ gap: 8, alignItems: 'center' }}>
|
||||||
|
{selectedTxIds.length > 0 && (
|
||||||
|
<>
|
||||||
|
<span className="muted">Selected: {selectedTxIds.length}</span>
|
||||||
|
<select
|
||||||
|
className="input"
|
||||||
|
multiple
|
||||||
|
value={bulkCategoryIds.map(String)}
|
||||||
|
onChange={(e) => {
|
||||||
|
const ids = Array.from(e.currentTarget.selectedOptions).map(o => Number(o.value));
|
||||||
|
setBulkCategoryIds(ids);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{categories.map(c => (
|
||||||
|
<option key={c.id} value={c.id}>{c.name}</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
<button
|
||||||
|
className="btn primary"
|
||||||
|
onClick={async () => {
|
||||||
|
if (bulkCategoryIds.length === 0) {
|
||||||
|
alert('Pick at least one category to assign.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
// Apply selected categories to each selected transaction, replacing their categories
|
||||||
|
const updates = await Promise.allSettled(
|
||||||
|
selectedTxIds.map(id => updateTransaction(id, { category_ids: bulkCategoryIds }))
|
||||||
|
);
|
||||||
|
const fulfilled = updates.filter(u => u.status === 'fulfilled') as PromiseFulfilledResult<Transaction>[];
|
||||||
|
const updatedById = new Map<number, Transaction>(fulfilled.map(f => [f.value.id, f.value]));
|
||||||
|
setTransactions(prev => prev.map(t => updatedById.get(t.id) || t));
|
||||||
|
try { setBalanceSeries(await getBalanceSeries(startDate || undefined, endDate || undefined)); } catch {}
|
||||||
|
if (fulfilled.length !== selectedTxIds.length) {
|
||||||
|
alert(`Assigned categories to ${fulfilled.length} of ${selectedTxIds.length} selected transactions. Some updates failed.`);
|
||||||
|
}
|
||||||
|
} catch (e: any) {
|
||||||
|
alert(e?.message || 'Failed to assign categories');
|
||||||
|
} finally {
|
||||||
|
clearSelection();
|
||||||
|
setBulkCategoryIds([]);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Apply categories to selected
|
||||||
|
</button>
|
||||||
|
<button className="btn" onClick={clearSelection}>Clear selection</button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
<button className="btn primary" disabled={page <= 0} onClick={() => setPage(p => Math.max(0, p - 1))}>Previous</button>
|
<button className="btn primary" disabled={page <= 0} onClick={() => setPage(p => Math.max(0, p - 1))}>Previous</button>
|
||||||
<button className="btn primary" disabled={page >= totalPages - 1} onClick={() => setPage(p => Math.min(totalPages - 1, p + 1))}>Next</button>
|
<button className="btn primary" disabled={page >= totalPages - 1} onClick={() => setPage(p => Math.min(totalPages - 1, p + 1))}>Next</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -458,6 +523,21 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
|||||||
<table className="table responsive">
|
<table className="table responsive">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
<th style={{ width: 36 }}>
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
aria-label="Select all on page"
|
||||||
|
checked={visible.length > 0 && visible.every(v => selectedTxIds.includes(v.id))}
|
||||||
|
onChange={(e) => {
|
||||||
|
if (e.currentTarget.checked) {
|
||||||
|
selectAllVisible(visible.map(v => v.id));
|
||||||
|
} else {
|
||||||
|
// remove only currently visible from selection
|
||||||
|
setSelectedTxIds(prev => prev.filter(id => !visible.some(v => v.id === id)));
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</th>
|
||||||
<th>Date</th>
|
<th>Date</th>
|
||||||
<th style={{ textAlign: 'right' }}>Amount</th>
|
<th style={{ textAlign: 'right' }}>Amount</th>
|
||||||
<th>Description</th>
|
<th>Description</th>
|
||||||
@@ -467,7 +547,15 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{visible.map(t => (
|
{visible.map(t => (
|
||||||
<tr key={t.id}>
|
<tr key={t.id} style={{ backgroundColor: selectedTxIds.includes(t.id) ? 'rgba(88, 136, 255, 0.1)' : undefined }}>
|
||||||
|
<td>
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
aria-label={`Select transaction ${t.id}`}
|
||||||
|
checked={selectedTxIds.includes(t.id)}
|
||||||
|
onChange={() => toggleSelectTx(t.id)}
|
||||||
|
/>
|
||||||
|
</td>
|
||||||
{/* Date cell */}
|
{/* Date cell */}
|
||||||
<td data-label="Date">
|
<td data-label="Date">
|
||||||
{editingTxId === t.id ? (
|
{editingTxId === t.id ? (
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
# Personal finance tracker
|
# Personal finance tracker
|
||||||
|
|
||||||
> **Instructions**:
|
<!--- **Instructions**:
|
||||||
> This template provides the structure for your project report.
|
> This template provides the structure for your project report.
|
||||||
> Replace the placeholder text with your actual content.
|
> Replace the placeholder text with your actual content.
|
||||||
> Remove instructions that are not relevant for your project, but leave the headings along with a (NA) label.
|
> Remove instructions that are not relevant for your project, but leave the headings along with a (NA) label. -->
|
||||||
|
|
||||||
## Project Overview
|
## Project Overview
|
||||||
|
|
||||||
@@ -12,15 +12,21 @@
|
|||||||
**Group Members**:
|
**Group Members**:
|
||||||
|
|
||||||
- 289229, Lukáš Trkan, lukastrkan
|
- 289229, Lukáš Trkan, lukastrkan
|
||||||
- 289258, Dejan Ribarovski, derib2613, ribardej
|
- 289258, Dejan Ribarovski, ribardej (derib2613)
|
||||||
|
|
||||||
**Brief Description**:
|
**Brief Description**:
|
||||||
Our application is a finance tracker, so a person can easily track his cash flow
|
Our application allows users to easily track their cash flow
|
||||||
through multiple bank accounts. Person can label transactions with custom categories
|
through multiple bank accounts. Users can label their transactions with custom categories that can be later used for
|
||||||
and later filter by them.
|
filtering and visualization. New transactions are automatically fetched in the background.
|
||||||
|
|
||||||
## Architecture Overview
|
## Architecture Overview
|
||||||
Our system is a full‑stack web application composed of a React frontend, a FastAPI backend, a PostgreSQL database, and asynchronous background workers powered by Celery with RabbitMQ. Redis is available for caching/kv and may be used by Celery as a result backend. The backend exposes REST endpoints for authentication (email/password and OAuth), users, categories, and transactions. A thin controller layer (FastAPI routers) lives under app/api. Infrastructure for Kubernetes is provided via OpenTofu (Terraform‑compatible) modules and the application is packaged via a Helm chart.
|
Our system is a full‑stack web application composed of a React frontend, a FastAPI backend,
|
||||||
|
a PostgreSQL database, and asynchronous background workers powered by Celery with RabbitMQ.
|
||||||
|
Redis is available for caching/kv and may be used by Celery as a result backend. The backend
|
||||||
|
exposes REST endpoints for authentication (email/password and OAuth), users, categories,
|
||||||
|
transactions, exchange rates and bank APIs. A thin controller layer (FastAPI routers) lives under app/api.
|
||||||
|
Infrastructure for Kubernetes is provided via OpenTofu (Terraform‑compatible) modules and
|
||||||
|
the application is packaged via a Helm chart.
|
||||||
|
|
||||||
### High-Level Architecture
|
### High-Level Architecture
|
||||||
|
|
||||||
@@ -28,26 +34,33 @@ Our system is a full‑stack web application composed of a React frontend, a Fas
|
|||||||
flowchart LR
|
flowchart LR
|
||||||
proc_queue[Message Queue] --> proc_queue_worker[Worker Service]
|
proc_queue[Message Queue] --> proc_queue_worker[Worker Service]
|
||||||
proc_queue_worker --> ext_mail[(Email Service)]
|
proc_queue_worker --> ext_mail[(Email Service)]
|
||||||
proc_cron[Task planner] --> proc_queue
|
proc_cron[Cron] --> svc
|
||||||
proc_queue_worker --> ext_bank[(Bank API)]
|
proc_queue_worker --> ext_bank[(Bank API)]
|
||||||
proc_queue_worker --> db
|
proc_queue_worker --> db
|
||||||
client[Client/Frontend] <--> svc[Backend API]
|
client[Client/Frontend] <--> svc[Backend API]
|
||||||
svc --> proc_queue
|
svc --> proc_queue
|
||||||
svc <--> db[(Database)]
|
svc <--> db[(Database)]
|
||||||
|
svc <--> api[(UniRate API)]
|
||||||
```
|
```
|
||||||
|
|
||||||
The workflow works in the following way:
|
The workflow works in the following way:
|
||||||
- Client connects to the frontend. After login, frontend automatically fetches the stored transactions from
|
- Client connects to the frontend. After login, frontend automatically fetches the stored transactions from
|
||||||
the database via the backend API
|
the database via the backend API and currency rates from UniRate API.
|
||||||
- When the client opts for fetching new transactions via the Bank API, the backend delegates the task
|
- When the client opts for fetching new transactions via the Bank API, the backend delegates the task
|
||||||
to a background worker service via the Message queue.
|
to a background worker service via the Message queue.
|
||||||
- After successful load, these transactions are stored to the database and displayed to the client
|
- After successful load, these transactions are stored to the database and displayed to the client
|
||||||
- There is also a Task planner, that executes periodic tasks, like fetching new transactions automatically from the Bank API
|
- There is also a Task planner, that executes periodic tasks, like fetching new transactions automatically from the Bank APIs
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- The stored transactions are encrypted in the DB for security reasons.
|
||||||
|
- For every pull request the full APP is deployed on a separate URL and the tests are run by github CI/CD
|
||||||
|
- On every push to main, the production app is automatically updated
|
||||||
|
- UI is responsive for mobile devices
|
||||||
|
|
||||||
### Components
|
### Components
|
||||||
|
|
||||||
- Frontend (frontend/): React + TypeScript app built with Vite. Talks to the backend via REST, handles login/registration, shows latest transactions, filtering, and allows adding transactions.
|
- Frontend (frontend/): React + TypeScript app built with Vite. Talks to the backend via REST, handles login/registration, shows latest transactions, filtering, and allows adding transactions.
|
||||||
- Backend API (backend/app): FastAPI app with routers under app/api for auth, categories, and transactions. Uses FastAPI Users for auth (JWT + OAuth), SQLAlchemy ORM, and Pydantic v2 schemas.
|
- Backend API (backend/app): FastAPI app with routers under app/api for auth, users, categories, transactions, exchange rates and bankAPI. Uses FastAPI Users for auth (JWT + OAuth), SQLAlchemy ORM, and Pydantic v2 schemas.
|
||||||
- Worker service (backend/app/workers): Celery worker handling asynchronous tasks (e.g., sending verification emails, future background processing).
|
- Worker service (backend/app/workers): Celery worker handling asynchronous tasks (e.g., sending verification emails, future background processing).
|
||||||
- Database (PostgreSQL): Persists users, categories, transactions; schema managed by Alembic migrations.
|
- Database (PostgreSQL): Persists users, categories, transactions; schema managed by Alembic migrations.
|
||||||
- Message Queue (RabbitMQ): Transports background jobs from the API to the worker.
|
- Message Queue (RabbitMQ): Transports background jobs from the API to the worker.
|
||||||
@@ -59,7 +72,7 @@ to a background worker service via the Message queue.
|
|||||||
|
|
||||||
- Backend: Python, FastAPI, FastAPI Users, SQLAlchemy, Pydantic, Alembic, Celery
|
- Backend: Python, FastAPI, FastAPI Users, SQLAlchemy, Pydantic, Alembic, Celery
|
||||||
- Frontend: React, TypeScript, Vite
|
- Frontend: React, TypeScript, Vite
|
||||||
- Database: MariaDB (Maxscale)
|
- Database: MariaDB with Maxscale
|
||||||
- Background jobs: RabbitMQ, Celery
|
- Background jobs: RabbitMQ, Celery
|
||||||
- Containerization/Orchestration: Docker, Docker Compose (dev), Kubernetes, Helm
|
- Containerization/Orchestration: Docker, Docker Compose (dev), Kubernetes, Helm
|
||||||
- IaC/Platform: Proxmox, Talos, Cloudflare pages, OpenTofu (Terraform), cert-manager, MetalLB, Cloudflare Tunnel, Prometheus, Loki
|
- IaC/Platform: Proxmox, Talos, Cloudflare pages, OpenTofu (Terraform), cert-manager, MetalLB, Cloudflare Tunnel, Prometheus, Loki
|
||||||
@@ -86,7 +99,7 @@ to a background worker service via the Message queue.
|
|||||||
### Environment Variables (common)
|
### Environment Variables (common)
|
||||||
|
|
||||||
# TODO: UPDATE
|
# TODO: UPDATE
|
||||||
- Backend: SECRET, FRONTEND_URL, BACKEND_URL, DATABASE_URL, RABBITMQ_URL, REDIS_URL
|
- Backend: SECRET, FRONTEND_URL, BACKEND_URL, DATABASE_URL, RABBITMQ_URL, REDIS_URL, UNIRATE_API_KEY
|
||||||
|
|
||||||
- OAuth vars (Backend): MOJEID_CLIENT_ID/SECRET, BANKID_CLIENT_ID/SECRET (optional)
|
- OAuth vars (Backend): MOJEID_CLIENT_ID/SECRET, BANKID_CLIENT_ID/SECRET (optional)
|
||||||
- Frontend: VITE_BACKEND_URL
|
- Frontend: VITE_BACKEND_URL
|
||||||
@@ -256,28 +269,33 @@ open http://localhost:5173
|
|||||||
```
|
```
|
||||||
|
|
||||||
## Testing Instructions
|
## Testing Instructions
|
||||||
The tests are located in 7project/backend/tests directory
|
The tests are located in 7project/backend/tests directory. All tests are run by GitHub actions on every pull request and push to main.
|
||||||
If you want to test locally, you have to have the DB running locally as well (start the docker compose in /backend).
|
See the workflow [here](../.github/workflows/run-tests.yml).
|
||||||
|
|
||||||
|
If you want to run the tests locally, the preferred is to use a [bash script](backend/test-with-ephemeral-mariadb.sh)
|
||||||
|
that will start a [test DB container](backend/docker-compose.test.yml) and remove it afterward.
|
||||||
```bash
|
```bash
|
||||||
cd backend
|
cd 7project/backend
|
||||||
|
bash test-with-ephemeral-mariadb.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
### Unit Tests
|
### Unit Tests
|
||||||
There are only 3 basic unit tests, since our services logic is very simple
|
There are only 5 basic unit tests, since our services logic is very simple
|
||||||
```bash
|
```bash
|
||||||
pytest tests/test_unit_user_service.py
|
bash test-with-ephemeral-mariadb.sh --only-unit
|
||||||
```
|
```
|
||||||
|
|
||||||
### Integration Tests
|
### Integration Tests
|
||||||
There are 11 basic unit tests, testing the individual backend API logic
|
There are 9 basic unit tests, testing the individual backend API logic
|
||||||
```bash
|
```bash
|
||||||
pytest tests/test_integration_app.py
|
bash test-with-ephemeral-mariadb.sh --only-integration
|
||||||
```
|
```
|
||||||
|
|
||||||
### End-to-End Tests
|
### End-to-End Tests
|
||||||
There are 7 e2e tests testing more complex app logic
|
There are 7 e2e tests, testing more complex app logic
|
||||||
```bash
|
```bash
|
||||||
pytest tests/test_e2e.py
|
bash test-with-ephemeral-mariadb.sh --only-e2e
|
||||||
```
|
```
|
||||||
|
|
||||||
## Usage Examples
|
## Usage Examples
|
||||||
|
|||||||
@@ -105,14 +105,6 @@ module "database" {
|
|||||||
s3_key_secret = var.s3_key_secret
|
s3_key_secret = var.s3_key_secret
|
||||||
}
|
}
|
||||||
|
|
||||||
#module "argocd" {
|
|
||||||
# source = "${path.module}/modules/argocd"
|
|
||||||
# depends_on = [module.storage, module.loadbalancer, module.cloudflare]
|
|
||||||
|
|
||||||
# argocd_admin_password = var.argocd_admin_password
|
|
||||||
# cloudflare_domain = var.cloudflare_domain
|
|
||||||
#}
|
|
||||||
|
|
||||||
#module "redis" {
|
#module "redis" {
|
||||||
# source = "${path.module}/modules/redis"
|
# source = "${path.module}/modules/redis"
|
||||||
# depends_on = [module.storage]
|
# depends_on = [module.storage]
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
apiVersion: networking.cfargotunnel.com/v1alpha1
|
|
||||||
kind: TunnelBinding
|
|
||||||
metadata:
|
|
||||||
name: argocd-tunnel-binding
|
|
||||||
namespace: argocd
|
|
||||||
subjects:
|
|
||||||
- name: argocd-server
|
|
||||||
spec:
|
|
||||||
target: https://argocd-server.argocd.svc.cluster.local
|
|
||||||
fqdn: argocd.${base_domain}
|
|
||||||
noTlsVerify: true
|
|
||||||
tunnelRef:
|
|
||||||
kind: ClusterTunnel
|
|
||||||
name: cluster-tunnel
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
kubectl = {
|
|
||||||
source = "gavinbunney/kubectl"
|
|
||||||
version = "1.19.0"
|
|
||||||
}
|
|
||||||
helm = {
|
|
||||||
source = "hashicorp/helm"
|
|
||||||
version = "3.0.2"
|
|
||||||
}
|
|
||||||
kubernetes = {
|
|
||||||
source = "hashicorp/kubernetes"
|
|
||||||
version = "2.38.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "kubernetes_namespace" "argocd" {
|
|
||||||
metadata {
|
|
||||||
name = "argocd"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "helm_release" "argocd" {
|
|
||||||
name = "argocd"
|
|
||||||
namespace = "argocd"
|
|
||||||
repository = "https://argoproj.github.io/argo-helm"
|
|
||||||
chart = "argo-cd"
|
|
||||||
depends_on = [kubernetes_namespace.argocd]
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "kubectl_manifest" "argocd-tunnel-bind" {
|
|
||||||
depends_on = [helm_release.argocd]
|
|
||||||
|
|
||||||
yaml_body = templatefile("${path.module}/argocd-ui.yaml", {
|
|
||||||
base_domain = var.cloudflare_domain
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
variable "argocd_admin_password" {
|
|
||||||
type = string
|
|
||||||
nullable = false
|
|
||||||
sensitive = true
|
|
||||||
description = "ArgoCD admin password"
|
|
||||||
}
|
|
||||||
|
|
||||||
variable "cloudflare_domain" {
|
|
||||||
type = string
|
|
||||||
default = "Base cloudflare domain, e.g. example.com"
|
|
||||||
nullable = false
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
name: maxscale-helm
|
name: maxscale-helm
|
||||||
version: 1.0.14
|
version: 1.0.15
|
||||||
description: Helm chart for MaxScale related Kubernetes manifests
|
description: Helm chart for MaxScale related Kubernetes manifests
|
||||||
|
|||||||
@@ -154,6 +154,13 @@ spec:
|
|||||||
memory: 128Mi
|
memory: 128Mi
|
||||||
limits:
|
limits:
|
||||||
memory: 1Gi
|
memory: 1Gi
|
||||||
|
monitor:
|
||||||
|
interval: 2s
|
||||||
|
cooperativeMonitoring: majority_of_all
|
||||||
|
params:
|
||||||
|
auto_failover: "true"
|
||||||
|
auto_rejoin: "true"
|
||||||
|
switchover_on_low_disk_space: "true"
|
||||||
|
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
initialDelaySeconds: 20
|
initialDelaySeconds: 20
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ resource "helm_release" "mariadb-operator" {
|
|||||||
resource "helm_release" "maxscale_helm" {
|
resource "helm_release" "maxscale_helm" {
|
||||||
name = "maxscale-helm"
|
name = "maxscale-helm"
|
||||||
chart = "${path.module}/charts/maxscale-helm"
|
chart = "${path.module}/charts/maxscale-helm"
|
||||||
version = "1.0.14"
|
version = "1.0.15"
|
||||||
depends_on = [helm_release.mariadb-operator-crds, kubectl_manifest.secrets]
|
depends_on = [helm_release.mariadb-operator-crds, kubectl_manifest.secrets]
|
||||||
timeout = 3600
|
timeout = 3600
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user