Compare commits
8 Commits
fix/produc
...
feature/ac
| Author | SHA1 | Date | |
|---|---|---|---|
| 3d7d0e639c | |||
| 1b20b76704 | |||
| c6b79c1d35 | |||
| dd2990357a | |||
| 6550e2057c | |||
| f8e4f86a6d | |||
| e1043bed36 | |||
| a090ce37ad |
36
CHANGELOG.md
36
CHANGELOG.md
@@ -1,5 +1,41 @@
|
||||
# Changelog
|
||||
|
||||
## [Backend 0.7.4] - 2026-08-20
|
||||
|
||||
### Fixed
|
||||
|
||||
- Corrected database integration test connection ownership during repeated imports.
|
||||
|
||||
## [Backend 0.7.3] - 2026-08-20
|
||||
|
||||
### Added
|
||||
|
||||
- Added a runnable database integration test for preserving account metadata during re-import.
|
||||
|
||||
## [Frontend 0.10.2 / Backend 0.7.2] - 2026-08-20
|
||||
|
||||
### Fixed
|
||||
|
||||
- Existing uncategorized operations become confirmed investments when an investment account is labeled; account selectors use Russian labels.
|
||||
|
||||
## [Frontend 0.10.1 / Backend 0.7.1] - 2026-08-20
|
||||
|
||||
### Fixed
|
||||
|
||||
- Account labels are shown in analytics filters, and account defaults now remain overridable by matching category rules.
|
||||
|
||||
## [Frontend 0.10.0 / Backend 0.7.0 / Shared 0.3.0] - 2026-08-20
|
||||
|
||||
### Added
|
||||
|
||||
- Added account type/status labels, automatic investment classification for brokerage, IIS, and savings accounts, and a separate interest-income metric.
|
||||
|
||||
## [Frontend 0.9.3] - 2026-08-20
|
||||
|
||||
### Fixed
|
||||
|
||||
- Aligned sidebar versions and copyright as separate footer lines and updated the copyright period.
|
||||
|
||||
## [Backend 0.6.8] - 2026-08-20
|
||||
|
||||
### Fixed
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@family-budget/backend",
|
||||
"version": "0.6.8",
|
||||
"version": "0.7.4",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "tsx watch src/app.ts",
|
||||
@@ -10,6 +10,7 @@
|
||||
"migrate:prod": "node dist/db/migrate.js",
|
||||
"test:analytics": "tsx src/services/analyticsSemantics.test.ts",
|
||||
"test:analytics:db": "NODE_ENV=test tsx src/services/analytics.integration.test.ts",
|
||||
"test:import:db": "NODE_ENV=test tsx src/services/import.integration.test.ts",
|
||||
"test:llm": "tsx src/scripts/testLlm.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
|
||||
@@ -222,6 +222,22 @@ const migrations: { name: string; sql: string }[] = [
|
||||
ADD COLUMN IF NOT EXISTS import_id BIGINT REFERENCES imports(id);
|
||||
`,
|
||||
},
|
||||
{
|
||||
name: '007_account_metadata',
|
||||
sql: `
|
||||
ALTER TABLE accounts
|
||||
ADD COLUMN IF NOT EXISTS account_type TEXT,
|
||||
ADD COLUMN IF NOT EXISTS status TEXT NOT NULL DEFAULT 'active';
|
||||
ALTER TABLE accounts DROP CONSTRAINT IF EXISTS chk_accounts_type;
|
||||
ALTER TABLE accounts
|
||||
ADD CONSTRAINT chk_accounts_type
|
||||
CHECK (account_type IS NULL OR account_type IN ('brokerage', 'iis', 'savings', 'current'));
|
||||
ALTER TABLE accounts DROP CONSTRAINT IF EXISTS chk_accounts_status;
|
||||
ALTER TABLE accounts
|
||||
ADD CONSTRAINT chk_accounts_status
|
||||
CHECK (status IN ('active', 'closed'));
|
||||
`,
|
||||
},
|
||||
];
|
||||
|
||||
export async function runMigrations(): Promise<void> {
|
||||
|
||||
@@ -21,7 +21,7 @@ router.put(
|
||||
return;
|
||||
}
|
||||
|
||||
const { alias } = req.body;
|
||||
const { alias, accountType, status } = req.body;
|
||||
if (typeof alias !== 'string' || !alias.trim()) {
|
||||
res.status(400).json({ error: 'BAD_REQUEST', message: 'alias is required and must be non-empty' });
|
||||
return;
|
||||
@@ -30,8 +30,21 @@ router.put(
|
||||
res.status(400).json({ error: 'BAD_REQUEST', message: 'alias must be at most 50 characters' });
|
||||
return;
|
||||
}
|
||||
if (accountType !== undefined && accountType !== null && !['brokerage', 'iis', 'savings', 'current'].includes(accountType)) {
|
||||
res.status(400).json({ error: 'BAD_REQUEST', message: 'Invalid accountType' });
|
||||
return;
|
||||
}
|
||||
if (status !== undefined && !['active', 'closed'].includes(status)) {
|
||||
res.status(400).json({ error: 'BAD_REQUEST', message: 'Invalid status' });
|
||||
return;
|
||||
}
|
||||
|
||||
const result = await accountService.updateAccountAlias(id, alias.trim());
|
||||
const result = await accountService.updateAccount(
|
||||
id,
|
||||
alias.trim(),
|
||||
accountType,
|
||||
status,
|
||||
);
|
||||
if (!result) {
|
||||
res.status(404).json({ error: 'NOT_FOUND', message: 'Account not found' });
|
||||
return;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { pool } from '../db/pool';
|
||||
import { maskAccountNumber } from '../utils';
|
||||
import type { Account } from '@family-budget/shared';
|
||||
import type { Account, AccountStatus, AccountType } from '@family-budget/shared';
|
||||
|
||||
function toAccount(r: Record<string, unknown>): Account {
|
||||
return {
|
||||
@@ -9,6 +9,8 @@ function toAccount(r: Record<string, unknown>): Account {
|
||||
accountNumberMasked: maskAccountNumber(r.account_number as string),
|
||||
currency: r.currency as string,
|
||||
alias: (r.alias as string) ?? null,
|
||||
accountType: (r.account_type as AccountType) ?? null,
|
||||
status: (r.status as AccountStatus) ?? 'active',
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,14 +21,45 @@ export async function getAccounts(): Promise<Account[]> {
|
||||
return rows.map(toAccount);
|
||||
}
|
||||
|
||||
export async function updateAccountAlias(
|
||||
export async function updateAccount(
|
||||
id: number,
|
||||
alias: string,
|
||||
accountType?: AccountType | null,
|
||||
status?: AccountStatus,
|
||||
): Promise<Account | null> {
|
||||
const { rows } = await pool.query(
|
||||
'UPDATE accounts SET alias = $1 WHERE id = $2 RETURNING *',
|
||||
[alias, id],
|
||||
);
|
||||
if (rows.length === 0) return null;
|
||||
return toAccount(rows[0]);
|
||||
const client = await pool.connect();
|
||||
try {
|
||||
await client.query('BEGIN');
|
||||
const current = await client.query('SELECT account_type, status FROM accounts WHERE id = $1', [id]);
|
||||
if (current.rows.length === 0) {
|
||||
await client.query('ROLLBACK');
|
||||
return null;
|
||||
}
|
||||
const nextType = accountType === undefined ? current.rows[0].account_type : accountType;
|
||||
const nextStatus = status ?? current.rows[0].status ?? 'active';
|
||||
const { rows } = await client.query(
|
||||
'UPDATE accounts SET alias = $1, account_type = $2, status = $3 WHERE id = $4 RETURNING *',
|
||||
[alias, nextType, nextStatus, id],
|
||||
);
|
||||
if (rows.length === 0) {
|
||||
await client.query('ROLLBACK');
|
||||
return null;
|
||||
}
|
||||
if (['brokerage', 'iis', 'savings'].includes(nextType ?? '')) {
|
||||
await client.query(
|
||||
`UPDATE transactions
|
||||
SET category_id = (SELECT id FROM categories WHERE name = 'Инвестиции' AND type = 'transfer' LIMIT 1),
|
||||
direction = 'transfer', is_category_confirmed = TRUE, updated_at = NOW()
|
||||
WHERE account_id = $1 AND category_id IS NULL`,
|
||||
[id],
|
||||
);
|
||||
}
|
||||
await client.query('COMMIT');
|
||||
return toAccount(rows[0]);
|
||||
} catch (error) {
|
||||
await client.query('ROLLBACK');
|
||||
throw error;
|
||||
} finally {
|
||||
client.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ async function testQueries(): Promise<void> {
|
||||
const client = await pool.connect();
|
||||
try {
|
||||
await client.query('BEGIN');
|
||||
const account = await client.query("INSERT INTO accounts (bank, account_number, currency) VALUES ('TEST', 'analytics-test-1', 'RUB') RETURNING id");
|
||||
const account = await client.query("INSERT INTO accounts (bank, account_number, currency, account_type) VALUES ('TEST', 'analytics-test-1', 'RUB', 'savings') RETURNING id");
|
||||
const otherAccount = await client.query("INSERT INTO accounts (bank, account_number, currency) VALUES ('TEST', 'analytics-test-2', 'RUB') RETURNING id");
|
||||
const categories = await client.query("INSERT INTO categories (name, type) VALUES ('Тест расход', 'expense'), ('Тест доход', 'income'), ('Тест перевод', 'transfer') RETURNING id, type");
|
||||
const accountId = Number(account.rows[0].id);
|
||||
@@ -22,12 +22,16 @@ async function testQueries(): Promise<void> {
|
||||
await insert(accountId, '2026-07-03T12:00:00+03:00', 20_000, categoryId.income, 'analytics-test-3');
|
||||
await insert(accountId, '2026-07-04T12:00:00+03:00', -5_000, categoryId.income, 'analytics-test-4');
|
||||
await insert(accountId, '2026-07-05T12:00:00+03:00', -3_000, categoryId.transfer, 'analytics-test-5');
|
||||
await client.query(
|
||||
"INSERT INTO transactions (account_id, operation_at, amount_signed, commission, description, direction, fingerprint, category_id, is_category_confirmed) VALUES ($1, '2026-07-06T12:00:00+03:00', 1_500, 0, 'Начисление процентов', 'transfer', 'analytics-test-interest', $2, TRUE)",
|
||||
[accountId, categoryId.transfer],
|
||||
);
|
||||
await insert(otherAccountId, '2026-07-01T12:00:00+03:00', -99_000, categoryId.expense, 'analytics-test-6');
|
||||
await insert(accountId, '2026-08-01T12:00:00+03:00', -7_000, categoryId.expense, 'analytics-test-7');
|
||||
|
||||
const params = { from: '2026-07-01', to: '2026-07-31', accountId, onlyConfirmed: true };
|
||||
const summary = await getSummary(params, client);
|
||||
assert.deepEqual({ expense: summary.totalExpense, income: summary.totalIncome, net: summary.net, transferOut: summary.transferOutflow }, { expense: 6_000, income: 15_000, net: 9_000, transferOut: 3_000 });
|
||||
assert.deepEqual({ expense: summary.totalExpense, income: summary.totalIncome, net: summary.net, transferOut: summary.transferOutflow, interest: summary.interestIncome }, { expense: 6_000, income: 15_000, net: 9_000, transferOut: 3_000, interest: 1_500 });
|
||||
assert.equal((await getSummary({ ...params, from: '2026-08-01', to: '2026-08-31' }, client)).totalExpense, 7_000);
|
||||
assert.deepEqual((await getByCategory(params, client)).map((item) => item.amount), [6_000]);
|
||||
const timeseries = await getTimeseries({ ...params, granularity: 'month' }, client);
|
||||
|
||||
@@ -28,9 +28,14 @@ function analyticsTransactions(where: string): string {
|
||||
COALESCE(c.type, t.direction) AS analytic_type,
|
||||
COALESCE(t.category_id, 0) AS category_id,
|
||||
COALESCE(c.name, 'Без категории') AS category_name,
|
||||
${effectiveAmount} AS effective_amount
|
||||
${effectiveAmount} AS effective_amount,
|
||||
CASE WHEN a.account_type = 'savings'
|
||||
AND ${effectiveAmount} > 0
|
||||
AND (t.description ILIKE '%процент%' OR t.description ILIKE '%выплата %' OR t.description LIKE '%\%%' ESCAPE '\\')
|
||||
THEN ${effectiveAmount} ELSE 0 END AS interest_income
|
||||
FROM transactions t
|
||||
LEFT JOIN categories c ON c.id = t.category_id
|
||||
LEFT JOIN accounts a ON a.id = t.account_id
|
||||
${where}
|
||||
)`;
|
||||
}
|
||||
@@ -73,7 +78,8 @@ export async function getSummary(
|
||||
const totalsResult = await db.query(
|
||||
`${analyticsTransactions(where)},
|
||||
category_net AS (
|
||||
SELECT category_id, category_name, analytic_type, SUM(effective_amount)::bigint AS amount
|
||||
SELECT category_id, category_name, analytic_type, SUM(effective_amount)::bigint AS amount,
|
||||
SUM(interest_income)::bigint AS interest_income
|
||||
FROM analytics_transactions
|
||||
GROUP BY category_id, category_name, analytic_type
|
||||
)
|
||||
@@ -83,7 +89,8 @@ export async function getSummary(
|
||||
COALESCE((SELECT SUM(GREATEST(effective_amount, 0)) FROM analytics_transactions), 0)::bigint AS cash_inflow,
|
||||
COALESCE((SELECT SUM(GREATEST(-effective_amount, 0)) FROM analytics_transactions), 0)::bigint AS cash_outflow,
|
||||
COALESCE((SELECT SUM(GREATEST(effective_amount, 0)) FROM analytics_transactions WHERE analytic_type = 'transfer'), 0)::bigint AS transfer_inflow,
|
||||
COALESCE((SELECT SUM(GREATEST(-effective_amount, 0)) FROM analytics_transactions WHERE analytic_type = 'transfer'), 0)::bigint AS transfer_outflow
|
||||
COALESCE((SELECT SUM(GREATEST(-effective_amount, 0)) FROM analytics_transactions WHERE analytic_type = 'transfer'), 0)::bigint AS transfer_outflow,
|
||||
COALESCE(SUM(interest_income), 0)::bigint AS interest_income
|
||||
FROM category_net`,
|
||||
values,
|
||||
);
|
||||
@@ -94,6 +101,7 @@ export async function getSummary(
|
||||
const cashOutflow = Number(totalsResult.rows[0].cash_outflow);
|
||||
const transferInflow = Number(totalsResult.rows[0].transfer_inflow);
|
||||
const transferOutflow = Number(totalsResult.rows[0].transfer_outflow);
|
||||
const interestIncome = Number(totalsResult.rows[0].interest_income);
|
||||
|
||||
const topResult = await db.query(
|
||||
`${analyticsTransactions(where)}
|
||||
@@ -123,6 +131,7 @@ export async function getSummary(
|
||||
transferInflow,
|
||||
transferOutflow,
|
||||
cashNet: cashInflow - cashOutflow,
|
||||
interestIncome,
|
||||
topCategories,
|
||||
};
|
||||
}
|
||||
|
||||
28
backend/src/services/import.integration.test.ts
Normal file
28
backend/src/services/import.integration.test.ts
Normal file
@@ -0,0 +1,28 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import { pool } from '../db/pool';
|
||||
import { importStatement } from './import';
|
||||
|
||||
const makeStatement = (sourceId: string) => ({
|
||||
schemaVersion: '1.0', bank: 'TEST',
|
||||
statement: { accountNumber: 'metadata-test', currency: 'RUB', openingBalance: 0, closingBalance: 100, exportedAt: '2026-08-20T12:00:00+03:00' },
|
||||
transactions: [{ operationAt: '2026-08-20T10:00:00+03:00', amountSigned: 100, commission: 0, description: 'Пополнение', sourceId }],
|
||||
});
|
||||
|
||||
async function run(): Promise<void> {
|
||||
try {
|
||||
await importStatement(makeStatement('first'));
|
||||
const account = await pool.query("UPDATE accounts SET account_type = 'savings', status = 'closed' WHERE bank = 'TEST' AND account_number = 'metadata-test' RETURNING id");
|
||||
assert.equal(account.rows.length, 1);
|
||||
await importStatement(makeStatement('second'));
|
||||
const result = await pool.query('SELECT account_type, status FROM accounts WHERE id = $1', [account.rows[0].id]);
|
||||
assert.deepEqual(result.rows[0], { account_type: 'savings', status: 'closed' });
|
||||
console.log('import metadata SQL: OK');
|
||||
} finally {
|
||||
await pool.query('DELETE FROM transactions WHERE account_id IN (SELECT id FROM accounts WHERE bank = \'TEST\' AND account_number = \'metadata-test\')');
|
||||
await pool.query("DELETE FROM imports WHERE account_id IN (SELECT id FROM accounts WHERE bank = 'TEST' AND account_number = 'metadata-test')");
|
||||
await pool.query("DELETE FROM accounts WHERE bank = 'TEST' AND account_number = 'metadata-test'");
|
||||
await pool.end();
|
||||
}
|
||||
}
|
||||
|
||||
run();
|
||||
@@ -154,6 +154,7 @@ function validateSemantics(data: StatementFile): ValidationError | null {
|
||||
|
||||
export async function importStatement(
|
||||
body: unknown,
|
||||
db: Pick<typeof pool, 'connect'> = pool,
|
||||
): Promise<ImportStatementResponse | ValidationError> {
|
||||
const structErr = validateStructure(body);
|
||||
if (structErr) return structErr;
|
||||
@@ -162,7 +163,7 @@ export async function importStatement(
|
||||
const semErr = validateSemantics(data);
|
||||
if (semErr) return semErr;
|
||||
|
||||
const client = await pool.connect();
|
||||
const client = await db.connect();
|
||||
try {
|
||||
await client.query('BEGIN');
|
||||
|
||||
@@ -171,7 +172,7 @@ export async function importStatement(
|
||||
let isNewAccount = false;
|
||||
|
||||
const accResult = await client.query(
|
||||
'SELECT id FROM accounts WHERE bank = $1 AND account_number = $2',
|
||||
'SELECT id, account_type FROM accounts WHERE bank = $1 AND account_number = $2',
|
||||
[data.bank, data.statement.accountNumber],
|
||||
);
|
||||
|
||||
@@ -206,6 +207,14 @@ export async function importStatement(
|
||||
throw new Error("Category 'Поступления' is missing");
|
||||
}
|
||||
const incomeCategoryId = Number(incomeCategoryResult.rows[0].id);
|
||||
const accountType = accResult.rows[0]?.account_type ?? null;
|
||||
const investmentCategoryResult = await client.query(
|
||||
`SELECT id FROM categories WHERE name = 'Инвестиции' AND type = 'transfer' AND is_active = TRUE LIMIT 1`,
|
||||
);
|
||||
const investmentCategoryId = investmentCategoryResult.rows[0]
|
||||
? Number(investmentCategoryResult.rows[0].id)
|
||||
: null;
|
||||
const isInvestmentAccount = ['brokerage', 'iis', 'savings'].includes(accountType);
|
||||
|
||||
// Insert transactions
|
||||
const insertedIds: number[] = [];
|
||||
@@ -218,8 +227,10 @@ export async function importStatement(
|
||||
tx.description.toLowerCase().includes(CASHBACK_KEYWORD);
|
||||
const dir = isCashbackCommissionImport
|
||||
? 'income'
|
||||
: determineDirection(tx.amountSigned, tx.description);
|
||||
const categoryId = isCashbackCommissionImport ? incomeCategoryId : null;
|
||||
: isInvestmentAccount ? 'transfer' : determineDirection(tx.amountSigned, tx.description);
|
||||
const categoryId = isCashbackCommissionImport
|
||||
? incomeCategoryId
|
||||
: isInvestmentAccount ? investmentCategoryId : null;
|
||||
const isCategoryConfirmed = isCashbackCommissionImport;
|
||||
|
||||
const result = await client.query(
|
||||
@@ -263,11 +274,19 @@ export async function importStatement(
|
||||
OR (cr.match_type = 'starts_with' AND t2.description ILIKE cr.pattern || '%')
|
||||
)
|
||||
WHERE t2.id = ANY($1::bigint[])
|
||||
AND t2.is_category_confirmed = FALSE
|
||||
ORDER BY t2.id, cr.priority DESC, cr.id ASC
|
||||
) sub
|
||||
WHERE t.id = sub.tx_id`,
|
||||
[insertedIds],
|
||||
);
|
||||
if (isInvestmentAccount && investmentCategoryId != null) {
|
||||
await client.query(
|
||||
`UPDATE transactions SET is_category_confirmed = TRUE, updated_at = NOW()
|
||||
WHERE id = ANY($1::bigint[]) AND category_id = $2 AND is_category_confirmed = FALSE`,
|
||||
[insertedIds, investmentCategoryId],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
await client.query('COMMIT');
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@family-budget/frontend",
|
||||
"version": "0.9.2",
|
||||
"version": "0.10.2",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
@@ -7,6 +7,8 @@ export function AccountsList() {
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [editingId, setEditingId] = useState<number | null>(null);
|
||||
const [editAlias, setEditAlias] = useState('');
|
||||
const [editAccountType, setEditAccountType] = useState<Account['accountType']>(null);
|
||||
const [editStatus, setEditStatus] = useState<Account['status']>('active');
|
||||
|
||||
useEffect(() => {
|
||||
setLoading(true);
|
||||
@@ -19,12 +21,16 @@ export function AccountsList() {
|
||||
const handleEdit = (account: Account) => {
|
||||
setEditingId(account.id);
|
||||
setEditAlias(account.alias || '');
|
||||
setEditAccountType(account.accountType);
|
||||
setEditStatus(account.status);
|
||||
};
|
||||
|
||||
const handleSave = async (id: number) => {
|
||||
try {
|
||||
const updated = await updateAccount(id, {
|
||||
alias: editAlias.trim(),
|
||||
accountType: editAccountType,
|
||||
status: editStatus,
|
||||
});
|
||||
setAccounts((prev) =>
|
||||
prev.map((a) => (a.id === id ? updated : a)),
|
||||
@@ -48,6 +54,8 @@ export function AccountsList() {
|
||||
<th className="data-table__head-cell">Номер счёта</th>
|
||||
<th className="data-table__head-cell">Валюта</th>
|
||||
<th className="data-table__head-cell">Алиас</th>
|
||||
<th className="data-table__head-cell">Тип</th>
|
||||
<th className="data-table__head-cell">Статус</th>
|
||||
<th className="data-table__head-cell"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -76,6 +84,25 @@ export function AccountsList() {
|
||||
)
|
||||
)}
|
||||
</td>
|
||||
<td className="data-table__cell">
|
||||
{editingId === a.id ? (
|
||||
<select value={editAccountType ?? ''} onChange={(e) => setEditAccountType((e.target.value || null) as Account['accountType'])}>
|
||||
<option value="">Не указан</option>
|
||||
<option value="brokerage">Брокерский</option>
|
||||
<option value="iis">ИИС</option>
|
||||
<option value="savings">Накопительный</option>
|
||||
<option value="current">Текущий</option>
|
||||
</select>
|
||||
) : (({ brokerage: 'Брокерский', iis: 'ИИС', savings: 'Накопительный', current: 'Текущий' } as Record<string, string>)[a.accountType ?? ''] || 'не указан')}
|
||||
</td>
|
||||
<td className="data-table__cell">
|
||||
{editingId === a.id ? (
|
||||
<select value={editStatus} onChange={(e) => setEditStatus(e.target.value as Account['status'])}>
|
||||
<option value="active">Действующий</option>
|
||||
<option value="closed">Закрытый</option>
|
||||
</select>
|
||||
) : (a.status === 'closed' ? 'Закрытый' : 'Действующий')}
|
||||
</td>
|
||||
<td className="data-table__cell">
|
||||
{editingId === a.id ? (
|
||||
<div className="button-group">
|
||||
@@ -105,7 +132,7 @@ export function AccountsList() {
|
||||
))}
|
||||
{accounts.length === 0 && (
|
||||
<tr className="data-table__row">
|
||||
<td colSpan={5} className="data-table__cell data-table__cell--center text text--muted">
|
||||
<td colSpan={7} className="data-table__cell data-table__cell--center text text--muted">
|
||||
Нет счетов. Импортируйте выписку.
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -104,7 +104,7 @@ export function Layout({ children }: { children: ReactNode }) {
|
||||
<span className="sidebar__version">
|
||||
FE {__FE_VERSION__} · BE {beVersion ?? '…'}
|
||||
</span>
|
||||
<span className="sidebar__copyright">© 2025 Семейный бюджет</span>
|
||||
<span className="sidebar__copyright">© 2025–2026 Семейный бюджет</span>
|
||||
</div>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
@@ -40,6 +40,7 @@ export function SummaryCards({ summary }: Props) {
|
||||
</div>
|
||||
<div className="summary__subvalue">Поступило: {formatAmount(summary.cashInflow)}</div>
|
||||
<div className="summary__subvalue">Списано: {formatAmount(summary.cashOutflow)}</div>
|
||||
<div className="summary__subvalue">Доход от процентов: {formatAmount(summary.interestIncome)}</div>
|
||||
{(summary.transferInflow > 0 || summary.transferOutflow > 0) && (
|
||||
<div className="summary__subvalue">
|
||||
Переводы: {formatAmount(summary.transferInflow)} / {formatAmount(summary.transferOutflow)}
|
||||
|
||||
@@ -187,7 +187,7 @@ export function TransactionFilters({
|
||||
<option value="">Все счета</option>
|
||||
{accounts.map((a) => (
|
||||
<option key={a.id} value={a.id}>
|
||||
{a.alias || a.accountNumberMasked}
|
||||
{[a.alias || a.accountNumberMasked, ({ brokerage: 'Брокерский', iis: 'ИИС', savings: 'Накопительный', current: 'Текущий' } as Record<string, string>)[a.accountType ?? ''], a.status === 'closed' ? 'закрытый' : 'действующий'].filter(Boolean).join(' · ')}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
|
||||
@@ -107,7 +107,7 @@ export function AnalyticsPage() {
|
||||
<option value="">Все счета</option>
|
||||
{accounts.map((a) => (
|
||||
<option key={a.id} value={a.id}>
|
||||
{a.alias || a.accountNumberMasked}
|
||||
{[a.alias || a.accountNumberMasked, ({ brokerage: 'Брокерский', iis: 'ИИС', savings: 'Накопительный', current: 'Текущий' } as Record<string, string>)[a.accountType ?? ''], a.status === 'closed' ? 'закрытый' : 'действующий'].filter(Boolean).join(' · ')}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
|
||||
@@ -242,6 +242,12 @@ button {
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.sidebar__meta {
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.sidebar__user {
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@family-budget/shared",
|
||||
"version": "0.2.2",
|
||||
"version": "0.3.0",
|
||||
"private": true,
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
|
||||
@@ -1,11 +1,18 @@
|
||||
export type AccountType = 'brokerage' | 'iis' | 'savings' | 'current';
|
||||
export type AccountStatus = 'active' | 'closed';
|
||||
|
||||
export interface Account {
|
||||
id: number;
|
||||
bank: string;
|
||||
accountNumberMasked: string;
|
||||
currency: string;
|
||||
alias: string | null;
|
||||
accountType: AccountType | null;
|
||||
status: AccountStatus;
|
||||
}
|
||||
|
||||
export interface UpdateAccountRequest {
|
||||
alias: string;
|
||||
accountType?: AccountType | null;
|
||||
status?: AccountStatus;
|
||||
}
|
||||
|
||||
@@ -23,6 +23,7 @@ export interface AnalyticsSummaryResponse {
|
||||
transferInflow: number;
|
||||
transferOutflow: number;
|
||||
cashNet: number;
|
||||
interestIncome: number;
|
||||
topCategories: TopCategory[];
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ export type {
|
||||
ApiError,
|
||||
} from './common';
|
||||
|
||||
export type { Account, UpdateAccountRequest } from './account';
|
||||
export type { Account, AccountType, AccountStatus, UpdateAccountRequest } from './account';
|
||||
|
||||
export type {
|
||||
Category,
|
||||
|
||||
Reference in New Issue
Block a user