13 Commits
Author SHA1 Message Date
ksv741 48e25ce30d refactor: publish typed problem detail codes (WealthLedger/backend#117)
Backend verify / commits (pull_request) Successful in 29s
Backend verify / security (pull_request) Successful in 10s
Backend verify / verify (pull_request) Successful in 5m10s
2026-10-28 16:27:03 +03:00
codex-bot 22668da3fa refactor: remove tbank-sync operations import cycle (WealthLedger/backend#116) (#142)
Backend verify / commits (push) Skipped
Backend verify / security (push) Successful in 10s
Backend verify / verify (push) Failing after 6m14s
2026-10-28 16:26:49 +03:00
ksv741 2325b63883 fix: reset portfolio value points inflated by double-counted cash (WealthLedger/backend#140)
Backend verify / commits (pull_request) Successful in 27s
Backend verify / security (pull_request) Skipped
Backend verify / verify (pull_request) Skipped
Backend verify / commits (push) Skipped
Backend verify / security (push) Successful in 9s
Backend verify / verify (push) Failing after 4m33s
2026-10-28 08:00:20 +03:00
ksv741 f2843e30bd fix: count brokerage cash once and skip short-position return percent (WealthLedger/backend#140) 2026-10-28 08:00:20 +03:00
codex-bot 97fc41fa29 feat: extend account list portfolio summary (#138)
Backend verify / commits (push) Skipped
Backend verify / security (push) Successful in 8s
Backend verify / verify (push) Failing after 4m43s
2026-10-27 05:44:07 +03:00
ksv741 3dcd1a69a6 chore: restore main ancestry in develop (WealthLedger/backend#135)
Backend verify / commits (pull_request) Successful in 31s
Backend verify / security (pull_request) Skipped
Backend verify / verify (pull_request) Skipped
Backend verify / commits (push) Skipped
Backend verify / security (push) Successful in 9s
Backend verify / verify (push) Failing after 5m47s
2026-10-25 10:06:30 +03:00
codex-botandksv741 8503429b46 chore(release): 2.3.1 (#132)
Backend verify / commits (push) Skipped
Backend verify / security (push) Successful in 23s
Backend verify / verify (push) Successful in 6m19s
Backend image / publish (push) Successful in 13m17s
Backend patch #129 for WealthLedger/deploy#12. Verified release SHA `0dff4b43773041a73a725fa0b9d0c665eac0cab2`; fast-forward-only main then tag on exact SHA.

---------

Co-authored-by: Sergey Krylov <ksv741@mail.ru>
Reviewed-on: #132
Co-authored-by: codex-bot <codex-bot@ksv741.ru>
2026-10-24 21:32:57 +03:00
ksv741 0dff4b4377 chore(release): 2.3.1
Backend verify / commits (push) Skipped
Backend verify / security (push) Successful in 11s
Backend verify / commits (pull_request) Successful in 33s
Backend verify / verify (push) Failing after 6m28s
Backend verify / security (pull_request) Successful in 10s
Backend verify / verify (pull_request) Successful in 6m13s
2026-10-24 21:00:38 +03:00
ksv741 a250142a86 fix: use available Debian packages in image build (#129)
Backend verify / commits (pull_request) Successful in 38s
Backend verify / security (pull_request) Successful in 11s
Backend verify / verify (pull_request) Successful in 6m18s
Backend verify / commits (push) Skipped
Backend verify / security (push) Successful in 13s
Backend verify / verify (push) Failing after 6m38s
2026-10-24 20:48:55 +03:00
ksv741 0a0e70b273 chore(release): 2.3.0
Backend verify / commits (pull_request) Successful in 35s
Backend verify / security (pull_request) Successful in 9s
Backend verify / verify (pull_request) Successful in 6m23s
Backend verify / commits (push) Skipped
Backend verify / security (push) Successful in 11s
Backend image / publish (push) Failing after 6m34s
Backend verify / verify (push) Successful in 6m36s
2026-10-24 19:15:04 +03:00
ksv741 449cfcd6c5 chore(deps): update non-major dependencies #11
Backend verify / commits (pull_request) Successful in 30s
Backend verify / security (pull_request) Successful in 9s
Backend verify / verify (pull_request) Successful in 5m31s
Backend verify / commits (push) Skipped
Backend verify / security (push) Successful in 9s
Backend verify / verify (push) Failing after 5m51s
2026-10-24 18:20:20 +03:00
codex-bot 966a1f793a feat: log unhandled errors and pretty dev output (WealthLedger/backend#120) (#126)
Backend verify / commits (push) Skipped
Backend verify / security (push) Successful in 9s
Backend verify / verify (push) Failing after 5m39s
feat: log unhandled errors and pretty dev output (#120)
2026-10-24 15:06:34 +03:00
codex-bot d1f6969dc7 fix: persist refresh cookie across browser restarts (WealthLedger/backend#123)
Backend verify / commits (push) Skipped
Backend verify / security (push) Successful in 9s
Backend verify / verify (push) Failing after 4m58s
2026-10-23 08:34:39 +03:00
35 changed files with 1603 additions and 1400 deletions
+1 -1
View File
@@ -1 +1 @@
24.21.0 24.22.1
+20
View File
@@ -1,5 +1,25 @@
# Changelog # Changelog
## [2.3.1](https://git.personal.ksv741.ru/WealthLedger/backend/compare/v2.3.0...v2.3.1) (2026-10-24)
### Bug Fixes
* use available Debian packages in image build ([#129](https://git.personal.ksv741.ru/WealthLedger/backend/issues/129)) ([a250142](https://git.personal.ksv741.ru/WealthLedger/backend/commit/a250142a86e07ec7047e642afa16492fa4987f9a))
## [2.3.0](https://git.personal.ksv741.ru/WealthLedger/backend/compare/v2.2.0...v2.3.0) (2026-10-24)
### Features
* log unhandled errors and pretty dev output (WealthLedger/backend[#120](https://git.personal.ksv741.ru/WealthLedger/backend/issues/120)) ([#126](https://git.personal.ksv741.ru/WealthLedger/backend/issues/126)) ([966a1f7](https://git.personal.ksv741.ru/WealthLedger/backend/commit/966a1f793aa2087cce3e47750e0017f78315bd64))
### Bug Fixes
* persist refresh cookie across browser restarts (WealthLedger/backend[#123](https://git.personal.ksv741.ru/WealthLedger/backend/issues/123)) ([d1f6969](https://git.personal.ksv741.ru/WealthLedger/backend/commit/d1f6969dc7c22ae3cf7396bccdbf0cea2f61db2e))
### Maintenance
* **deps:** update non-major dependencies [#11](https://git.personal.ksv741.ru/WealthLedger/backend/issues/11) ([449cfcd](https://git.personal.ksv741.ru/WealthLedger/backend/commit/449cfcd6c5a91307012bb3a640c8255ba243cbf5))
## [2.2.0](https://git.personal.ksv741.ru/WealthLedger/backend/compare/v2.1.0...v2.2.0) (2026-10-18) ## [2.2.0](https://git.personal.ksv741.ru/WealthLedger/backend/compare/v2.1.0...v2.2.0) (2026-10-18)
### Features ### Features
+4 -4
View File
@@ -1,9 +1,9 @@
FROM node:24.21.0-bookworm-slim AS base FROM node:24.22.1-bookworm-slim AS base
WORKDIR /app WORKDIR /app
FROM base AS dependencies FROM base AS dependencies
# Native SQLite/bcrypt builds happen only here; compilers stay out of runtime. # Native SQLite/bcrypt builds happen only here; compilers stay out of runtime.
RUN apt-get update && apt-get install -y --no-install-recommends python3=3.11.2-1+b1 make=4.3-4.1 g++=4:12.2.0-3 ca-certificates=20250419~deb12u1 openssl=3.0.20-1~deb12u2 && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y --no-install-recommends python3 make g++ ca-certificates openssl && rm -rf /var/lib/apt/lists/*
COPY package.json package-lock.json ./ COPY package.json package-lock.json ./
RUN npm ci RUN npm ci
COPY . . COPY . .
@@ -11,7 +11,7 @@ RUN npx --no-install prisma generate
FROM dependencies AS development FROM dependencies AS development
# Nest watch uses ps to stop the previous process tree before restarting. # Nest watch uses ps to stop the previous process tree before restarting.
RUN apt-get update && apt-get install -y --no-install-recommends procps=2:4.0.2-3 && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y --no-install-recommends procps && rm -rf /var/lib/apt/lists/*
RUN mkdir /data && chown node:node /data && chown -R node:node /app RUN mkdir /data && chown node:node /data && chown -R node:node /app
USER node USER node
ENV NODE_ENV=development DATABASE_URL=file:/data/wealthledger.db ENV NODE_ENV=development DATABASE_URL=file:/data/wealthledger.db
@@ -23,7 +23,7 @@ FROM dependencies AS build
RUN npx --no-install nest build && npm prune --omit=dev --omit=optional RUN npx --no-install nest build && npm prune --omit=dev --omit=optional
FROM base AS production FROM base AS production
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates=20250419~deb12u1 openssl=3.0.20-1~deb12u2 && rm -rf /var/lib/apt/lists/* \ RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates openssl && rm -rf /var/lib/apt/lists/* \
&& mkdir /data && chown node:node /data && mkdir /data && chown node:node /data
ARG VERSION ARG VERSION
ARG REVISION ARG REVISION
+2 -1
View File
@@ -37,7 +37,7 @@ export default defineConfig(
linterOptions: { reportUnusedDisableDirectives: 'error' }, linterOptions: { reportUnusedDisableDirectives: 'error' },
settings: { settings: {
'import-x/resolver-next': [createTypeScriptImportResolver()], 'import-x/resolver-next': [createTypeScriptImportResolver()],
'node': { tryExtensions: ['.ts', '.js', '.json', '.node'], version: '24.21.0' }, 'node': { tryExtensions: ['.ts', '.js', '.json', '.node'], version: '24.22.1' },
}, },
rules: { rules: {
'curly': ['error', 'multi-line'], 'curly': ['error', 'multi-line'],
@@ -56,6 +56,7 @@ export default defineConfig(
'after', 'after',
{ overrides: { '?': 'before', ':': 'before' } }, { overrides: { '?': 'before', ':': 'before' } },
], ],
'import-x/no-cycle': 'error',
'import-x/no-duplicates': ['error', { 'prefer-inline': true }], 'import-x/no-duplicates': ['error', { 'prefer-inline': true }],
}, },
}, },
+1033 -1293
View File
File diff suppressed because it is too large Load Diff
+49 -39
View File
@@ -1,12 +1,12 @@
{ {
"name": "wealth-ledger-backend", "name": "wealth-ledger-backend",
"version": "2.2.0", "version": "2.3.1",
"description": "", "description": "",
"author": "", "author": "",
"private": true, "private": true,
"license": "UNLICENSED", "license": "UNLICENSED",
"engines": { "engines": {
"node": "v24.21.0" "node": "v24.22.1"
}, },
"scripts": { "scripts": {
"build": "prisma generate && nest build", "build": "prisma generate && nest build",
@@ -39,17 +39,17 @@
"test:lint": "node --test test/eslint-config.cjs" "test:lint": "node --test test/eslint-config.cjs"
}, },
"dependencies": { "dependencies": {
"@grpc/grpc-js": "1.14.5", "@grpc/grpc-js": "1.14.6",
"@grpc/proto-loader": "0.8.1", "@grpc/proto-loader": "0.8.1",
"@nestjs/common": "12.0.1", "@nestjs/common": "12.2.0",
"@nestjs/config": "12.0.0", "@nestjs/config": "12.0.1",
"@nestjs/core": "12.0.1", "@nestjs/core": "12.2.0",
"@nestjs/jwt": "12.0.1", "@nestjs/jwt": "12.0.3",
"@nestjs/passport": "12.0.0", "@nestjs/passport": "12.0.0",
"@nestjs/platform-express": "12.0.1", "@nestjs/platform-express": "12.2.0",
"@nestjs/swagger": "12.0.1", "@nestjs/swagger": "12.0.4",
"@prisma/adapter-better-sqlite3": "7.10.0", "@prisma/adapter-better-sqlite3": "7.10.1",
"@prisma/client": "7.10.0", "@prisma/client": "7.10.1",
"bcrypt": "6.0.0", "bcrypt": "6.0.0",
"better-sqlite3": "12.11.1", "better-sqlite3": "12.11.1",
"cheerio": "1.2.0", "cheerio": "1.2.0",
@@ -57,67 +57,77 @@
"class-validator": "0.15.1", "class-validator": "0.15.1",
"cookie-parser": "1.4.7", "cookie-parser": "1.4.7",
"dotenv": "17.4.2", "dotenv": "17.4.2",
"lru-cache": "11.5.2", "lru-cache": "11.5.3",
"nestjs-pino": "5.1.0", "nestjs-pino": "5.3.1",
"passport": "0.7.0", "passport": "0.7.0",
"passport-jwt": "4.0.1", "passport-jwt": "4.0.1",
"pino-http": "11.0.0", "pino-http": "11.0.0",
"prisma": "7.10.0", "prisma": "7.10.1",
"reflect-metadata": "0.2.2", "reflect-metadata": "0.2.2",
"rxjs": "7.8.2" "rxjs": "7.8.2"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "21.2.2", "@commitlint/cli": "21.2.4",
"@commitlint/config-conventional": "21.2.2", "@commitlint/config-conventional": "21.2.4",
"@darraghor/eslint-plugin-nestjs-typed": "7.5.6", "@darraghor/eslint-plugin-nestjs-typed": "7.5.8",
"@eslint/js": "10.0.1", "@eslint/js": "10.0.1",
"@nestjs/cli": "12.0.0", "@nestjs/cli": "12.0.10",
"@nestjs/schematics": "12.0.1", "@nestjs/schematics": "12.0.10",
"@nestjs/testing": "12.0.1", "@nestjs/testing": "12.2.0",
"@release-it/conventional-changelog": "12.0.0", "@release-it/conventional-changelog": "12.0.2",
"@stylistic/eslint-plugin": "5.10.0", "@stylistic/eslint-plugin": "5.10.0",
"@types/bcrypt": "6.0.0", "@types/bcrypt": "6.0.0",
"@types/cookie-parser": "1.4.10", "@types/cookie-parser": "1.4.10",
"@types/express": "5.0.6", "@types/express": "5.0.6",
"@types/jest": "30.0.0", "@types/jest": "30.0.0",
"@types/node": "24.13.4", "@types/node": "24.19.2",
"@types/passport-jwt": "4.0.1", "@types/passport-jwt": "4.0.1",
"@types/supertest": "7.2.1", "@types/supertest": "7.2.1",
"conventional-changelog-conventionalcommits": "10.4.0", "conventional-changelog-conventionalcommits": "10.4.1",
"eslint": "10.11.0", "eslint": "10.13.0",
"eslint-import-resolver-typescript": "4.4.5", "eslint-import-resolver-typescript": "4.4.5",
"eslint-plugin-import-x": "4.17.1", "eslint-plugin-import-x": "4.17.1",
"eslint-plugin-jest": "29.16.6", "eslint-plugin-jest": "29.17.0",
"eslint-plugin-n": "18.4.0", "eslint-plugin-n": "18.5.0",
"eslint-plugin-perfectionist": "5.12.1", "eslint-plugin-perfectionist": "5.13.0",
"eslint-plugin-regexp": "3.3.1", "eslint-plugin-regexp": "3.3.1",
"eslint-plugin-security": "4.1.0", "eslint-plugin-security": "4.2.0",
"eslint-plugin-sonarjs": "4.2.1", "eslint-plugin-sonarjs": "4.2.2",
"globals": "17.12.0", "globals": "17.13.0",
"jest": "30.5.1", "jest": "30.5.2",
"release-it": "21.0.2", "pino-pretty": "13.2.0",
"supertest": "7.2.2", "release-it": "21.1.1",
"ts-jest": "29.4.12", "supertest": "7.3.1",
"ts-jest": "29.4.15",
"ts-loader": "9.6.2", "ts-loader": "9.6.2",
"ts-node": "10.9.2", "ts-node": "10.9.2",
"tsconfig-paths": "4.2.0", "tsconfig-paths": "4.2.0",
"typescript": "6.0.3", "typescript": "6.0.3",
"typescript-eslint": "8.70.1" "typescript-eslint": "8.72.0"
}, },
"overrides": { "overrides": {
"proxy-addr": "2.0.8", "proxy-addr": "2.0.8",
"express": {
"body-parser": "2.4.0"
},
"@nestjs/platform-express": { "@nestjs/platform-express": {
"multer": "2.4.0" "multer": "2.5.0"
},
"ajv": {
"fast-uri": "3.1.9"
}, },
"@prisma/config@7.10.0": { "@prisma/config@7.10.0": {
"deepmerge-ts": "8.0.2" "deepmerge-ts": "8.0.2"
}, },
"release-it": { "release-it": {
"basic-ftp": "6.2.1", "basic-ftp": "6.2.3",
"undici": "7.29.1" "undici": "7.30.1"
},
"socks": {
"ip-address": "10.7.4"
}, },
"prisma": { "prisma": {
"mysql2": "3.24.4" "mysql2": "3.24.6"
} }
}, },
"jest": { "jest": {
@@ -0,0 +1,4 @@
-- Points written before WealthLedger/backend#140 counted cash twice (cash balance
-- plus the mirroring CURRENCY position). Historical compositions and FX rates are
-- not stored, so the points cannot be recomputed exactly; history restarts here.
DELETE FROM "TbankPortfolioValuePoint";
@@ -1,24 +1,29 @@
import { ArgumentsHost } from '@nestjs/common'; import { ArgumentsHost, BadRequestException } from '@nestjs/common';
import { StructuredLogger } from '../logging/structured-logger.service';
import { HttpExceptionFilter } from './http-exception.filter'; import { HttpExceptionFilter } from './http-exception.filter';
describe('HttpExceptionFilter', () => { describe('HttpExceptionFilter', () => {
it('does not expose internal error details', () => { const setup = () => {
const status = jest.fn().mockReturnThis(); const status = jest.fn().mockReturnThis();
const type = jest.fn().mockReturnThis(); const type = jest.fn().mockReturnThis();
const json = jest.fn(); const json = jest.fn();
const locals: Record<string, unknown> = {}; const locals: Record<string, unknown> = {};
const filter = new HttpExceptionFilter(); const logger = { event: jest.fn() };
const filter = new HttpExceptionFilter(logger as unknown as StructuredLogger);
const host = { const host = {
switchToHttp: () => ({ switchToHttp: () => ({
getResponse: () => ({ status, type, json, locals }), getResponse: () => ({ status, type, json, locals }),
}), }),
} as unknown as ArgumentsHost; } as unknown as ArgumentsHost;
return { filter, host, status, type, json, locals, logger };
};
filter.catch( it('logs unhandled errors with name and stack frames but never the message', () => {
new Error('operation failed\npassword: SYNTHETIC_AUDIT_SECRET'), const { filter, host, status, type, json, locals, logger } = setup();
host, const error = new Error('operation failed\npassword: SYNTHETIC_AUDIT_SECRET');
);
filter.catch(error, host);
expect(status).toHaveBeenCalledWith(500); expect(status).toHaveBeenCalledWith(500);
expect(type).toHaveBeenCalledWith('application/problem+json'); expect(type).toHaveBeenCalledWith('application/problem+json');
@@ -27,6 +32,29 @@ describe('HttpExceptionFilter', () => {
code: 'INTERNAL_SERVER_ERROR', code: 'INTERNAL_SERVER_ERROR',
}); });
expect(locals.publicErrorCode).toBe('INTERNAL_SERVER_ERROR'); expect(locals.publicErrorCode).toBe('INTERNAL_SERVER_ERROR');
expect(locals.errorStack).toBeUndefined(); expect(logger.event).toHaveBeenCalledTimes(1);
const [level, event, fields] = logger.event.mock.calls[0] as [string, string, Record<string, unknown>];
expect(level).toBe('error');
expect(event).toBe('http.request.unhandled');
expect(fields).toMatchObject({ code: 'INTERNAL_SERVER_ERROR', errorName: 'Error' });
expect(JSON.stringify(fields)).not.toContain('SYNTHETIC_AUDIT_SECRET');
expect(String(fields['errorStack']).split('\n').every((line) => line.startsWith(' at '))).toBe(true);
});
it('logs field pointers without values for validation errors', () => {
const { filter, host, status, logger, locals } = setup();
const exception = new BadRequestException({
message: [
{ property: 'amount', constraints: { isPositive: 'amount must be positive' }, value: -42 },
{ property: 'amount', constraints: { min: 'amount too small' }, value: -42 },
],
});
filter.catch(exception, host);
expect(status).toHaveBeenCalledWith(400);
expect(locals.invalidFields).toBe('#/amount');
expect(logger.event).not.toHaveBeenCalled();
expect(JSON.stringify(locals)).not.toContain('-42');
}); });
}); });
@@ -10,9 +10,12 @@ import {
} from '@nestjs/common'; } from '@nestjs/common';
import { HttpErrorCode } from '../error-code'; import { HttpErrorCode } from '../error-code';
import { StructuredLogger } from '../logging/structured-logger.service';
@Catch() @Catch()
export class HttpExceptionFilter implements ExceptionFilter { export class HttpExceptionFilter implements ExceptionFilter {
constructor(private readonly logger: StructuredLogger) {}
catch(exception: unknown, host: ArgumentsHost): void { catch(exception: unknown, host: ArgumentsHost): void {
const context = host.switchToHttp(); const context = host.switchToHttp();
const response = context.getResponse<Response>(); const response = context.getResponse<Response>();
@@ -31,6 +34,18 @@ export class HttpExceptionFilter implements ExceptionFilter {
: this.codeFor(status, payload); : this.codeFor(status, payload);
response.locals ??= {}; response.locals ??= {};
response.locals.publicErrorCode = code; response.locals.publicErrorCode = code;
if (isValidation) {
response.locals.invalidFields = [
...new Set(
this.validationErrors(
(payload as { message: ValidationError[] }).message,
).map((error) => error.pointer),
),
].join(',');
}
if (!(exception instanceof HttpException)) {
this.logUnhandled(exception, code);
}
response response
.status(status) .status(status)
.type('application/problem+json') .type('application/problem+json')
@@ -47,6 +62,20 @@ export class HttpExceptionFilter implements ExceptionFilter {
}); });
} }
// ponytail: stack содержит текст message в первой строке; оставляем только кадры, message не пишем.
private logUnhandled(exception: unknown, code: string): void {
const error = exception instanceof Error ? exception : undefined;
const frames = (error?.stack ?? '')
.split('\n')
.filter((line) => line.startsWith(' at '))
.join('\n');
this.logger.event('error', 'http.request.unhandled', {
code,
errorName: error?.name ?? typeof exception,
errorStack: frames,
});
}
private codeFor(status: number, payload: unknown): string { private codeFor(status: number, payload: unknown): string {
if (typeof payload === 'object' && payload !== null && 'code' in payload) { if (typeof payload === 'object' && payload !== null && 'code' in payload) {
const code = (payload as { code?: unknown }).code; const code = (payload as { code?: unknown }).code;
+5
View File
@@ -24,6 +24,7 @@ function completion(request: Request, response: Response, value: { responseTime:
status: response.statusCode, status: response.statusCode,
durationMs: Math.round(value.responseTime), durationMs: Math.round(value.responseTime),
...(typeof response.locals.publicErrorCode === 'string' ? { code: response.locals.publicErrorCode } : {}), ...(typeof response.locals.publicErrorCode === 'string' ? { code: response.locals.publicErrorCode } : {}),
...(typeof response.locals.invalidFields === 'string' ? { invalidFields: response.locals.invalidFields } : {}),
}; };
} }
@@ -31,6 +32,10 @@ export function loggingOptions(config: ConfigService<Environment, true>): Option
return { return {
level: config.getOrThrow('LOG_LEVEL'), level: config.getOrThrow('LOG_LEVEL'),
messageKey: 'message', messageKey: 'message',
// ponytail: development-only pretty output; production never loads pino-pretty.
...(process.env['NODE_ENV'] === 'development'
? { transport: { target: 'pino-pretty', options: { colorize: true, singleLine: true, messageKey: 'message' } } }
: {}),
genReqId: (_request, response) => { genReqId: (_request, response) => {
const id = randomUUID(); const id = randomUUID();
response.setHeader('X-Request-ID', id); response.setHeader('X-Request-ID', id);
@@ -14,9 +14,12 @@ const allowedFields = new Set([
'count', 'count',
'durationMs', 'durationMs',
'environment', 'environment',
'errorName',
'errorStack',
'found', 'found',
'grpcCode', 'grpcCode',
'headersReceived', 'headersReceived',
'invalidFields',
'method', 'method',
'networkMs', 'networkMs',
'operation', 'operation',
+1 -1
View File
@@ -1,7 +1,7 @@
import { Injectable, ServiceUnavailableException } from '@nestjs/common'; import { Injectable, ServiceUnavailableException } from '@nestjs/common';
import { constants as httpStatus } from 'node:http2'; import { constants as httpStatus } from 'node:http2';
enum MoexErrorCode { Unavailable = 'MOEX_UNAVAILABLE' } export enum MoexErrorCode { Unavailable = 'MOEX_UNAVAILABLE' }
const MIN_PRICE_PERCENT_EXCLUSIVE = 0; const MIN_PRICE_PERCENT_EXCLUSIVE = 0;
const FIRST_PAGE_OFFSET = 0; const FIRST_PAGE_OFFSET = 0;
+1 -1
View File
@@ -4,7 +4,7 @@ import { LRUCache } from 'lru-cache';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '../../common/time'; import { ISO_DATE_LENGTH, ISO_DATE_START } from '../../common/time';
enum NcrErrorCode { Unavailable = 'NCR_UNAVAILABLE' } export enum NcrErrorCode { Unavailable = 'NCR_UNAVAILABLE' }
const EXPECTED_REGISTRY_TABLES = 1; const EXPECTED_REGISTRY_TABLES = 1;
const RATING_COLUMN = 2; const RATING_COLUMN = 2;
+1 -1
View File
@@ -37,7 +37,7 @@ export function configureApp(app: INestApplication): void {
exceptionFactory: (message) => new BadRequestException({ message }), exceptionFactory: (message) => new BadRequestException({ message }),
}), }),
); );
app.useGlobalFilters(new HttpExceptionFilter()); app.useGlobalFilters(new HttpExceptionFilter(app.get(StructuredLogger)));
app.enableShutdownHooks(); app.enableShutdownHooks();
} }
+1 -1
View File
@@ -17,7 +17,7 @@ import { AuthenticationResult, AuthUser, RefreshPayload } from './auth.types';
const EXPECTED_ROTATED_SESSIONS = 1; const EXPECTED_ROTATED_SESSIONS = 1;
const PASSWORD_HASH_ROUNDS = 12; const PASSWORD_HASH_ROUNDS = 12;
const REFRESH_TTL_MS = 604_800_000; export const REFRESH_TTL_MS = 604_800_000;
const ACCESS_TTL = '15m'; const ACCESS_TTL = '15m';
const REFRESH_TTL = '7d'; const REFRESH_TTL = '7d';
@@ -22,7 +22,7 @@ import {
import { ApiProblemResponses } from '../../../common/decorators/api-safe-error-response.decorator'; import { ApiProblemResponses } from '../../../common/decorators/api-safe-error-response.decorator';
import { HttpErrorCode } from '../../../common/error-code'; import { HttpErrorCode } from '../../../common/error-code';
import { AuthService } from '../application/auth.service'; import { AuthService, REFRESH_TTL_MS } from '../application/auth.service';
import { AccessPayload, AuthenticationResult } from '../application/auth.types'; import { AccessPayload, AuthenticationResult } from '../application/auth.types';
import { LoginDto, RegisterDto } from './auth.dto'; import { LoginDto, RegisterDto } from './auth.dto';
import { JwtAuthGuard } from './jwt-auth.guard'; import { JwtAuthGuard } from './jwt-auth.guard';
@@ -134,6 +134,7 @@ export class AuthController {
sameSite: 'lax' as const, sameSite: 'lax' as const,
secure: process.env['NODE_ENV'] !== 'development', secure: process.env['NODE_ENV'] !== 'development',
path: COOKIE_PATH, path: COOKIE_PATH,
maxAge: REFRESH_TTL_MS,
}; };
} }
} }
@@ -2,12 +2,39 @@ import { ApiProperty } from '@nestjs/swagger';
import { MoneyDto } from '../../../common/money.dto'; import { MoneyDto } from '../../../common/money.dto';
import { InvestmentResourceMetaDto } from '../investment-resource.dto'; import { InvestmentResourceMetaDto } from '../investment-resource.dto';
import { PortfolioStructureDto } from '../portfolio/portfolio.api';
import { HourlySyncStatusDto } from '../tbank-sync/tbank-sync.dto'; import { HourlySyncStatusDto } from '../tbank-sync/tbank-sync.dto';
export class UnrealizedReturnDto {
@ApiProperty()
declare currency: string;
@ApiProperty({ example: '12.345678901' })
declare absolute: string;
@ApiProperty({ example: '100.00' })
declare costBasis: string;
@ApiProperty({ type: String, nullable: true, example: '12.34' })
declare percent: null | string;
@ApiProperty()
declare partial: boolean;
}
export class PortfolioSummaryDto { export class PortfolioSummaryDto {
@ApiProperty({ type: MoneyDto, isArray: true }) @ApiProperty({ type: MoneyDto, isArray: true })
declare totalsByCurrency: MoneyDto[]; declare totalsByCurrency: MoneyDto[];
@ApiProperty({ type: MoneyDto, isArray: true })
declare cashBalances: MoneyDto[];
@ApiProperty({ type: PortfolioStructureDto })
declare structure: PortfolioStructureDto;
@ApiProperty({ type: UnrealizedReturnDto, isArray: true })
declare unrealizedReturnByCurrency: UnrealizedReturnDto[];
@ApiProperty({ @ApiProperty({
type: 'integer', type: 'integer',
minimum: 0, minimum: 0,
@@ -21,6 +48,20 @@ export class PortfolioSummaryDto {
description: 'Number of non-zero bond positions, not the number of units.', description: 'Number of non-zero bond positions, not the number of units.',
}) })
declare bondPositionCount: number; declare bondPositionCount: number;
@ApiProperty({
type: 'integer',
minimum: 0,
description: 'Number of non-zero fund positions, not the number of units.',
})
declare fundPositionCount: number;
@ApiProperty({
type: 'integer',
minimum: 0,
description: 'Number of all non-zero positions, not the number of units.',
})
declare totalPositionCount: number;
} }
export class BrokerageAccountDto { export class BrokerageAccountDto {
@@ -33,6 +33,7 @@ describe('saved brokerage account projection', () => {
}); });
it('keeps exact saved totals and independent missing summaries', async () => { it('keeps exact saved totals and independent missing summaries', async () => {
const structure = { currencies: [], unvaluedCategories: [] };
portfolio.saved.mockResolvedValue({ portfolio.saved.mockResolvedValue({
membership: meta, membership: meta,
accounts: [ accounts: [
@@ -43,10 +44,12 @@ describe('saved brokerage account projection', () => {
openedOn: null, openedOn: null,
meta, meta,
snapshot: { snapshot: {
cashBalances: [{ currency: 'RUB', value: '10.000000001' }],
structure,
totalsByCurrency: [ totalsByCurrency: [
{ currency: 'RUB', value: '100000000.000000001' }, { currency: 'RUB', value: '100000000.000000001' },
], ],
positions: [{ type: 'STOCK' }, { type: 'BOND' }], positions: [{ type: 'STOCK', quantity: '1' }, { type: 'BOND', quantity: '2' }],
}, },
}, },
{ {
@@ -61,15 +64,91 @@ describe('saved brokerage account projection', () => {
}); });
const response = await service.list('owner'); const response = await service.list('owner');
expect(response.data?.[0].portfolioSummary).toEqual({ expect(response.data?.[0].portfolioSummary).toEqual({
cashBalances: [{ currency: 'RUB', value: '10.000000001' }],
structure,
totalsByCurrency: [{ currency: 'RUB', value: '100000000.000000001' }], totalsByCurrency: [{ currency: 'RUB', value: '100000000.000000001' }],
stockPositionCount: 1, stockPositionCount: 1,
bondPositionCount: 1, bondPositionCount: 1,
fundPositionCount: 0,
totalPositionCount: 2,
unrealizedReturnByCurrency: [],
}); });
expect(response.data?.[1].portfolioSummary).toBeNull(); expect(response.data?.[1].portfolioSummary).toBeNull();
expect(response.meta.availability).toBe('available'); expect(response.meta.availability).toBe('available');
expect(response.meta.completeness).toBe('complete'); expect(response.meta.completeness).toBe('complete');
}); });
it('returns an empty summary from an empty saved portfolio', async () => {
const structure = { currencies: [], unvaluedPositions: [], unknownValues: [] };
portfolio.saved.mockResolvedValueOnce({
membership: meta,
accounts: [{
id: 'empty', name: 'Empty', type: 'BROKERAGE', openedOn: null, meta,
snapshot: { cashBalances: [], structure, totalsByCurrency: [], positions: [] },
}],
});
expect((await service.list('owner')).data?.[0].portfolioSummary).toEqual({
cashBalances: [], structure, totalsByCurrency: [],
stockPositionCount: 0, bondPositionCount: 0,
fundPositionCount: 0, totalPositionCount: 0,
unrealizedReturnByCurrency: [],
});
});
it('calculates exact returns by currency, partial data, and zero cost basis', async () => {
portfolio.saved.mockResolvedValueOnce({
membership: meta,
accounts: [{
id: 'a', name: 'A', type: 'BROKERAGE', openedOn: null, meta,
snapshot: {
cashBalances: [], structure: {}, totalsByCurrency: [
{ currency: 'RUB', value: '100' }, { currency: 'USD', value: '20' },
],
positions: [
{ type: 'STOCK', quantity: '2', averagePurchasePrice: { currency: 'RUB', value: '10.000000001' }, absoluteReturn: { currency: 'RUB', value: '0.000000003' } },
{ type: 'BOND', quantity: '0.5', averagePurchasePrice: { currency: 'RUB', value: '20' }, absoluteReturn: { currency: 'RUB', value: '1.25' } },
{ type: 'FUND', quantity: '3', averagePurchasePrice: { currency: 'USD', value: '2.5' }, absoluteReturn: null },
{ type: 'STOCK', quantity: '4', averagePurchasePrice: { currency: 'USD', value: '0' }, absoluteReturn: { currency: 'USD', value: '2.5' } },
{ type: 'CURRENCY', quantity: '100', averagePurchasePrice: { currency: 'EUR', value: '1' }, absoluteReturn: { currency: 'EUR', value: '5' } },
{ type: 'BOND', quantity: '1', currentValue: { currency: 'CNY', value: '7' }, averagePurchasePrice: null, absoluteReturn: null },
],
},
}],
});
expect((await service.list('owner')).data?.[0].portfolioSummary).toMatchObject({
stockPositionCount: 2, bondPositionCount: 2,
fundPositionCount: 1, totalPositionCount: 6,
unrealizedReturnByCurrency: [
{ currency: 'CNY', absolute: '0', costBasis: '0', percent: null, partial: true },
{ currency: 'RUB', absolute: '1.250000003', costBasis: '30.000000002', percent: '4.17', partial: false },
{ currency: 'USD', absolute: '2.5', costBasis: '0', percent: null, partial: true },
],
});
});
it('omits return percent for a currency with short positions', async () => {
portfolio.saved.mockResolvedValueOnce({
membership: meta,
accounts: [{
id: 'a', name: 'A', type: 'BROKERAGE', openedOn: null, meta,
snapshot: {
cashBalances: [], structure: {}, totalsByCurrency: [],
positions: [
{ type: 'STOCK', quantity: '-2', averagePurchasePrice: { currency: 'RUB', value: '100' }, absoluteReturn: { currency: 'RUB', value: '-20' } },
{ type: 'STOCK', quantity: '1', averagePurchasePrice: { currency: 'USD', value: '10' }, absoluteReturn: { currency: 'USD', value: '1' } },
],
},
}],
});
expect((await service.list('owner')).data?.[0]?.portfolioSummary?.unrealizedReturnByCurrency).toEqual([
{ currency: 'RUB', absolute: '-20', costBasis: '-200', percent: null, partial: false },
{ currency: 'USD', absolute: '1', costBasis: '10', percent: '10', partial: false },
]);
});
it('observes the latest hourly walk without starting another one', async () => { it('observes the latest hourly walk without starting another one', async () => {
portfolio.saved.mockResolvedValue({ membership: meta, accounts: [] }); portfolio.saved.mockResolvedValue({ membership: meta, accounts: [] });
sync.hourly.mockResolvedValue({ sync.hourly.mockResolvedValue({
@@ -1,10 +1,82 @@
import { Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import { createHash } from 'node:crypto'; import { createHash } from 'node:crypto';
import {
decimalFromString,
divide,
formatDecimal,
isZero,
multiply,
} from '../../../common/decimal';
import { investmentResourceMeta } from '../investment-resource.mapper'; import { investmentResourceMeta } from '../investment-resource.mapper';
import { PortfolioService } from '../portfolio/portfolio.api'; import { sumMoneyByCurrency } from '../portfolio/domain/portfolio-totals';
import { PortfolioPositionDto, PortfolioService } from '../portfolio/portfolio.api';
import { hourlyAttempt, TbankSyncRepository } from '../tbank-sync/tbank-sync.repository'; import { hourlyAttempt, TbankSyncRepository } from '../tbank-sync/tbank-sync.repository';
import { BrokerageAccountDto, BrokerageAccountsResourceDto } from './brokerage-account.dto'; import {
BrokerageAccountDto,
BrokerageAccountsResourceDto,
UnrealizedReturnDto,
} from './brokerage-account.dto';
const PERCENT_DECIMAL_PLACES = 2;
const ZERO_QUANTITY = 0n;
function unrealizedReturns(positions: PortfolioPositionDto[]): UnrealizedReturnDto[] {
// Cash-like CURRENCY positions must not duplicate the separately returned cash balances.
const investments = positions.filter((position) => position.type !== 'CURRENCY');
const absolute = sumMoneyByCurrency(
investments.flatMap((position) => position.absoluteReturn ? [position.absoluteReturn] : []),
);
const costs = sumMoneyByCurrency(
investments.flatMap((position) =>
position.absoluteReturn && position.averagePurchasePrice
? [{
currency: position.absoluteReturn.currency,
value: formatDecimal(multiply(
decimalFromString(position.averagePurchasePrice.value),
decimalFromString(position.quantity),
)),
}]
: [],
),
);
const partial = new Set(
investments.flatMap((position) => {
const money = position.absoluteReturn
? null
: position.averagePurchasePrice ?? position.currentValue;
return money ? [money.currency] : [];
}),
);
// A short position has negative cost basis, so a percent would flip sign or net out.
const withShorts = new Set(
investments.flatMap((position) => {
const money = position.absoluteReturn ?? position.averagePurchasePrice ?? position.currentValue;
return money && decimalFromString(position.quantity).value < ZERO_QUANTITY ? [money.currency] : [];
}),
);
const currencies = new Set([...absolute, ...costs].map((money) => money.currency));
return [...new Set([...currencies, ...partial])]
.sort((left, right) => left.localeCompare(right))
.map((currency) => {
const absoluteReturn = absolute.find((money) => money.currency === currency)?.value ?? '0';
const costBasis = costs.find((money) => money.currency === currency)?.value ?? '0';
const cost = decimalFromString(costBasis);
return {
currency,
absolute: absoluteReturn,
costBasis,
percent: isZero(cost) || withShorts.has(currency)
? null
: formatDecimal(divide(
multiply(decimalFromString(absoluteReturn), decimalFromString('100')),
cost,
PERCENT_DECIMAL_PLACES,
)),
partial: partial.has(currency),
};
});
}
@Injectable() @Injectable()
export class BrokerageAccountsService { export class BrokerageAccountsService {
@@ -26,12 +98,20 @@ export class BrokerageAccountsService {
portfolioSummary: account.snapshot portfolioSummary: account.snapshot
? { ? {
totalsByCurrency: account.snapshot.totalsByCurrency, totalsByCurrency: account.snapshot.totalsByCurrency,
cashBalances: account.snapshot.cashBalances,
structure: account.snapshot.structure,
unrealizedReturnByCurrency: unrealizedReturns(account.snapshot.positions),
stockPositionCount: account.snapshot.positions.filter( stockPositionCount: account.snapshot.positions.filter(
(position) => position.type === 'STOCK', (position) => position.type === 'STOCK',
).length, ).length,
bondPositionCount: account.snapshot.positions.filter( bondPositionCount: account.snapshot.positions.filter(
(position) => position.type === 'BOND', (position) => position.type === 'BOND',
).length, ).length,
fundPositionCount: account.snapshot.positions.filter(
(position) => position.type === 'FUND',
).length,
// The snapshot mapper already drops zero-quantity positions.
totalPositionCount: account.snapshot.positions.length,
} }
: null, : null,
})); }));
@@ -8,7 +8,7 @@ import {
utcDate, utcDate,
} from '../investment-calendar'; } from '../investment-calendar';
enum IncomeErrorCode { InvalidPeriod = 'INVALID_INCOME_PERIOD' } export enum IncomeErrorCode { InvalidPeriod = 'INVALID_INCOME_PERIOD' }
const MONDAY_WEEKDAY_INDEX = 1; const MONDAY_WEEKDAY_INDEX = 1;
const INCLUSIVE_DAY_OFFSET = 1; const INCLUSIVE_DAY_OFFSET = 1;
@@ -0,0 +1,10 @@
export const operationCategories = [
'trade',
'income',
'tax',
'fee',
'transfer',
'other',
] as const;
export type OperationCategory = (typeof operationCategories)[number];
@@ -3,10 +3,8 @@ import { MILLISECONDS_PER_SECOND } from '../../../../common/time';
import { decimal } from '../../../../integrations/tbank/decimal'; import { decimal } from '../../../../integrations/tbank/decimal';
import { TbankOperationType } from '../../../../integrations/tbank/tbank-protocol'; import { TbankOperationType } from '../../../../integrations/tbank/tbank-protocol';
import { TbankMoney, TbankOperationItem } from '../../../../integrations/tbank/tbank.api'; import { TbankMoney, TbankOperationItem } from '../../../../integrations/tbank/tbank.api';
import { import { type OperationCategory } from '../../operation-category';
BrokerageOperationDto, import { BrokerageOperationDto } from '../presentation/brokerage-operation.dto';
OperationCategory,
} from '../presentation/brokerage-operation.dto';
const MISSING_TIMESTAMP_COMPONENT = 0; const MISSING_TIMESTAMP_COMPONENT = 0;
@@ -5,4 +5,3 @@ export type { OperationInterval } from './domain/operations-sync-plan';
// Public cross-module surface. Nest providers are exported by the matching module. // Public cross-module surface. Nest providers are exported by the matching module.
export { BrokerageOperationDto } from './presentation/brokerage-operation.dto'; export { BrokerageOperationDto } from './presentation/brokerage-operation.dto';
export { operationCategories } from './presentation/brokerage-operation.dto';
@@ -16,6 +16,7 @@ import {
import { MoneyDto } from '../../../../common/money.dto'; import { MoneyDto } from '../../../../common/money.dto';
import { AccountReferenceDto } from '../../account-reference.dto'; import { AccountReferenceDto } from '../../account-reference.dto';
import { InvestmentResourceMetaDto } from '../../investment-resource.dto'; import { InvestmentResourceMetaDto } from '../../investment-resource.dto';
import { operationCategories, type OperationCategory } from '../../operation-category';
const MIN_OPERATIONS_PAGE_SIZE = 1; const MIN_OPERATIONS_PAGE_SIZE = 1;
@@ -23,16 +24,6 @@ const MAX_CURSOR_LENGTH = 4096;
const MAX_OPERATIONS_PAGE_SIZE = 1000; const MAX_OPERATIONS_PAGE_SIZE = 1000;
export const DEFAULT_OPERATIONS_PAGE_SIZE = 100; export const DEFAULT_OPERATIONS_PAGE_SIZE = 100;
export const operationCategories = [
'trade',
'income',
'tax',
'fee',
'transfer',
'other',
] as const;
export type OperationCategory = (typeof operationCategories)[number];
export class BrokerageOperationsQueryDto { export class BrokerageOperationsQueryDto {
@ApiPropertyOptional({ @ApiPropertyOptional({
format: 'uuid', format: 'uuid',
@@ -159,6 +159,31 @@ describe('persistent portfolio projection', () => {
expect(snapshot.positions[1].averagePurchasePrice).toEqual({ currency: 'RUB', value: '2' }); expect(snapshot.positions[1].averagePurchasePrice).toEqual({ currency: 'RUB', value: '2' });
}); });
it('counts cash once when T-Bank also returns it as a CURRENCY position', async () => {
repository.reserve.mockResolvedValueOnce({
launch: true,
work: { id: 'work', attemptId: 'attempt' },
});
tbank.getPortfolio.mockResolvedValue({ positions: [
{ figi: 'FUND', instrumentType: 'etf', quantity: { units: '1' }, currentPrice: { currency: 'RUB', units: '120', nano: 240000000 } },
{ figi: 'RUB000UTSTOM', instrumentType: 'currency', quantity: { units: '1', nano: 250000000 }, currentPrice: { currency: 'RUB', units: '1' } },
] });
tbank.getPositions.mockResolvedValue({ money: [{ currency: 'RUB', units: '1', nano: 250000000 }] });
repository.read.mockResolvedValue({
membershipAt,
membershipRevision: 1,
accounts: [{ accountId: 'a', name: 'A', type: 'BROKERAGE', openedOn: null, portfolio: null }],
work: [],
});
const handle = await service.request('user', 'private', 'a');
assert(handle);
await handle.done;
const snapshot = (repository.publish.mock.calls as [unknown, string, PortfolioDto][])[0][2];
expect(snapshot.totalsByCurrency).toEqual([{ currency: 'RUB', value: '121.49' }]);
expect(snapshot.positions.map((position) => position.type)).toEqual(['FUND', 'CURRENCY']);
expect(snapshot.structure.currencies[0].totalValue).toBe('121.49');
});
it('does not turn a missing account snapshot into aggregate zero; summaries stay independent', async () => { it('does not turn a missing account snapshot into aggregate zero; summaries stay independent', async () => {
const snapshot: PortfolioDto = { const snapshot: PortfolioDto = {
lastSuccessfulAt: membershipAt.toISOString(), lastSuccessfulAt: membershipAt.toISOString(),
@@ -19,7 +19,7 @@ const position = (
}); });
describe('portfolio structure', () => { describe('portfolio structure', () => {
it('includes cash once and keeps currency instruments among other assets', () => { it('counts cash once and skips CURRENCY positions that mirror it', () => {
const result = portfolioStructure( const result = portfolioStructure(
[ [
position('STOCK', '60'), position('STOCK', '60'),
@@ -30,13 +30,13 @@ describe('portfolio structure', () => {
); );
expect(result.currencies[0]).toEqual({ expect(result.currencies[0]).toEqual({
currency: 'RUB', currency: 'RUB',
totalValue: '100', totalValue: '90',
hasNegativeValues: false, hasNegativeValues: false,
categories: [ categories: [
{ type: 'STOCK', value: '60', sharePercent: '60' }, { type: 'STOCK', value: '60', sharePercent: '66.666667' },
{ type: 'BOND', value: '20', sharePercent: '20' }, { type: 'BOND', value: '20', sharePercent: '22.222222' },
{ type: 'OTHER', value: '10', sharePercent: '10' }, { type: 'OTHER', value: '0', sharePercent: '0' },
{ type: 'CASH', value: '10', sharePercent: '10' }, { type: 'CASH', value: '10', sharePercent: '11.111111' },
], ],
}); });
}); });
@@ -43,6 +43,8 @@ export function portfolioStructure(
currencies.set(money.currency, group); currencies.set(money.currency, group);
}; };
for (const position of positions) { for (const position of positions) {
// CURRENCY positions mirror cash, which is counted once as CASH below.
if (position.type === 'CURRENCY') continue;
const type = ['BOND', 'STOCK'].includes(position.type) const type = ['BOND', 'STOCK'].includes(position.type)
? position.type ? position.type
: 'OTHER'; : 'OTHER';
@@ -126,7 +126,8 @@ function totalsByCurrency(
for (const value of money) addTotal(value.currency, decimal(value)); for (const value of money) addTotal(value.currency, decimal(value));
for (const position of positions) { for (const position of positions) {
const price = position.currentPrice; const price = position.currentPrice;
if (!price) continue; // CURRENCY positions mirror the cash balances already added above.
if (!price || types[position.instrumentType?.toLowerCase() ?? ''] === 'CURRENCY') continue;
addTotal( addTotal(
price.currency, price.currency,
multiply(decimal(position.quantity ?? {}), decimal(price)), multiply(decimal(position.quantity ?? {}), decimal(price)),
@@ -5,4 +5,5 @@ export { PortfolioService } from './application/portfolio.service';
export { export {
PortfolioDto, PortfolioDto,
PortfolioPositionDto, PortfolioPositionDto,
PortfolioStructureDto,
} from './presentation/portfolio.dto'; } from './presentation/portfolio.dto';
@@ -23,7 +23,7 @@ import {
import { MAX_INSTRUMENT_QUERY_LENGTH, MIN_INSTRUMENT_QUERY_LENGTH } from '../instrument-query'; import { MAX_INSTRUMENT_QUERY_LENGTH, MIN_INSTRUMENT_QUERY_LENGTH } from '../instrument-query';
import { InvestmentAttemptProblemDto } from '../investment-resource.dto'; import { InvestmentAttemptProblemDto } from '../investment-resource.dto';
import { operationCategories } from '../operations/operations.api'; import { operationCategories } from '../operation-category';
const MIN_ACCOUNT_ID_LENGTH = 1; const MIN_ACCOUNT_ID_LENGTH = 1;
const MIN_SYNC_PAGE_SIZE = 1; const MIN_SYNC_PAGE_SIZE = 1;
@@ -32,7 +32,7 @@ import {
UpcomingEventsQueryDto, UpcomingEventsQueryDto,
} from './upcoming-events.dto'; } from './upcoming-events.dto';
enum EventsErrorCode { InvalidPeriod = 'INVALID_EVENTS_PERIOD' } export enum EventsErrorCode { InvalidPeriod = 'INVALID_EVENTS_PERIOD' }
const FIRST_BATCH_OFFSET = 0; const FIRST_BATCH_OFFSET = 0;
+29
View File
@@ -1,12 +1,38 @@
import { INestApplication } from '@nestjs/common'; import { INestApplication } from '@nestjs/common';
import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger'; import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
import { HttpErrorCode } from './common/error-code';
import { MoexErrorCode } from './integrations/moex/moex.client';
import { NcrErrorCode } from './integrations/ncr/ncr-ratings.client';
import { TbankErrorCode } from './integrations/tbank/tbank-error-code';
import { AuthErrorCode } from './modules/auth/application/auth-error-code';
import { BankErrorCode } from './modules/banking/bank-cards/application/bank-card-input';
import { IncomeErrorCode } from './modules/investments/income/income-period';
import { InstrumentErrorCode } from './modules/investments/instruments/domain/instrument-error-code';
import { OperationErrorCode } from './modules/investments/operations/domain/operation-error-code';
import { EventsErrorCode } from './modules/investments/upcoming-events/upcoming-events.service';
export const API_PREFIX = 'api/v1'; export const API_PREFIX = 'api/v1';
// Nest Swagger cannot express additionalProperties on a class, so closed request // Nest Swagger cannot express additionalProperties on a class, so closed request
// bodies are restored here after generation; the runtime allowlist stays in the controller. // bodies are restored here after generation; the runtime allowlist stays in the controller.
const CLOSED_SCHEMAS = ['StockScreenerCriteriaDto']; const CLOSED_SCHEMAS = ['StockScreenerCriteriaDto'];
// Every code HttpExceptionFilter can emit. Assembled at the composition root so
// common/ProblemDetailsDto does not depend on modules.
export const PROBLEM_CODES = [
...Object.values(HttpErrorCode),
...Object.values(AuthErrorCode),
...Object.values(OperationErrorCode),
...Object.values(InstrumentErrorCode),
...Object.values(TbankErrorCode),
...Object.values(BankErrorCode),
...Object.values(MoexErrorCode),
...Object.values(NcrErrorCode),
...Object.values(EventsErrorCode),
...Object.values(IncomeErrorCode),
];
export function createOpenApiDocument(app: INestApplication) { export function createOpenApiDocument(app: INestApplication) {
const document = SwaggerModule.createDocument( const document = SwaggerModule.createDocument(
app, app,
@@ -18,5 +44,8 @@ export function createOpenApiDocument(app: INestApplication) {
schema.additionalProperties = false; schema.additionalProperties = false;
} }
} }
const problem = schemas.ProblemDetailsDto;
const problemCode = problem && 'properties' in problem ? problem.properties?.code : undefined;
if (problemCode && !('$ref' in problemCode)) problemCode.enum = PROBLEM_CODES;
return document; return document;
} }
+40 -12
View File
@@ -32,6 +32,7 @@ describe('Authentication (e2e)', () => {
pinoHttp: { pinoHttp: {
...loggingOptions(config), ...loggingOptions(config),
level: 'info', level: 'info',
transport: undefined,
stream: { write: (line: string) => logs.push(JSON.parse(line) as Record<string, unknown>) }, stream: { write: (line: string) => logs.push(JSON.parse(line) as Record<string, unknown>) },
}, },
assignResponse: true, assignResponse: true,
@@ -131,6 +132,9 @@ describe('Authentication (e2e)', () => {
.filter((attribute) => !attribute.startsWith('Expires=')) .filter((attribute) => !attribute.startsWith('Expires='))
.sort((a, b) => a.localeCompare(b)); .sort((a, b) => a.localeCompare(b));
const host = ['HttpOnly', 'Path=/api/v1/auth', 'SameSite=Lax']; const host = ['HttpOnly', 'Path=/api/v1/auth', 'SameSite=Lax'];
// Persistent for the Session lifetime (7 days), otherwise the browser drops it on restart.
const persistent = [...host, 'Max-Age=604800'];
const sorted = (items: string[]) => [...items].sort((a, b) => a.localeCompare(b));
const login = async () => { const login = async () => {
const registration = await request(app.getHttpServer()) const registration = await request(app.getHttpServer())
.post('/api/v1/auth/register') .post('/api/v1/auth/register')
@@ -150,7 +154,7 @@ describe('Authentication (e2e)', () => {
} }
}; };
it('issues, rotates and clears it HttpOnly, Lax, path-scoped, host-only and Secure in production', async () => { it('issues and rotates it persistent (Max-Age) HttpOnly, Lax, path-scoped, host-only and Secure in production, and clears it', async () => {
await inEnvironment('production', async () => { await inEnvironment('production', async () => {
const issued = await login(); const issued = await login();
const rotated = await request(app.getHttpServer()) const rotated = await request(app.getHttpServer())
@@ -162,16 +166,20 @@ describe('Authentication (e2e)', () => {
.set('Cookie', rotated.headers['set-cookie'][0]) .set('Cookie', rotated.headers['set-cookie'][0])
.expect(204); .expect(204);
// Exact set: any added Domain/Max-Age or a dropped flag fails. // Exact set: any added Domain, changed Max-Age or dropped flag fails.
for (const cookie of [issued, rotated.headers['set-cookie'][0], cleared.headers['set-cookie'][0]]) { for (const cookie of [issued, rotated.headers['set-cookie'][0]]) {
expect(attributes(cookie)).toEqual([...host, 'Secure'].sort((a, b) => a.localeCompare(b))); expect(attributes(cookie)).toEqual(sorted([...persistent, 'Secure']));
} }
// Clearing must not carry Max-Age; Express expires it with a past Expires.
const clearedCookie = cleared.headers['set-cookie'][0];
expect(attributes(clearedCookie)).toEqual(sorted([...host, 'Secure']));
expect(clearedCookie).toContain('Expires=Thu, 01 Jan 1970');
}); });
}); });
it('drops only Secure in development and keeps every other attribute', async () => { it('drops only Secure in development and keeps every other attribute', async () => {
await inEnvironment('development', async () => { await inEnvironment('development', async () => {
expect(attributes(await login())).toEqual(host); expect(attributes(await login())).toEqual(sorted(persistent));
}); });
}); });
}); });
@@ -532,7 +540,14 @@ describe('Authentication (e2e)', () => {
'X-Request-ID', 'X-Request-ID',
); );
expect(logs.filter((entry) => entry.requestId === response.headers['x-request-id'])).toEqual([ expect(logs.filter((entry) => entry.requestId === response.headers['x-request-id'])).toEqual([
expect.objectContaining({ level: 40, message: 'http.request.completed', status: 401, code: 'UNAUTHORIZED' }), expect.objectContaining({
level: 40,
message: 'http.request.completed',
method: 'GET',
route: '/api/v1/auth/me',
status: 401,
code: 'UNAUTHORIZED',
}),
]); ]);
}); });
@@ -544,7 +559,7 @@ describe('Authentication (e2e)', () => {
new Error('operation failed\npassword: SYNTHETIC_AUDIT_SECRET'), new Error('operation failed\npassword: SYNTHETIC_AUDIT_SECRET'),
); );
const response = await request(app.getHttpServer()) await request(app.getHttpServer())
.post('/api/v1/auth/login') .post('/api/v1/auth/login')
.set('X-Request-ID', clientRequestId) .set('X-Request-ID', clientRequestId)
.send({ email: 'user@example.com', password: 'a secure password' }) .send({ email: 'user@example.com', password: 'a secure password' })
@@ -554,17 +569,30 @@ describe('Authentication (e2e)', () => {
expect(body).toEqual({ status: 500, code: 'INTERNAL_SERVER_ERROR' }), expect(body).toEqual({ status: 500, code: 'INTERNAL_SERVER_ERROR' }),
); );
const completed = logs.filter((entry) => entry.requestId === response.headers['x-request-id']); expect(logs).toEqual(
expect(completed).toEqual([ expect.arrayContaining([
expect.objectContaining({ expect.objectContaining({
requestId: response.headers['x-request-id'], method: 'POST',
clientRequestId, route: '/api/v1/auth/login',
status: 500, status: 500,
code: 'INTERNAL_SERVER_ERROR', code: 'INTERNAL_SERVER_ERROR',
level: 50, level: 50,
message: 'http.request.completed', message: 'http.request.completed',
}), }),
]); ]),
);
expect(logs).toEqual(
expect.arrayContaining([
expect.objectContaining({
clientRequestId,
code: 'INTERNAL_SERVER_ERROR',
level: 50,
message: 'http.request.unhandled',
errorName: 'Error',
errorStack: expect.stringContaining(' at ') as unknown,
}),
]),
);
expect(JSON.stringify(logs)).not.toContain( expect(JSON.stringify(logs)).not.toContain(
'SYNTHETIC_AUDIT_SECRET', 'SYNTHETIC_AUDIT_SECRET',
); );
+49
View File
@@ -121,6 +121,55 @@ describe('OpenAPI contract (integration)', () => {
expect(analytics.properties).not.toHaveProperty('yearComparison'); expect(analytics.properties).not.toHaveProperty('yearComparison');
}); });
it('publishes every emitted problem detail code as a named enum', () => {
const schemas = createOpenApiDocument(app).components?.schemas;
const expectedCodes = [
'BAD_REQUEST',
'INTERNAL_SERVER_ERROR',
'NOT_FOUND',
'UNAUTHORIZED',
'UNSUPPORTED_MEDIA_TYPE',
'VALIDATION_ERROR',
'EMAIL_ALREADY_REGISTERED',
'INVALID_CREDENTIALS',
'INVALID_OPERATIONS_CURSOR',
'BOND_HISTORY_START_UNAVAILABLE',
'BOND_TICKER_AMBIGUOUS',
'STOCK_HISTORY_START_UNAVAILABLE',
'STOCK_TICKER_AMBIGUOUS',
'INVALID_TBANK_TOKEN',
'TBANK_NOT_CONNECTED',
'TBANK_UNAVAILABLE',
'BANK_CARD_ARCHIVED',
'BANK_DEPENDENT_REFUNDS',
'BANK_DUPLICATE_CATEGORY',
'BANK_IMMUTABLE_OPERATION',
'BANK_INTENT_CONFLICT',
'BANK_INVALID_DATE',
'BANK_INVALID_INPUT',
'BANK_INVALID_MONEY',
'BANK_INVALID_REFUND',
'BANK_NOT_FOUND',
'BANK_OPENING_DATE_CONFLICT',
'BANK_OPERATION_DELETED',
'BANK_REFUND_LIMIT',
'BANK_VERSION_CONFLICT',
'BANK_WRITE_CONFLICT',
'MOEX_UNAVAILABLE',
'NCR_UNAVAILABLE',
'INVALID_EVENTS_PERIOD',
'INVALID_INCOME_PERIOD',
];
const problem = schemas?.ProblemDetailsDto;
assert(problem && !('$ref' in problem));
const codeSchema = problem.properties?.code;
assert(codeSchema && !('$ref' in codeSchema));
expect(codeSchema.type).toBe('string');
expect(codeSchema.enum).toEqual(expect.arrayContaining(expectedCodes));
expect(codeSchema.enum).toHaveLength(expectedCodes.length);
});
it('generates the runtime contract without server startup or deployment configuration', async () => { it('generates the runtime contract without server startup or deployment configuration', async () => {
const schemas = createOpenApiDocument(app).components?.schemas; const schemas = createOpenApiDocument(app).components?.schemas;
expect(schemas?.StockScreenerCriteriaDto).toMatchObject({ expect(schemas?.StockScreenerCriteriaDto).toMatchObject({
+32 -3
View File
@@ -216,7 +216,27 @@ describe('local accounts and portfolio HTTP (SQLite)', () => {
).toEqual({ ).toEqual({
stockPositionCount: 1, stockPositionCount: 1,
bondPositionCount: 0, bondPositionCount: 0,
fundPositionCount: 0,
totalPositionCount: 1,
totalsByCurrency: [{ currency: 'RUB', value: '21.100000002' }], totalsByCurrency: [{ currency: 'RUB', value: '21.100000002' }],
cashBalances: [{ currency: 'RUB', value: '1.1' }],
structure: {
currencies: [{
currency: 'RUB',
totalValue: '21.100000002',
hasNegativeValues: false,
categories: [
{ type: 'STOCK', value: '20.000000002', sharePercent: '94.78673' },
{ type: 'BOND', value: '0', sharePercent: '0' },
{ type: 'OTHER', value: '0', sharePercent: '0' },
{ type: 'CASH', value: '1.1', sharePercent: '5.21327' },
],
}],
unvaluedCategories: [],
},
unrealizedReturnByCurrency: [
{ currency: 'RUB', absolute: '0', costBasis: '0', percent: null, partial: true },
],
}); });
const portfolio = await get('brokerage-accounts/account/portfolio').expect( const portfolio = await get('brokerage-accounts/account/portfolio').expect(
200, 200,
@@ -492,9 +512,18 @@ describe('local accounts and portfolio HTTP (SQLite)', () => {
} }
const summaries = (await get('brokerage-accounts?sync=observe').expect(200)) const summaries = (await get('brokerage-accounts?sync=observe').expect(200))
.body as BrokerageAccountsResourceDto; .body as BrokerageAccountsResourceDto;
expect(summaries.data?.[0].portfolioSummary?.totalsByCurrency).toEqual([ expect(summaries.data?.[0].portfolioSummary).toMatchObject({
{ currency: 'RUB', value: '21.1' }, totalsByCurrency: [{ currency: 'RUB', value: '21.1' }],
]); cashBalances: [{ currency: 'RUB', value: '1.1' }],
structure: { currencies: [{ currency: 'RUB' }] },
unrealizedReturnByCurrency: [
{ currency: 'RUB', absolute: '0', costBasis: '0', percent: null, partial: true },
],
stockPositionCount: 1,
bondPositionCount: 0,
fundPositionCount: 0,
totalPositionCount: 1,
});
expect(summaries.data?.[1].portfolioSummary).toBeNull(); expect(summaries.data?.[1].portfolioSummary).toBeNull();
expect(summaries.meta.availability).toBe('available'); expect(summaries.meta.availability).toBe('available');
expect(summaries.meta.completeness).toBe('complete'); expect(summaries.meta.completeness).toBe('complete');