admin/family_budget
1
0
Fork 1
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add account metadata and interest analytics

Browse Source
This commit is contained in:
admin
2026-08-20 08:40:03 +03:00
parent f8e4f86a6d
commit 6550e2057c
15 changed files with 152 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
backend/src/db/migrate.ts
View File

@@ -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> {

17
backend/src/routes/accounts.ts
View File

@@ -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;

49
backend/src/services/accounts.ts
View File

@@ -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();
}
}

8
backend/src/services/analytics.integration.test.ts
View File

@@ -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);

15
backend/src/services/analytics.ts
View File

@@ -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,
};
}

19
backend/src/services/import.ts
View File

@@ -171,7 +171,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 +206,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,9 +226,11 @@ export async function importStatement(
tx.description.toLowerCase().includes(CASHBACK_KEYWORD);
const dir = isCashbackCommissionImport
? 'income'
: determineDirection(tx.amountSigned, tx.description);
const categoryId = isCashbackCommissionImport ? incomeCategoryId : null;
const isCategoryConfirmed = isCashbackCommissionImport;
: isInvestmentAccount ? 'transfer' : determineDirection(tx.amountSigned, tx.description);
const categoryId = isCashbackCommissionImport
? incomeCategoryId
: isInvestmentAccount ? investmentCategoryId : null;
const isCategoryConfirmed = isCashbackCommissionImport || isInvestmentAccount;
const result = await client.query(
`INSERT INTO transactions
@@ -263,6 +273,7 @@ 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`,