feat: add portfolio valuation history

This commit is contained in:
2026-08-27 08:16:48 +03:00
parent 5d478ff06c
commit 29ba82f4bf
12 changed files with 127 additions and 8 deletions

View File

@@ -21,6 +21,7 @@ import categoryRulesRouter from './routes/categoryRules';
import analyticsRouter from './routes/analytics';
import portfolioRouter from './routes/portfolio';
import portfolioOverviewRouter from './routes/portfolioOverview';
import portfolioHistoryRouter from './routes/portfolioHistory';
const app = express();
app.set('trust proxy', 1);
@@ -47,6 +48,7 @@ app.use('/api/category-rules', categoryRulesRouter);
app.use('/api/analytics', analyticsRouter);
app.use('/api/import/portfolio', portfolioRouter);
app.use('/api/portfolio', portfolioOverviewRouter);
app.use('/api/portfolio/history', portfolioHistoryRouter);
app.use(
(

View File

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

View File

@@ -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, PortfolioOverviewResponse, 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;
@@ -20,6 +20,15 @@ type PortfolioOverviewRow = {
valuation: string | number | null;
};
type PortfolioHistoryRow = {
account_id: number | string;
alias: string | null;
bank: string;
account_number: string;
report_period_to: string;
total_valuation: string | number | null;
};
function decimalValue(value: unknown, field: string, required = false): string | null {
if (value == null || value === '') {
if (required) throw new Error(`${field} is required`);
@@ -168,3 +177,38 @@ export async function getPortfolioOverview(): Promise<PortfolioOverviewResponse>
);
return toPortfolioOverview(rows);
}
export function toPortfolioHistory(rows: PortfolioHistoryRow[]): PortfolioHistoryResponse {
const accounts = new Map<number, PortfolioHistoryResponse['accounts'][number]>();
for (const row of rows) {
const accountId = Number(row.account_id);
let account = accounts.get(accountId);
if (!account) {
account = {
accountId,
accountName: row.alias || `${row.bank} · ${maskAccountNumber(row.account_number)}`,
points: [],
};
accounts.set(accountId, account);
}
account.points.push({
reportPeriodTo: row.report_period_to,
totalValuation: row.total_valuation === null ? null : String(row.total_valuation),
});
}
return { accounts: [...accounts.values()] };
}
export async function getPortfolioHistory(): Promise<PortfolioHistoryResponse> {
const { rows } = await pool.query<PortfolioHistoryRow>(
`SELECT a.id AS account_id, a.alias, a.bank, a.account_number,
r.report_period_to, SUM(p.valuation) AS total_valuation
FROM accounts a
JOIN portfolio_reports r ON r.account_id = a.id
LEFT JOIN portfolio_positions p ON p.report_id = r.id
WHERE a.account_type IN ('brokerage', 'iis')
GROUP BY a.id, a.alias, a.bank, a.account_number, r.id, r.report_period_to, r.reported_at, r.imported_at
ORDER BY a.id, r.report_period_to, r.reported_at, r.imported_at, r.id`,
);
return toPortfolioHistory(rows);
}

View File

@@ -1,5 +1,5 @@
import assert from 'node:assert/strict';
import { 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' },
@@ -10,3 +10,10 @@ assert.equal(result.accounts[0].accountName, 'ИИС');
assert.equal(result.accounts[0].totalValuation, '150.50');
assert.equal(result.accounts[0].positions.length, 2);
console.log('portfolio overview: OK');
const history = toPortfolioHistory([
{ account_id: '1', alias: 'ИИС', bank: 'ВТБ', account_number: '123456', report_period_to: '2026-08-20', total_valuation: '100' },
{ account_id: '1', alias: 'ИИС', bank: 'ВТБ', account_number: '123456', report_period_to: '2026-08-26', total_valuation: '150.50' },
]);
assert.deepEqual(history.accounts[0].points.map((point) => point.totalValuation), ['100', '150.50']);
console.log('portfolio history: OK');