-
+
+
Transaction History
+
- | Date |
- Portfolio |
- Action |
- Ticker |
- Qty |
+ Date |
+ Portfolio |
+ Action |
+ Ticker |
+ Qty |
+ Price |
+ Fee |
{% for tx in recent_transactions %}
-
- | {{ tx.date|date:"j M Y" }} |
- {{ tx.portfolio.name }} |
-
- {% if tx.action == 'BUY' %}
- BUY
- {% else %}
- SELL
- {% endif %}
- |
- {{ tx.stock_code }} |
- {{ tx.quantity|floatformat:0 }} |
+
+ | {{ tx.date|date:"j M Y" }} |
+ {{ tx.portfolio.name }} |
+ {{ tx.action }} |
+ {{ tx.stock_code }} |
+ {{ tx.quantity|floatformat:0 }} |
+ {% if tx.price_per_share %}${{ tx.price_per_share|floatformat:2 }}{% else %}optional{% endif %} |
+ {% if tx.fee %}${{ tx.fee|floatformat:2 }}{% else %}—{% endif %} |
{% endfor %}
-
{% endif %}
@@ -212,61 +236,21 @@
(function () {
const raw = {{ chart_data_json|safe }};
if (!raw) return;
-
const ctx = document.getElementById('performanceChart');
if (!ctx) return;
-
new Chart(ctx, {
type: 'line',
data: raw,
options: {
responsive: true,
- aspectRatio: window.innerWidth < 640 ? 1.5 : 3.5,
interaction: { mode: 'index', intersect: false },
plugins: {
- legend: {
- position: 'top',
- align: 'start',
- labels: {
- usePointStyle: true,
- pointStyle: 'rect',
- pointStyleWidth: 14,
- padding: 20,
- font: { size: 12, weight: '600' },
- },
- },
- tooltip: {
- callbacks: {
- label: function (ctx) {
- const v = ctx.parsed.y;
- if (v === null || v === undefined) return ctx.dataset.label + ': —';
- const sign = v >= 0 ? '+' : '';
- return ctx.dataset.label + ': ' + sign + v.toFixed(2) + '%';
- },
- },
- },
+ legend: { position: 'top', align: 'start', labels: { usePointStyle: true, pointStyle: 'rect', pointStyleWidth: 14, padding: 20, font: { size: 12, weight: '600' } } },
+ tooltip: { callbacks: { label: function (ctx) { const v = ctx.parsed.y; if (v === null || v === undefined) return ctx.dataset.label + ': —'; const sign = v >= 0 ? '+' : ''; return ctx.dataset.label + ': ' + sign + v.toFixed(2) + '%'; } } },
},
scales: {
- y: {
- ticks: {
- callback: function (v) {
- return (v >= 0 ? '+' : '') + v.toFixed(1) + '%';
- },
- font: { size: 11 },
- },
- grid: {
- color: function (ctx) {
- return ctx.tick.value === 0 ? '#a8a29e' : '#f5f5f4';
- },
- lineWidth: function (ctx) {
- return ctx.tick.value === 0 ? 2 : 1;
- },
- },
- },
- x: {
- grid: { display: false },
- ticks: { font: { size: 11 } },
- },
+ y: { ticks: { callback: function (v) { return (v >= 0 ? '+' : '') + v.toFixed(1) + '%'; }, font: { size: 11 } }, grid: { color: '#f5f5f4' } },
+ x: { grid: { display: false }, ticks: { font: { size: 11 } } },
},
},
});
diff --git a/invest/views.py b/invest/views.py
index 3686f8a..d322b11 100644
--- a/invest/views.py
+++ b/invest/views.py
@@ -1,18 +1,29 @@
import logging
from django.shortcuts import get_object_or_404
-from rest_framework import viewsets, status
+from rest_framework import status, viewsets
from rest_framework.decorators import action
from rest_framework.response import Response
from rest_framework.views import APIView
-from .models import Portfolio, Stock, Transaction
+from .models import BenchmarkPrice, CashFlow, Portfolio, PortfolioSnapshot, Stock, Transaction
from .serializers import (
- PortfolioSerializer, PortfolioListSerializer,
- StockSerializer, TransactionSerializer,
AIUpdateSerializer,
+ BenchmarkPriceSerializer,
+ CashFlowSerializer,
+ PortfolioListSerializer,
+ PortfolioSerializer,
+ PortfolioSnapshotSerializer,
+ StockSerializer,
+ TransactionSerializer,
+)
+from .services import (
+ ai_update_holdings,
+ get_agent_summary,
+ get_cashflow_adjusted_performance,
+ get_portfolio_value,
+ get_risk_summary,
)
-from .services import get_portfolio_value, ai_update_holdings
logger = logging.getLogger(__name__)
@@ -29,8 +40,9 @@ class PortfolioViewSet(viewsets.ModelViewSet):
def holdings(self, request, pk=None):
"""Return holdings with real-time prices."""
portfolio = self.get_object()
+ reference_date = request.query_params.get('reference_date')
try:
- data = get_portfolio_value(portfolio)
+ data = get_portfolio_value(portfolio, reference_date=reference_date)
return Response(data)
except Exception as exc:
logger.error("get_portfolio_value failed for %s: %s", portfolio.id, exc, exc_info=True)
@@ -71,34 +83,51 @@ class TransactionViewSet(viewsets.ModelViewSet):
qs = qs.filter(stock_code=stock_code.upper())
return qs.order_by('-date', '-created_at')
- def create(self, request, *args, **kwargs):
- """Create a new transaction."""
- serializer = self.get_serializer(data=request.data)
- serializer.is_valid(raise_exception=True)
+ def perform_create(self, serializer):
+ serializer.save(stock_code=serializer.validated_data['stock_code'].upper())
- data = serializer.validated_data
- portfolio = data['portfolio']
- try:
- tx = Transaction.objects.create(
- portfolio=portfolio,
- action=data['action'],
- stock_code=data['stock_code'].upper(),
- quantity=data['quantity'],
- date=data['date'],
- )
- except Exception as exc:
- return Response({'error': str(exc)}, status=status.HTTP_400_BAD_REQUEST)
+class CashFlowViewSet(viewsets.ModelViewSet):
+ queryset = CashFlow.objects.select_related('portfolio').all()
+ serializer_class = CashFlowSerializer
- out = TransactionSerializer(tx)
- return Response(out.data, status=status.HTTP_201_CREATED)
+ def get_queryset(self):
+ qs = super().get_queryset()
+ portfolio_id = self.request.query_params.get('portfolio')
+ if portfolio_id:
+ qs = qs.filter(portfolio_id=portfolio_id)
+ flow_type = self.request.query_params.get('flow_type')
+ if flow_type:
+ qs = qs.filter(flow_type=flow_type.upper())
+ return qs.order_by('-date', '-created_at')
+
+
+class PortfolioSnapshotViewSet(viewsets.ReadOnlyModelViewSet):
+ queryset = PortfolioSnapshot.objects.select_related('portfolio').all()
+ serializer_class = PortfolioSnapshotSerializer
+
+ def get_queryset(self):
+ qs = super().get_queryset()
+ portfolio_id = self.request.query_params.get('portfolio')
+ if portfolio_id:
+ qs = qs.filter(portfolio_id=portfolio_id)
+ return qs.order_by('-captured_at')
+
+
+class BenchmarkPriceViewSet(viewsets.ReadOnlyModelViewSet):
+ queryset = BenchmarkPrice.objects.all()
+ serializer_class = BenchmarkPriceSerializer
+
+ def get_queryset(self):
+ qs = super().get_queryset()
+ ticker = self.request.query_params.get('ticker')
+ if ticker:
+ qs = qs.filter(ticker=ticker.upper())
+ return qs.order_by('ticker', 'date')
class AIUpdateView(APIView):
- """
- POST /api/invest/ai-update/
- Sync portfolio holdings (quantity only, no price).
- """
+ """POST /api/invest/ai-update/ — Sync portfolio holdings (quantity only required)."""
def post(self, request):
serializer = AIUpdateSerializer(data=request.data)
@@ -120,3 +149,31 @@ class AIUpdateView(APIView):
return Response(result, status=status.HTTP_200_OK)
+
+class AgentSummaryView(APIView):
+ """GET /api/invest/agent/summary/ — agent-friendly portfolio summary."""
+
+ def get(self, request):
+ return Response(get_agent_summary())
+
+
+class PerformanceView(APIView):
+ """GET /api/invest/performance/?start=YYYY-MM-DD&end=YYYY-MM-DD&benchmarks=QQQ,SPY"""
+
+ def get(self, request):
+ benchmarks = request.query_params.get('benchmarks', 'QQQ,SPY')
+ tickers = [item.strip().upper() for item in benchmarks.split(',') if item.strip()]
+ return Response(
+ get_cashflow_adjusted_performance(
+ start=request.query_params.get('start'),
+ end=request.query_params.get('end'),
+ benchmark_tickers=tickers,
+ )
+ )
+
+
+class RiskView(APIView):
+ """GET /api/invest/risk/ — concentration and theme exposure."""
+
+ def get(self, request):
+ return Response(get_risk_summary())
diff --git a/tests/test_invest_api.py b/tests/test_invest_api.py
new file mode 100644
index 0000000..1858bf5
--- /dev/null
+++ b/tests/test_invest_api.py
@@ -0,0 +1,169 @@
+from datetime import date
+from decimal import Decimal
+
+import pytest
+from django.utils import timezone
+
+from invest.models import BenchmarkPrice, CashFlow, Portfolio, PortfolioSnapshot, Stock, Transaction
+
+
+@pytest.mark.django_db
+def test_transaction_price_fields_are_optional(api_client):
+ portfolio = Portfolio.objects.create(name="Agent Test")
+
+ response = api_client.post(
+ "/api/invest/transactions/",
+ {
+ "portfolio": portfolio.id,
+ "action": "BUY",
+ "stock_code": "NVDA",
+ "quantity": "2",
+ "date": "2026-06-13",
+ },
+ format="json",
+ )
+
+ assert response.status_code == 201
+ tx = Transaction.objects.get()
+ assert tx.price_per_share is None
+ assert tx.currency == "USD"
+ assert tx.fee is None
+ assert response.data["price_per_share"] is None
+
+
+@pytest.mark.django_db
+def test_transaction_accepts_optional_price_currency_and_fee(api_client):
+ portfolio = Portfolio.objects.create(name="Agent Test")
+
+ response = api_client.post(
+ "/api/invest/transactions/",
+ {
+ "portfolio": portfolio.id,
+ "action": "BUY",
+ "stock_code": "NVDA",
+ "quantity": "2",
+ "price_per_share": "100.25",
+ "currency": "USD",
+ "fee": "1.50",
+ "date": "2026-06-13",
+ },
+ format="json",
+ )
+
+ assert response.status_code == 201
+ tx = Transaction.objects.get()
+ assert tx.price_per_share == Decimal("100.250000")
+ assert tx.fee == Decimal("1.500000")
+ assert response.data["price_per_share"] == "100.250000"
+ assert response.data["fee"] == "1.500000"
+
+
+@pytest.mark.django_db
+def test_cashflow_api_records_external_deposits(api_client):
+ portfolio = Portfolio.objects.create(name="Agent Test")
+
+ response = api_client.post(
+ "/api/invest/cashflows/",
+ {
+ "portfolio": portfolio.id,
+ "flow_type": "DEPOSIT",
+ "amount": "2500.00",
+ "currency": "USD",
+ "date": "2026-06-13",
+ "source": "salary",
+ "note": "monthly contribution",
+ },
+ format="json",
+ )
+
+ assert response.status_code == 201
+ flow = CashFlow.objects.get()
+ assert flow.signed_amount == Decimal("2500.00")
+ assert response.data["signed_amount"] == "2500.00"
+
+
+@pytest.mark.django_db
+def test_agent_summary_reports_cash_adjusted_return_and_concentration(api_client, monkeypatch):
+ portfolio = Portfolio.objects.create(name="Agent Test")
+ Stock.objects.create(portfolio=portfolio, stock_code="AAA", quantity=Decimal("10"))
+ Stock.objects.create(portfolio=portfolio, stock_code="BBB", quantity=Decimal("5"))
+ CashFlow.objects.create(
+ portfolio=portfolio,
+ flow_type=CashFlow.FLOW_DEPOSIT,
+ amount=Decimal("1000.00"),
+ currency="USD",
+ date=date(2026, 6, 1),
+ )
+
+ prices = {"AAA": 100.0, "BBB": 20.0}
+ monkeypatch.setattr("invest.services.get_current_price", lambda ticker: prices[ticker])
+
+ response = api_client.get("/api/invest/agent/summary/")
+
+ assert response.status_code == 200
+ payload = response.json()
+ assert payload["total_value"] == 1100.0
+ assert payload["performance"]["net_external_cash_flow"] == 1000.0
+ assert payload["performance"]["cash_adjusted_gain"] == 100.0
+ assert payload["risk"]["top_1_weight"] == pytest.approx(0.9091, rel=1e-3)
+ assert payload["risk"]["max_position"]["stock_code"] == "AAA"
+ assert payload["risk"]["concentration_level"] == "HIGH"
+
+
+@pytest.mark.django_db
+def test_performance_endpoint_excludes_deposits_from_gain(api_client):
+ portfolio = Portfolio.objects.create(name="Agent Test")
+ PortfolioSnapshot.objects.create(
+ portfolio=portfolio,
+ captured_at=timezone.make_aware(timezone.datetime(2026, 6, 1, 8, 0)),
+ total_value=Decimal("1000.00"),
+ )
+ CashFlow.objects.create(
+ portfolio=portfolio,
+ flow_type=CashFlow.FLOW_DEPOSIT,
+ amount=Decimal("500.00"),
+ currency="USD",
+ date=date(2026, 6, 8),
+ )
+ PortfolioSnapshot.objects.create(
+ portfolio=portfolio,
+ captured_at=timezone.make_aware(timezone.datetime(2026, 6, 15, 8, 0)),
+ total_value=Decimal("1700.00"),
+ )
+ BenchmarkPrice.objects.create(ticker="QQQ", date=date(2026, 6, 1), close=Decimal("100.00"))
+ BenchmarkPrice.objects.create(ticker="QQQ", date=date(2026, 6, 8), close=Decimal("110.00"))
+ BenchmarkPrice.objects.create(ticker="QQQ", date=date(2026, 6, 15), close=Decimal("120.00"))
+
+ response = api_client.get("/api/invest/performance/?start=2026-06-01&end=2026-06-15")
+
+ assert response.status_code == 200
+ payload = response.json()
+ assert payload["start_value"] == 1000.0
+ assert payload["end_value"] == 1700.0
+ assert payload["net_external_cash_flow"] == 500.0
+ assert payload["cash_adjusted_gain"] == 200.0
+ assert payload["simple_return"] == pytest.approx(0.1333, rel=1e-3)
+ assert payload["benchmarks"]["QQQ"]["end_value"] == pytest.approx(1745.45, rel=1e-3)
+
+
+@pytest.mark.django_db
+def test_dashboard_shows_agent_first_metrics(client, monkeypatch):
+ portfolio = Portfolio.objects.create(name="Agent Test")
+ Stock.objects.create(portfolio=portfolio, stock_code="AAA", quantity=Decimal("10"))
+ CashFlow.objects.create(
+ portfolio=portfolio,
+ flow_type=CashFlow.FLOW_DEPOSIT,
+ amount=Decimal("1000.00"),
+ currency="USD",
+ date=date(2026, 6, 1),
+ )
+ monkeypatch.setattr("invest.services.get_current_price", lambda ticker: 110.0)
+
+ response = client.get("/invest/")
+
+ assert response.status_code == 200
+ content = response.content.decode()
+ assert "Net Contributions" in content
+ assert "Investment Gain" in content
+ assert "Top 5 Concentration" in content
+ assert "Same-cashflow Benchmark" in content