feat: add portfolio valuation history

CHANGELOG.md

@@ -1,35 +1,5 @@
 # Changelog
 
-## [Frontend 0.15.2] - 2026-08-27
-
-### Fixed
-
-- Clarified that the broker income metric includes coupons, dividends, and interest.
-
-## [Frontend 0.15.1] - 2026-08-27
-
-### Added
-
-- Added a frontend API contract check for portfolio overview, history, and performance requests.
-
-## [Backend 0.14.1] - 2026-08-27
-
-### Added
-
-- Added SQL coverage for repeated and overlapping broker portfolio report imports.
-
-## [Frontend 0.15.0 / Backend 0.14.0 / Shared 0.9.0] - 2026-08-27
-
-### Added
-
-- Added separate broker investment performance metrics: contributions, withdrawals, income, fees, realized and unrealized results.
-
-## [Frontend 0.14.0 / Backend 0.13.0 / Shared 0.8.0] - 2026-08-27
-
-### Added
-
-- Added portfolio valuation history by imported broker report dates.
-
 ## [Frontend 0.13.0 / Backend 0.12.0 / Shared 0.7.0] - 2026-08-27
 
 ### Added

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@family-budget/backend",
-  "version": "0.14.1",
+  "version": "0.13.0",
   "private": true,
   "scripts": {
     "dev": "tsx watch src/app.ts",
@@ -12,7 +12,6 @@
     "test:analytics:query": "tsx src/routes/analytics.test.ts",
     "test:portfolio": "tsx src/services/portfolio.test.ts",
     "test:portfolio:overview": "tsx src/services/portfolioOverview.test.ts",
-    "test:portfolio:performance": "tsx src/services/portfolioOverview.test.ts",
     "test:portfolio:db": "NODE_ENV=test tsx src/services/portfolio.integration.test.ts",
     "test:transactions": "tsx src/services/transactions.test.ts",
     "test:analytics:db": "NODE_ENV=test tsx src/services/analytics.integration.test.ts",

backend/src/app.ts

@@ -22,7 +22,6 @@ import analyticsRouter from './routes/analytics';
 import portfolioRouter from './routes/portfolio';
 import portfolioOverviewRouter from './routes/portfolioOverview';
 import portfolioHistoryRouter from './routes/portfolioHistory';
-import portfolioPerformanceRouter from './routes/portfolioPerformance';
 
 const app = express();
 app.set('trust proxy', 1);
@@ -50,7 +49,6 @@ app.use('/api/analytics', analyticsRouter);
 app.use('/api/import/portfolio', portfolioRouter);
 app.use('/api/portfolio', portfolioOverviewRouter);
 app.use('/api/portfolio/history', portfolioHistoryRouter);
-app.use('/api/portfolio/performance', portfolioPerformanceRouter);
 
 app.use(
   (

backend/src/routes/portfolioPerformance.ts

@@ -1,9 +0,0 @@
-import { Router } from 'express';
-import { asyncHandler } from '../utils';
-import { getPortfolioPerformance } from '../services/portfolio';
-
-const router = Router();
-router.get('/', asyncHandler(async (_req, res) => {
-  res.json(await getPortfolioPerformance());
-}));
-export default router;

backend/src/services/portfolio.integration.test.ts

@@ -8,12 +8,6 @@ const payload = {
   positions: [{ instrument: 'Test Bond', isin: 'RU0000000001', quantity: '1.000', price: '100.123456', valuation: '100.123456' }],
   trades: [{ instrument: 'Test Bond', isin: 'RU0000000001', concludedAt: '2026-08-10T10:00:00+03:00', side: 'Покупка', quantity: '1.000', settlementAmount: '100.123456' }],
 };
-const overlappingPayload = {
-  ...payload,
-  reportPeriod: { from: '2026-08-10', to: '2026-08-25' },
-  positions: [{ ...payload.positions[0], valuation: '120.000000' }],
-  trades: [{ ...payload.trades[0], sourceId: 'second-trade', concludedAt: '2026-08-15T10:00:00+03:00', side: 'Продажа', quantity: '0.500', settlementAmount: '60.000000' }],
-};
 
 async function run(): Promise<void> {
   try {
@@ -23,12 +17,6 @@ async function run(): Promise<void> {
     assert.equal(second.duplicateTrades, 1);
     const rows = await pool.query('SELECT COUNT(*)::int AS count FROM portfolio_trades WHERE account_id = $1', [first.accountId]);
     assert.equal(rows.rows[0].count, 1);
-    const overlapping = await importPortfolio(overlappingPayload);
-    assert.equal(overlapping.importedTrades, 1);
-    const reports = await pool.query('SELECT COUNT(*)::int AS count FROM portfolio_reports WHERE account_id = $1', [first.accountId]);
-    assert.equal(reports.rows[0].count, 2);
-    const trades = await pool.query('SELECT COUNT(*)::int AS count FROM portfolio_trades WHERE account_id = $1', [first.accountId]);
-    assert.equal(trades.rows[0].count, 2);
     console.log('portfolio import SQL: OK');
   } finally {
     await pool.query("DELETE FROM portfolio_trades WHERE account_id IN (SELECT id FROM accounts WHERE bank = 'PORTFOLIO_TEST' AND account_number = 'portfolio-test')");

backend/src/services/portfolio.ts

@@ -2,7 +2,7 @@ import crypto from 'crypto';
 import type { PoolClient } from 'pg';
 import { pool } from '../db/pool';
 import { maskAccountNumber } from '../utils';
-import type { ImportPortfolioResponse, PortfolioFile, PortfolioHistoryResponse, PortfolioOverviewResponse, PortfolioPerformanceResponse, PortfolioTrade } from '@family-budget/shared';
+import type { ImportPortfolioResponse, PortfolioFile, PortfolioHistoryResponse, PortfolioOverviewResponse, PortfolioTrade } from '@family-budget/shared';
 
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 
@@ -29,10 +29,6 @@ type PortfolioHistoryRow = {
   total_valuation: string | number | null;
 };
 
-type PerformanceCashRow = { account_id: number | string; alias: string | null; bank: string; account_number: string; amount_signed: number | string; description: string };
-type PerformanceTradeRow = { account_id: number | string; side: string; quantity: string | number; settlement_amount: string | number | null; settlement_commission: string | number | null; trade_commission: string | number | null; isin: string | null; instrument: string };
-type PerformancePositionRow = { account_id: number | string; quantity: string | number; valuation: string | number | null; isin: string | null; instrument: string };
-
 function decimalValue(value: unknown, field: string, required = false): string | null {
   if (value == null || value === '') {
     if (required) throw new Error(`${field} is required`);
@@ -216,93 +212,3 @@ export async function getPortfolioHistory(): Promise<PortfolioHistoryResponse> {
   );
   return toPortfolioHistory(rows);
 }
-
-type Lot = { quantity: number; cost: number };
-
-export function calculatePortfolioTradeResults(trades: PerformanceTradeRow[], positions: PerformancePositionRow[]): Map<number, { fees: number; realized: number; unrealized: number | null }> {
-  const result = new Map<number, { fees: number; realized: number; unrealized: number | null }>();
-  const lots = new Map<string, Lot[]>();
-  for (const trade of trades) {
-    const accountId = Number(trade.account_id);
-    const current = result.get(accountId) ?? { fees: 0, realized: 0, unrealized: null };
-    const quantity = Number(trade.quantity);
-    const amount = Number(trade.settlement_amount ?? 0);
-    const fees = Number(trade.settlement_commission ?? 0) + Number(trade.trade_commission ?? 0);
-    current.fees += fees;
-    const key = `${accountId}:${trade.isin ?? trade.instrument}`;
-    const queue = lots.get(key) ?? [];
-    if (/продаж/i.test(trade.side)) {
-      let remaining = quantity;
-      let matchedCost = 0;
-      while (remaining > 0 && queue.length > 0) {
-        const lot = queue[0];
-        const used = Math.min(remaining, lot.quantity);
-        const unitCost = lot.cost / lot.quantity;
-        matchedCost += used * unitCost;
-        lot.cost -= used * unitCost;
-        lot.quantity -= used;
-        remaining -= used;
-        if (lot.quantity <= 0) queue.shift();
-      }
-      const matched = quantity - remaining;
-      current.realized += matched > 0 ? (amount - fees) * (matched / quantity) - matchedCost : 0;
-    } else if (/покуп/i.test(trade.side) && quantity > 0) {
-      queue.push({ quantity, cost: amount + fees });
-    }
-    lots.set(key, queue);
-    result.set(accountId, current);
-  }
-  const incomplete = new Set<number>();
-  for (const position of positions) {
-    const accountId = Number(position.account_id);
-    const current = result.get(accountId) ?? { fees: 0, realized: 0, unrealized: 0 };
-    if (position.valuation !== null) {
-      const key = `${accountId}:${position.isin ?? position.instrument}`;
-      const queue = lots.get(key) ?? [];
-      let remaining = Number(position.quantity);
-      let cost = 0;
-      for (const lot of queue) {
-        if (remaining <= 0) break;
-        const used = Math.min(remaining, lot.quantity);
-        cost += used * (lot.cost / lot.quantity);
-        remaining -= used;
-      }
-      if (remaining > 0.0000001) incomplete.add(accountId);
-      else if (!incomplete.has(accountId)) current.unrealized = (current.unrealized ?? 0) + Number(position.valuation) - cost;
-    }
-    result.set(accountId, current);
-  }
-  for (const accountId of incomplete) {
-    const current = result.get(accountId);
-    if (current) current.unrealized = null;
-  }
-  return result;
-}
-
-export async function getPortfolioPerformance(): Promise<PortfolioPerformanceResponse> {
-  const [cashResult, tradeResult, positionResult] = await Promise.all([
-    pool.query<PerformanceCashRow>(`SELECT a.id AS account_id, a.alias, a.bank, a.account_number, t.amount_signed, t.description FROM accounts a JOIN transactions t ON t.account_id = a.id WHERE a.account_type IN ('brokerage', 'iis') ORDER BY a.id, t.operation_at, t.id`),
-    pool.query<PerformanceTradeRow>(`SELECT account_id, side, quantity, settlement_amount, settlement_commission, trade_commission, isin, instrument FROM portfolio_trades ORDER BY account_id, concluded_at, id`),
-    pool.query<PerformancePositionRow>(`SELECT r.account_id, p.quantity, p.valuation, p.isin, p.instrument FROM portfolio_reports r JOIN portfolio_positions p ON p.report_id = r.id JOIN LATERAL (SELECT id FROM portfolio_reports WHERE account_id = r.account_id ORDER BY report_period_to DESC, imported_at DESC, id DESC LIMIT 1) latest ON latest.id = r.id`),
-  ]);
-  const tradeMap = calculatePortfolioTradeResults(tradeResult.rows, positionResult.rows);
-  const accounts = new Map<number, PortfolioPerformanceResponse['accounts'][number]>();
-  for (const row of cashResult.rows) {
-    const accountId = Number(row.account_id);
-    const account = accounts.get(accountId) ?? { accountId, accountName: row.alias || `${row.bank} · ${maskAccountNumber(row.account_number)}`, contributions: 0, withdrawals: 0, income: 0, fees: 0, realizedResult: 0, unrealizedResult: null };
-    const amount = Number(row.amount_signed);
-    const description = row.description.toLowerCase();
-    if (amount > 0 && /дивиденд|купон|процент/.test(description)) account.income += amount;
-    else if (amount > 0 && description.includes('зачисление денежных средств')) account.contributions += amount;
-    else if (amount < 0 && /вывод денежных средств|вывод дс/.test(description) && !description.includes('под нерассчитанные сделки')) account.withdrawals += -amount;
-    accounts.set(accountId, account);
-  }
-  for (const [accountId, values] of tradeMap) {
-    const account = accounts.get(accountId) ?? { accountId, accountName: `Счёт ${accountId}`, contributions: 0, withdrawals: 0, income: 0, fees: 0, realizedResult: 0, unrealizedResult: null };
-    account.fees = Math.round(values.fees * 100);
-    account.realizedResult = Math.round(values.realized * 100);
-    account.unrealizedResult = values.unrealized === null ? null : Math.round(values.unrealized * 100);
-    accounts.set(accountId, account);
-  }
-  return { accounts: [...accounts.values()] };
-}

backend/src/services/portfolioOverview.test.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert/strict';
-import { calculatePortfolioTradeResults, toPortfolioHistory, toPortfolioOverview } from './portfolio';
+import { toPortfolioHistory, toPortfolioOverview } from './portfolio';
 
 const result = toPortfolioOverview([
   { account_id: '1', alias: 'ИИС', bank: 'ВТБ', account_number: '123456', report_period_to: '2026-08-26', total_valuation: '150.50', instrument: 'Облигация', isin: 'RU0000000001', quantity: '1', price: '100', valuation: '100' },
@@ -17,12 +17,3 @@ const history = toPortfolioHistory([
 ]);
 assert.deepEqual(history.accounts[0].points.map((point) => point.totalValuation), ['100', '150.50']);
 console.log('portfolio history: OK');
-
-const tradeResults = calculatePortfolioTradeResults([
-  { account_id: 1, side: 'Покупка', quantity: '2', settlement_amount: '200', settlement_commission: '1', trade_commission: '1', isin: 'RU1', instrument: 'Фонд' },
-  { account_id: 1, side: 'Продажа', quantity: '1', settlement_amount: '150', settlement_commission: '1', trade_commission: '0', isin: 'RU1', instrument: 'Фонд' },
-], [{ account_id: 1, quantity: '1', valuation: '130', isin: 'RU1', instrument: 'Фонд' }]);
-assert.equal(tradeResults.get(1)?.fees, 3);
-assert.equal(tradeResults.get(1)?.realized, 48);
-assert.equal(tradeResults.get(1)?.unrealized, 29);
-console.log('portfolio performance: OK');

frontend/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@family-budget/frontend",
-  "version": "0.15.2",
+  "version": "0.14.0",
   "private": true,
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "tsc -b && vite build",
-    "test:portfolio": "tsx src/api/portfolio.test.ts",
     "preview": "vite preview"
   },
   "dependencies": {

frontend/src/api/portfolio.test.ts

@@ -1,17 +0,0 @@
-import assert from 'node:assert/strict';
-import { getPortfolioHistory, getPortfolioOverview, getPortfolioPerformance } from './portfolio';
-
-const calls: string[] = [];
-const originalFetch = globalThis.fetch;
-globalThis.fetch = async (input) => {
-  calls.push(String(input));
-  return new Response(JSON.stringify({ accounts: [] }), { status: 200, headers: { 'Content-Type': 'application/json' } });
-};
-
-try {
-  await Promise.all([getPortfolioOverview(), getPortfolioHistory(), getPortfolioPerformance()]);
-  assert.deepEqual(calls.sort(), ['/api/portfolio', '/api/portfolio/history', '/api/portfolio/performance']);
-  console.log('portfolio API contract: OK');
-} finally {
-  globalThis.fetch = originalFetch;
-}

frontend/src/api/portfolio.ts

@@ -1,4 +1,4 @@
-import type { ImportBrokerReportResponse, ImportPortfolioResponse, PortfolioFile, PortfolioHistoryResponse, PortfolioOverviewResponse, PortfolioPerformanceResponse } from '@family-budget/shared';
+import type { ImportBrokerReportResponse, ImportPortfolioResponse, PortfolioFile, PortfolioHistoryResponse, PortfolioOverviewResponse } from '@family-budget/shared';
 import { api } from './client';
 
 export function importPortfolio(data: PortfolioFile): Promise<ImportPortfolioResponse> {
@@ -18,7 +18,3 @@ export function getPortfolioOverview(): Promise<PortfolioOverviewResponse> {
 export function getPortfolioHistory(): Promise<PortfolioHistoryResponse> {
   return api.get('/api/portfolio/history');
 }
-
-export function getPortfolioPerformance(): Promise<PortfolioPerformanceResponse> {
-  return api.get('/api/portfolio/performance');
-}

frontend/src/pages/PortfolioPage.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer } from 'recharts';
-import type { PortfolioHistoryResponse, PortfolioOverviewResponse, PortfolioPerformanceResponse } from '@family-budget/shared';
-import { getPortfolioHistory, getPortfolioOverview, getPortfolioPerformance } from '../api/portfolio';
+import type { PortfolioHistoryResponse, PortfolioOverviewResponse } from '@family-budget/shared';
+import { getPortfolioHistory, getPortfolioOverview } from '../api/portfolio';
 import { formatDate } from '../utils/format';
 
 const money = new Intl.NumberFormat('ru-RU', { style: 'currency', currency: 'RUB', minimumFractionDigits: 2 });
@@ -10,12 +10,10 @@ const number = new Intl.NumberFormat('ru-RU', { maximumFractionDigits: 6 });
 export function PortfolioPage() {
   const [data, setData] = useState<PortfolioOverviewResponse | null>(null);
   const [history, setHistory] = useState<PortfolioHistoryResponse | null>(null);
-  const [performance, setPerformance] = useState<PortfolioPerformanceResponse | null>(null);
 
   useEffect(() => {
     getPortfolioOverview().then(setData).catch(() => {});
     getPortfolioHistory().then(setHistory).catch(() => {});
-    getPortfolioPerformance().then(setPerformance).catch(() => {});
   }, []);
 
   return (
@@ -77,20 +75,6 @@ export function PortfolioPage() {
           </div>
         </section>
       ))}
-
-      {performance?.accounts.map((account) => (
-        <section className="portfolio" key={`performance-${account.accountId}`} aria-labelledby={`performance-${account.accountId}`}>
-          <h2 id={`performance-${account.accountId}`} className="portfolio__title">Результат · {account.accountName}</h2>
-          <div className="summary portfolio__performance">
-            <div className="summary__card summary__card--investments"><div className="summary__label">Пополнения</div><div className="summary__value">{money.format(account.contributions / 100)}</div></div>
-            <div className="summary__card summary__card--investments"><div className="summary__label">Выводы</div><div className="summary__value">{money.format(account.withdrawals / 100)}</div></div>
-            <div className="summary__card summary__card--income"><div className="summary__label">Купоны, дивиденды и проценты</div><div className="summary__value">{money.format(account.income / 100)}</div></div>
-            <div className="summary__card summary__card--expense"><div className="summary__label">Комиссии</div><div className="summary__value">{money.format(account.fees / 100)}</div></div>
-            <div className="summary__card summary__card--positive"><div className="summary__label">Результат продаж</div><div className="summary__value">{money.format(account.realizedResult / 100)}</div></div>
-            {account.unrealizedResult !== null && <div className="summary__card summary__card--positive"><div className="summary__label">Нереализованный результат</div><div className="summary__value">{money.format(account.unrealizedResult / 100)}</div></div>}
-          </div>
-        </section>
-      ))}
     </div>
   );
 }

shared/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@family-budget/shared",
-  "version": "0.9.0",
+  "version": "0.8.0",
   "private": true,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

shared/src/types/import.ts

@@ -133,18 +133,3 @@ export interface PortfolioHistoryAccount {
 export interface PortfolioHistoryResponse {
   accounts: PortfolioHistoryAccount[];
 }
-
-export interface PortfolioPerformanceAccount {
-  accountId: number;
-  accountName: string;
-  contributions: number;
-  withdrawals: number;
-  income: number;
-  fees: number;
-  realizedResult: number;
-  unrealizedResult: number | null;
-}
-
-export interface PortfolioPerformanceResponse {
-  accounts: PortfolioPerformanceAccount[];
-}

shared/src/types/index.ts

@@ -50,8 +50,6 @@ export type {
   PortfolioHistoryPoint,
   PortfolioHistoryAccount,
   PortfolioHistoryResponse,
-  PortfolioPerformanceAccount,
-  PortfolioPerformanceResponse,
 } from './import';
 
 export type {