WealthLedger/backend
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: WealthLedger/backend:main
Branches Tags
WealthLedger/backend:develop WealthLedger/backend:refactor/55-rub-only WealthLedger/backend:main WealthLedger/backend:release/2.4.1
WealthLedger/backend:v2.4.1 WealthLedger/backend:v2.4.0 WealthLedger/backend:v2.3.1 WealthLedger/backend:v2.3.0 WealthLedger/backend:v2.2.0 WealthLedger/backend:v2.1.0 WealthLedger/backend:v2.0.0 WealthLedger/backend:v1.0.0 WealthLedger/backend:v0.2.3 WealthLedger/backend:v0.2.2 WealthLedger/backend:v0.2.1 WealthLedger/backend:v0.2.0 WealthLedger/backend:v0.1.0
..
compare: WealthLedger/backend:e7827dcac6efe81b9cc53df8e41a1feb5414fdbe
Branches Tags
WealthLedger/backend:develop WealthLedger/backend:refactor/55-rub-only WealthLedger/backend:main WealthLedger/backend:release/2.4.1
WealthLedger/backend:v2.4.1 WealthLedger/backend:v2.4.0 WealthLedger/backend:v2.3.1 WealthLedger/backend:v2.3.0 WealthLedger/backend:v2.2.0 WealthLedger/backend:v2.1.0 WealthLedger/backend:v2.0.0 WealthLedger/backend:v1.0.0 WealthLedger/backend:v0.2.3 WealthLedger/backend:v0.2.2 WealthLedger/backend:v0.2.1 WealthLedger/backend:v0.2.0 WealthLedger/backend:v0.1.0
2 Commits
main .. e7827dcac6
Author SHA1 Message Date
codex-bot e7827dcac6 Merge branch 'develop' into test/105-portfolio-publish-rollback
Backend verify / commits (pull_request) Failing after 27s
Details
Backend verify / security (pull_request) Skipped
Details
Backend verify / verify (pull_request) Skipped
Details
2026-10-28 20:45:48 +03:00
ksv741 5cf914752d test: cover portfolio publish rollback and claim fence (WealthLedger/backend#105)
Backend verify / commits (pull_request) Successful in 31s
Details
Backend verify / security (pull_request) Successful in 9s
Details
Backend verify / verify (pull_request) Successful in 5m13s
Details
2026-10-28 20:28:58 +03:00
149 changed files with 2866 additions and 3530 deletions
Expand all files Collapse all files
.ai/architecture.md
+6 -6
View File
@@ -29,9 +29,9 @@ market — котировками, income — выплатами/личными
domain из-за extraction в функцию. Boundary mappers преобразуют внешние records;
чистые расчёты portfolio/banking остаются у domain owner.
PrismaService владеет DB lifecycle. Application services/use cases получают
данные через concrete repositories; запросы и CAS живут в infrastructure
по [data convention](conventions/data.md).
PrismaService владеет DB lifecycle. Самостоятельные use cases получают данные
через concrete repositories; существующие связные CRUD/transaction services
сохраняют прямые queries по [data convention](conventions/data.md).
Money — currency + decimal string; расчёты используют точные общие helpers.
Auth управляет identity/session; TbankAccessService проверяет доступ к счёту и
@@ -201,9 +201,9 @@ Circular dependencies устраняй изменением ownership/compositio
конкретные infrastructure providers, зарегистрированные module. Infrastructure
может использовать application types/input и domain rules; новые interfaces
ради инверсии зависимостей не обязательны. Domain не импортирует presentation или
infrastructure. Application не строит Prisma queries: use case и связный CRUD
service обращаются к репозиторию по [Data](conventions/data.md). Entity/interface
на каждую таблицу не требуется.
infrastructure. Существующие связные CRUD/transaction services могут сохранять прямые queries
по [Data](conventions/data.md); use case получает данные через repository и сам
Prisma queries не выполняет. Entity/interface на каждую таблицу не требуется.
DTO остаются транспортными runtime classes; существующее использование DTO
на application boundary допустимо по [HTTP API](conventions/http-api.md).
.ai/conventions/data.md
+10 -10
View File
@@ -34,19 +34,19 @@ candidate, не повод дублировать их при новом use cas
вызывает repository, затем чистый `bankSummary` и формирует ответ. Prisma records
не становятся domain entities: расчёт получает только нужные ему значения.
Application-код не импортирует PrismaService и не строит Prisma queries.
Репозиторий владеет запросом и CAS-проверкой результата, а application —
правилами и формированием ответа. Типы Prisma допустимы только в type-only
импортах для существующей транзакционной границы. Не создавай обёртку
на каждый вызов Prisma без текущего потребителя. `BankCardsRepository.write`
сохраняет retry/transaction boundary для банковских записей; callback с
transaction client — локальная техническая граница, не API для domain.
Не создавай обёртку на каждый вызов Prisma. Существующие связные CRUD/transaction
services (auth, lifecycle подключения, изменения карт/операций/категорий)
сохраняют queries рядом с CAS и проверками инварианта, если их перенос требует
лишь набора pass-through методов. Новая самостоятельная read/write capability
получает repository method; самостоятельный use case не выполняет Prisma queries.
`BankCardsRepository.write` сохраняет общую retry/transaction boundary для
существующих banking services. Такой callback с Prisma transaction client —
локальная техническая граница этих services, не API для domain или use cases.
Выбирай только нужные данные, сохраняй user/account ownership в запросах и
application checks. Предварительный lookup не заменяет unique constraint при race.
Пример: AuthRepository преобразует P2002 в результат регистрации и выполняет
conditional `updateMany` для refresh rotation; AuthService сохраняет HTTP
error contract. Сначала пойми invariant; не копируй его flow в другой use case.
Пример: AuthService обрабатывает P2002 и использует conditional `updateMany`
для refresh rotation. Сначала пойми invariant; не копируй его flow в другой use case.
Transaction не охватывает сетевой T-Bank вызов как будто это одна atomic DB
операция. Планируй порядок и compensation по текущей задаче; не удерживай DB
.gitea/workflows/verify.yml
+1 -1
View File
@@ -67,7 +67,7 @@ jobs:
- name: Audit runtime and development dependencies
run: |
npm audit --omit=dev --audit-level=low
npm audit --include=dev --audit-level=high
npm audit --include=dev --audit-level=high --ignore-advisory=GHSA-hp3w-g68c-fv3c
verify:
needs: [commits, security]
CHANGELOG.md
-61
View File
@@ -1,66 +1,5 @@
# Changelog
## [2.4.1](https://git.personal.ksv741.ru/WealthLedger/backend/compare/v2.4.0...v2.4.1) (2026-11-06)
### Bug Fixes
* **events:** refresh saved payout calendars once per hourly pass (WealthLedger/backend[#53](https://git.personal.ksv741.ru/WealthLedger/backend/issues/53)) ([#157](https://git.personal.ksv741.ru/WealthLedger/backend/issues/157)) ([aeb4647](https://git.personal.ksv741.ru/WealthLedger/backend/commit/aeb4647fda3806a419ff3578834c34fff97ae3e8))
* **portfolio:** publish new complete forecast regardless of request window (WealthLedger/backend[#55](https://git.personal.ksv741.ru/WealthLedger/backend/issues/55)) ([#156](https://git.personal.ksv741.ru/WealthLedger/backend/issues/156)) ([169bee1](https://git.personal.ksv741.ru/WealthLedger/backend/commit/169bee1da5731a1330e995a4a508da544f791387))
### Refactoring
* **api:** describe bank operation create body as oneOf by kind (WealthLedger/backend[#172](https://git.personal.ksv741.ru/WealthLedger/backend/issues/172)) ([#173](https://git.personal.ksv741.ru/WealthLedger/backend/issues/173)) ([02e0d56](https://git.personal.ksv741.ru/WealthLedger/backend/commit/02e0d560c84606d6372cbac001dc94edc348995e))
* check persisted json payload shape instead of double casts ([#152](https://git.personal.ksv741.ru/WealthLedger/backend/issues/152)) ([#154](https://git.personal.ksv741.ru/WealthLedger/backend/issues/154)) ([a80bbbf](https://git.personal.ksv741.ru/WealthLedger/backend/commit/a80bbbf1e28954812d2d32c6e8f9f67f5a5d42a4))
* enforce repository boundary in application (WealthLedger/backend[#171](https://git.personal.ksv741.ru/WealthLedger/backend/issues/171)) ([e3ecb8c](https://git.personal.ksv741.ru/WealthLedger/backend/commit/e3ecb8c15e61ccd8de9acb4954a38932099eefc3))
* expose upcoming-events public api and guard its boundary (WealthLedger/backend[#163](https://git.personal.ksv741.ru/WealthLedger/backend/issues/163)) ([#195](https://git.personal.ksv741.ru/WealthLedger/backend/issues/195)) ([83b515a](https://git.personal.ksv741.ru/WealthLedger/backend/commit/83b515a4536a6c534bcdec82f9f43f9005a44c35))
* extract catalog enrichment source loader (WealthLedger/backend[#169](https://git.personal.ksv741.ru/WealthLedger/backend/issues/169)) ([#186](https://git.personal.ksv741.ru/WealthLedger/backend/issues/186)) ([c5ccfea](https://git.personal.ksv741.ru/WealthLedger/backend/commit/c5ccfeadea7a9235ebdd6171d9b6f7b89ed2e1e7))
* inject TbankAccessService directly into stock screener ([#151](https://git.personal.ksv741.ru/WealthLedger/backend/issues/151)) ([#155](https://git.personal.ksv741.ru/WealthLedger/backend/issues/155)) ([554410a](https://git.personal.ksv741.ru/WealthLedger/backend/commit/554410a2716ce13d7202fd27a621c72734b5e6c8))
* move auth persistence into repository (WealthLedger/backend[#171](https://git.personal.ksv741.ru/WealthLedger/backend/issues/171)) ([61c5525](https://git.personal.ksv741.ru/WealthLedger/backend/commit/61c55256e756b9187e1087215d35db3fd30ac148))
* move bank card queries into repository (WealthLedger/backend[#171](https://git.personal.ksv741.ru/WealthLedger/backend/issues/171)) ([b3d4801](https://git.personal.ksv741.ru/WealthLedger/backend/commit/b3d4801cfe67ecf301c58c894676b13b8833c4a6))
* move category persistence into bank repository (WealthLedger/backend[#171](https://git.personal.ksv741.ru/WealthLedger/backend/issues/171)) ([efac720](https://git.personal.ksv741.ru/WealthLedger/backend/commit/efac7201e06f49b264854566b2e3f73931f3f6cc))
* replace deep imports with native node aliases (WealthLedger/backend[#165](https://git.personal.ksv741.ru/WealthLedger/backend/issues/165)) ([#193](https://git.personal.ksv741.ru/WealthLedger/backend/issues/193)) ([07cfd08](https://git.personal.ksv741.ru/WealthLedger/backend/commit/07cfd08df9b13ac3fd13da153b12acf159329cea))
* retire legacy tbank-sync status and sync=observe (WealthLedger/backend[#196](https://git.personal.ksv741.ru/WealthLedger/backend/issues/196)) ([d792baa](https://git.personal.ksv741.ru/WealthLedger/backend/commit/d792baaf59a1c204458ec249ee3ce907f3564455))
* route bank card reads through repository (WealthLedger/backend[#171](https://git.personal.ksv741.ru/WealthLedger/backend/issues/171)) ([b3ca11d](https://git.personal.ksv741.ru/WealthLedger/backend/commit/b3ca11d1410899bb9c6707113ba9fd1f3b30e4bf))
* route bank operation queries through repository (WealthLedger/backend[#171](https://git.personal.ksv741.ru/WealthLedger/backend/issues/171)) ([cea77f6](https://git.personal.ksv741.ru/WealthLedger/backend/commit/cea77f6d568809d989462c121f50b4e07e7efca5))
* share prisma json codec and check progress shape (WealthLedger/backend[#170](https://git.personal.ksv741.ru/WealthLedger/backend/issues/170)) ([#191](https://git.personal.ksv741.ru/WealthLedger/backend/issues/191)) ([85a7196](https://git.personal.ksv741.ru/WealthLedger/backend/commit/85a71967fa4e85427a991c973c6528206332cf5e))
* share sync reservation join rule (WealthLedger/backend[#119](https://git.personal.ksv741.ru/WealthLedger/backend/issues/119)) ([#162](https://git.personal.ksv741.ru/WealthLedger/backend/issues/162)) ([fa0a6e5](https://git.personal.ksv741.ru/WealthLedger/backend/commit/fa0a6e56030bb1c0302cd7588d30e7fa91e19c11))
* share tbank-sync claim and generation lock (WealthLedger/backend[#166](https://git.personal.ksv741.ru/WealthLedger/backend/issues/166)) ([#188](https://git.personal.ksv741.ru/WealthLedger/backend/issues/188)) ([5d31b3e](https://git.personal.ksv741.ru/WealthLedger/backend/commit/5d31b3e6dd37d1c79b61c43ed820947b5b38aaa1))
* single bank operation projection and domain rules (WealthLedger/backend[#168](https://git.personal.ksv741.ru/WealthLedger/backend/issues/168)) ([#189](https://git.personal.ksv741.ru/WealthLedger/backend/issues/189)) ([deda7ff](https://git.personal.ksv741.ru/WealthLedger/backend/commit/deda7ffc2cc8185eba48a18c37272c404a3e9983))
* split brokerage operations repository and cursor codec (WealthLedger/backend[#167](https://git.personal.ksv741.ru/WealthLedger/backend/issues/167)) ([#190](https://git.personal.ksv741.ru/WealthLedger/backend/issues/190)) ([cd78b43](https://git.personal.ksv741.ru/WealthLedger/backend/commit/cd78b43783cb7469e44b9531d165603df258b55e))
### CI
* drop stale npm audit advisory ignore (WealthLedger/backend[#158](https://git.personal.ksv741.ru/WealthLedger/backend/issues/158)) ([#159](https://git.personal.ksv741.ru/WealthLedger/backend/issues/159)) ([1a5de9b](https://git.personal.ksv741.ru/WealthLedger/backend/commit/1a5de9bebd060a5ff2ca188ad862c4ec5aa06ffd))
### Maintenance
* **deps:** set Renovate release age, PR limit and update groups (WealthLedger/main[#6](https://git.personal.ksv741.ru/WealthLedger/backend/issues/6)) ([#160](https://git.personal.ksv741.ru/WealthLedger/backend/issues/160)) ([bade5fa](https://git.personal.ksv741.ru/WealthLedger/backend/commit/bade5fae1c3170b38717b26eda56ca20183f4ec8))
## [2.4.0](https://git.personal.ksv741.ru/WealthLedger/backend/compare/v2.3.1...v2.4.0) (2026-11-01)
### Features
* extend account list portfolio summary ([#138](https://git.personal.ksv741.ru/WealthLedger/backend/issues/138)) ([97fc41f](https://git.personal.ksv741.ru/WealthLedger/backend/commit/97fc41fa295a7a943a27171fa41cdaf286632956))
* **portfolio:** store and publish instrument sector and issuer (WealthLedger/main[#48](https://git.personal.ksv741.ru/WealthLedger/backend/issues/48)) ([#148](https://git.personal.ksv741.ru/WealthLedger/backend/issues/148)) ([17432df](https://git.personal.ksv741.ru/WealthLedger/backend/commit/17432dfee3d7d06841caea4419a062e2a4bfc82c))
### Bug Fixes
* count brokerage cash once and skip short-position return percent (WealthLedger/backend[#140](https://git.personal.ksv741.ru/WealthLedger/backend/issues/140)) ([f2843e3](https://git.personal.ksv741.ru/WealthLedger/backend/commit/f2843e30bda5442158ec145cc63a5491506bb60f))
* reset portfolio value points inflated by double-counted cash (WealthLedger/backend[#140](https://git.personal.ksv741.ru/WealthLedger/backend/issues/140)) ([2325b63](https://git.personal.ksv741.ru/WealthLedger/backend/commit/2325b638839240bf5d6d4f7e6e1f8eaa82d4d7fd))
* scope income and ledger sync to requested intervals (WealthLedger/backend[#57](https://git.personal.ksv741.ru/WealthLedger/backend/issues/57)) ([#147](https://git.personal.ksv741.ru/WealthLedger/backend/issues/147)) ([5e84e1e](https://git.personal.ksv741.ru/WealthLedger/backend/commit/5e84e1e5f1943b5af1992a3a946194b27fc1a1d5))
* 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))
### Refactoring
* expose tbank-sync public api and guard its boundary (WealthLedger/backend[#118](https://git.personal.ksv741.ru/WealthLedger/backend/issues/118)) ([#143](https://git.personal.ksv741.ru/WealthLedger/backend/issues/143)) ([5295945](https://git.personal.ksv741.ru/WealthLedger/backend/commit/5295945ab237a6e94aa64d7bb54bfd04554ca9f9))
* publish typed problem detail codes (WealthLedger/backend[#117](https://git.personal.ksv741.ru/WealthLedger/backend/issues/117)) ([#144](https://git.personal.ksv741.ru/WealthLedger/backend/issues/144)) ([d37fa2c](https://git.personal.ksv741.ru/WealthLedger/backend/commit/d37fa2c9034e90e9d22d4022c45fc36c22dd2ab3))
* remove tbank-sync operations import cycle (WealthLedger/backend[#116](https://git.personal.ksv741.ru/WealthLedger/backend/issues/116)) ([#142](https://git.personal.ksv741.ru/WealthLedger/backend/issues/142)) ([22668da](https://git.personal.ksv741.ru/WealthLedger/backend/commit/22668da3fa0666bdd22737913379c99d4cf01993))
### Tests
* cover portfolio publish rollback and claim fence (WealthLedger/backend[#105](https://git.personal.ksv741.ru/WealthLedger/backend/issues/105)) ([#146](https://git.personal.ksv741.ru/WealthLedger/backend/issues/146)) ([e350146](https://git.personal.ksv741.ru/WealthLedger/backend/commit/e350146749293f2eaf8060f7626ff3c1cd8edf2c))
* replace operations sync delays with explicit barriers (WealthLedger/backend[#104](https://git.personal.ksv741.ru/WealthLedger/backend/issues/104)) ([#145](https://git.personal.ksv741.ru/WealthLedger/backend/issues/145)) ([99b137e](https://git.personal.ksv741.ru/WealthLedger/backend/commit/99b137ed0b39ab73b6a28d1a494d2d98bf8fa380))
## [2.3.1](https://git.personal.ksv741.ru/WealthLedger/backend/compare/v2.3.0...v2.3.1) (2026-10-24)
### Bug Fixes
eslint-suppressions.json
+18 -2
View File
@@ -53,6 +53,11 @@
"count": 1
}
},
"src/modules/investments/instruments/application/catalog-discovery.service.ts": {
"sonarjs/no-nested-conditional": {
"count": 1
}
},
"src/modules/investments/instruments/application/catalog-enrichment.service.ts": {
"sonarjs/no-nested-conditional": {
"count": 1
@@ -87,8 +92,11 @@
}
},
"src/modules/investments/investment-sync-plan.ts": {
"sonarjs/cognitive-complexity": {
"count": 1
},
"sonarjs/no-nested-conditional": {
"count": 3
"count": 4
}
},
"src/modules/investments/operations/application/brokerage-operations.service.ts": {
@@ -96,7 +104,7 @@
"count": 2
},
"sonarjs/no-nested-conditional": {
"count": 6
"count": 9
}
},
"src/modules/investments/operations/domain/operations-sync-plan.ts": {
@@ -130,6 +138,11 @@
"count": 1
}
},
"src/modules/investments/tbank-sync/tbank-sync.service.ts": {
"sonarjs/no-nested-conditional": {
"count": 6
}
},
"test/bank-cards-durability.cjs": {
"sonarjs/no-nested-template-literals": {
"count": 1
@@ -148,6 +161,9 @@
"test/tbank-ledger-local.e2e-spec.ts": {
"sonarjs/no-nested-conditional": {
"count": 1
},
"sonarjs/no-nested-template-literals": {
"count": 3
}
}
}
eslint.config.mjs
+17 -26
View File
@@ -15,18 +15,6 @@ import globals from 'globals';
import tseslint from 'typescript-eslint';
const tests = ['**/*.spec.ts', 'test/**/*.ts'];
const guardedModules = [
{
name: 'tbank-sync',
except: [
'./tbank-sync.api.ts',
'./tbank-sync.dto.ts',
'./tbank-sync.module.ts',
'./tbank-sync-repository.module.ts',
],
},
{ name: 'upcoming-events', except: ['./upcoming-events.api.ts', './upcoming-events.module.ts'] },
];
const prismaImports = [
'@prisma/*', '**/generated/prisma/**', '**/prisma.service',
];
@@ -170,14 +158,13 @@ export default defineConfig(
},
},
{
files: ['src/**/application/**/*.ts'],
files: ['src/**/*.use-case.ts'],
ignores: tests,
rules: {
'no-restricted-imports': ['error', {
patterns: [{
group: prismaImports,
allowTypeImports: true,
message: 'Application code obtains data through concrete repositories; type-only imports are allowed.',
message: 'Use cases obtain data through concrete repositories.',
}],
}],
},
@@ -225,20 +212,24 @@ export default defineConfig(
'@typescript-eslint/no-unsafe-enum-comparison': 'error',
},
},
// Separate rule so it does not replace layer-specific no-restricted-imports configs.
// A module may import its own internals, so each guarded module gets a block without its zone.
...[undefined, ...guardedModules].map((own) => ({
files: own ? [`src/modules/investments/${own.name}/**/*.ts`] : ['src/**/*.ts'],
ignores: own ? tests : [...tests, ...guardedModules.map(({ name }) => `src/modules/investments/${name}/**`)],
{
files: ['src/**/*.ts'],
ignores: [...tests, 'src/modules/investments/tbank-sync/**'],
rules: {
// Separate rule so it does not replace layer-specific no-restricted-imports configs.
'import-x/no-restricted-paths': ['error', {
zones: guardedModules.filter((module) => module !== own).map(({ except, name }) => ({
zones: [{
target: './src',
from: `./src/modules/investments/${name}`,
except,
message: `Use ${name}.api for cross-module access.`,
})),
from: './src/modules/investments/tbank-sync',
except: [
'./tbank-sync.api.ts',
'./tbank-sync.dto.ts',
'./tbank-sync.module.ts',
'./tbank-sync-repository.module.ts',
],
message: 'Use tbank-sync.api for cross-module access.',
}],
}],
},
})),
},
);
package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "wealth-ledger-backend",
"version": "2.4.1",
"version": "2.3.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "wealth-ledger-backend",
"version": "2.4.1",
"version": "2.3.1",
"license": "UNLICENSED",
"dependencies": {
"@grpc/grpc-js": "1.14.6",
package.json
+3 -17
View File
@@ -1,19 +1,9 @@
{
"name": "wealth-ledger-backend",
"version": "2.4.1",
"version": "2.3.1",
"description": "",
"author": "",
"private": true,
"imports": {
"#generated/*": {
"development": "./dist-dev/generated/*",
"default": "./dist/generated/*"
},
"#src/*": {
"development": "./dist-dev/src/*",
"default": "./dist/src/*"
}
},
"license": "UNLICENSED",
"engines": {
"node": "v24.22.1"
@@ -24,8 +14,8 @@
"openapi:check": "npm run build && node scripts/generate-openapi.cjs --check",
"format": "npm run lint:fix",
"start": "nest start",
"start:dev": "NODE_ENV=development NODE_OPTIONS=--conditions=development nest start --watch --path tsconfig.dev.json",
"start:debug": "NODE_ENV=development NODE_OPTIONS=--conditions=development nest start --debug --watch --path tsconfig.dev.json",
"start:dev": "NODE_ENV=development nest start --watch --path tsconfig.dev.json",
"start:debug": "NODE_ENV=development nest start --debug --watch --path tsconfig.dev.json",
"start:prod": "node dist/src/main.js",
"lint": "npm run lint:check",
"lint:check": "eslint . --max-warnings=0",
@@ -141,10 +131,6 @@
}
},
"jest": {
"moduleNameMapper": {
"^#generated/(.*)$": "<rootDir>/../generated/$1",
"^#src/(.*)$": "<rootDir>/$1"
},
"moduleFileExtensions": [
"js",
"json",
prisma/migrations/20261031150000_add_instrument_classification/migration.sql
-11
View File
@@ -1,11 +0,0 @@
CREATE TABLE "TbankInstrumentClassification" (
"provider" TEXT NOT NULL,
"instrumentKey" TEXT NOT NULL,
"sector" TEXT,
"sectorFetchedAt" DATETIME,
"assetUid" TEXT,
"brandUid" TEXT,
"brandName" TEXT,
"brandFetchedAt" DATETIME,
PRIMARY KEY ("provider","instrumentKey")
);
prisma/schema.prisma
-14
View File
@@ -186,20 +186,6 @@ model TbankInstrumentLookup {
@@id([provider, identifierType, identifier])
}
// Public per-instrument classification; no holdings or credentials.
model TbankInstrumentClassification {
provider String
instrumentKey String
sector String?
sectorFetchedAt DateTime?
assetUid String?
brandUid String?
brandName String?
brandFetchedAt DateTime?
@@id([provider, instrumentKey])
}
// Source records contain no holdings, personal estimates or credentials errors.
model TbankInstrumentSource {
provider String
renovate.json
+1 -30
View File
@@ -2,8 +2,7 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended",
":semanticCommitTypeAll(chore)",
"security:minimumReleaseAgeNpm"
":semanticCommitTypeAll(chore)"
],
"timezone": "Europe/Moscow",
"labels": [
@@ -11,13 +10,6 @@
],
"dependencyDashboard": true,
"rangeStrategy": "pin",
"prConcurrentLimit": 5,
"lockFileMaintenance": {
"enabled": true,
"schedule": [
"before 4am on the first day of the month"
]
},
"packageRules": [
{
"matchUpdateTypes": [
@@ -26,27 +18,6 @@
],
"groupName": "non-major dependencies"
},
{
"matchManagers": [
"github-actions"
],
"matchUpdateTypes": [
"minor",
"patch"
],
"groupName": "non-major github actions"
},
{
"matchManagers": [
"docker-compose",
"dockerfile"
],
"matchUpdateTypes": [
"minor",
"patch"
],
"groupName": "non-major container images"
},
{
"matchUpdateTypes": [
"major"
src/integrations/tbank/instrument-metadata.repository.ts
+32 -20
View File
@@ -5,15 +5,13 @@ import { isDeepStrictEqual } from 'node:util';
import type {
TbankInstrumentLookup as MetadataLookupRow,
TbankInstrument as MetadataRow,
} from '#generated/prisma/client';
Prisma,
} from '../../../generated/prisma/client';
import type { TbankSyncAttempt } from './tbank-access.service';
import type { TbankInstrument } from './tbank.client';
import { PrismaService } from '../../prisma/prisma.service';
import { toJson } from '../../prisma/to-json';
import { isJoinableRunningAttempt, type TbankSyncAttempt } from './tbank-access.service';
import { TbankErrorCode } from './tbank-error-code';
import { claimSyncWork, lockConnectionGeneration } from './tbank-sync-claim';
const FIRST_BATCH_OFFSET = 0;
const UNCHANGED_REVISION_INCREMENT = 0;
@@ -121,8 +119,11 @@ export class InstrumentMetadataRepository {
active: ReadonlySet<string>,
) {
return this.prisma.$transaction(async (tx) => {
const valid = await lockConnectionGeneration(tx, attemptOwner);
if (!valid) return null;
const valid = await tx.tbankConnection.updateMany({
where: { ...attemptOwner, invalidToken: false },
data: { membershipRevision: { increment: 0 } },
});
if (!valid.count) return null;
const scope = {
...attemptOwner,
scopeKey: `metadata:${metadataKey(identity)}`,
@@ -130,7 +131,11 @@ export class InstrumentMetadataRepository {
const previous = await tx.tbankSyncWork.findUnique({
where: { userId_revision_scopeKey: scope },
});
if (isJoinableRunningAttempt(previous, runId, active)) {
if (
previous?.state === 'running' &&
previous.processRunId === runId &&
active.has(previous.attemptId)
) {
return { work: previous, launch: false };
}
const data = {
@@ -166,11 +171,15 @@ export class InstrumentMetadataRepository {
publish(attempt: TbankSyncAttempt, results: MetadataLookup[], now: Date) {
return this.prisma.$transaction(async (tx) => {
const claimed = await claimSyncWork(tx, attempt, {
state: 'complete',
progress: {},
const claimed = await tx.tbankSyncWork.updateMany({
where: {
...attempt,
state: 'running',
connection: { invalidToken: false },
},
data: { state: 'complete', progress: {} },
});
if (!claimed) return false;
if (!claimed.count) return false;
const aliases = new Map(
results.map((result) => [`${result.type}:${result.id}`, result]),
);
@@ -207,7 +216,9 @@ export class InstrumentMetadataRepository {
const previous = await tx.tbankInstrument.findUnique({
where: { provider_uid: key },
});
const payload = toJson(instrument);
const payload = JSON.parse(
JSON.stringify(instrument),
) as Prisma.InputJsonObject;
const data = {
metadata: payload,
figi:
@@ -257,17 +268,18 @@ export class InstrumentMetadataRepository {
}
async finishObserver(attempt: TbankSyncAttempt, success: boolean) {
await claimSyncWork(
this.prisma,
attempt,
{
await this.prisma.tbankSyncWork.updateMany({
where: {
...attempt,
state: 'running',
...(success ? { connection: { invalidToken: false } } : {}),
},
data: {
state: success ? 'complete' : 'failed',
errorCode: success ? null : TbankErrorCode.Unavailable,
},
{ withoutConnectionFence: !success },
);
});
if (success) {
// Fails sibling attempts whose connection was invalidated mid-flight.
await this.prisma.tbankSyncWork.updateMany({
where: {
...attempt,
src/integrations/tbank/tbank-access.service.ts
+32 -31
View File
@@ -12,7 +12,6 @@ import { PrismaService } from '../../prisma/prisma.service';
import { supportedTbankAccounts } from './tbank-account.policy';
import { TbankErrorCode } from './tbank-error-code';
import { tbankSourceNeedsRefresh } from './tbank-source.policy';
import { claimSyncWork, lockConnectionGeneration } from './tbank-sync-claim';
import { TbankTokenService } from './tbank-token.service';
const EXPECTED_UPDATED_CONNECTIONS = 1;
@@ -26,22 +25,6 @@ export type TbankSyncAttempt = {
userId: string;
};
// Join rule shared by sync reservations: the same process joins its own running attempt
// only while that attempt is still active in memory. Set and Map both satisfy `has`.
export function isJoinableRunningAttempt<
T extends { attemptId: string; processRunId: string; state: string },
>(
previous: null | T,
processRunId: string,
active: { has(attemptId: string): boolean },
): previous is T {
return (
previous?.state === 'running' &&
previous.processRunId === processRunId &&
active.has(previous.attemptId)
);
}
@Injectable()
export class TbankAccessService {
constructor(
@@ -57,8 +40,11 @@ export class TbankAccessService {
force: boolean,
) {
return this.prisma.$transaction(async (tx) => {
const current = await lockConnectionGeneration(tx, { userId, revision });
if (!current) return null;
const current = await tx.tbankConnection.updateMany({
where: { userId, revision, invalidToken: false },
data: { membershipRevision: { increment: 0 } },
});
if (!current.count) return null;
const connection = await tx.tbankConnection.findUniqueOrThrow({
where: { userId },
});
@@ -76,7 +62,11 @@ export class TbankAccessService {
const previous = await tx.tbankSyncWork.findUnique({
where: { userId_revision_scopeKey: scope },
});
if (isJoinableRunningAttempt(previous, processRunId, active)) {
if (
previous?.state === 'running' &&
previous.processRunId === processRunId &&
active.has(previous.attemptId)
) {
return { work: previous, launch: false };
}
const data = {
@@ -108,11 +98,15 @@ export class TbankAccessService {
async failMembership(attempt: TbankSyncAttempt, invalidToken: boolean) {
if (invalidToken) return this.rejectMembershipToken(attempt);
const result = await claimSyncWork(this.prisma, attempt, {
state: 'failed',
errorCode: TbankErrorCode.Unavailable,
const result = await this.prisma.tbankSyncWork.updateMany({
where: {
...attempt,
state: 'running',
connection: { invalidToken: false },
},
data: { state: 'failed', errorCode: TbankErrorCode.Unavailable },
});
return result === EXPECTED_UPDATED_CONNECTIONS;
return result.count === EXPECTED_UPDATED_CONNECTIONS;
}
async tokenForAttempt(attempt: TbankSyncAttempt): Promise<null | string> {
@@ -157,8 +151,15 @@ export class TbankAccessService {
return this.prisma.$transaction(async (tx) => {
// Acquire the write fence before reading membership. Replacement and
// attempt supersession cannot interleave with the publication below.
const claimed = await claimSyncWork(tx, attempt, { updatedAt: new Date() });
if (!claimed) return false;
const claimed = await tx.tbankSyncWork.updateMany({
where: {
...attempt,
state: 'running',
connection: { invalidToken: false },
},
data: { updatedAt: new Date() },
});
if (!claimed.count) return false;
const { userId, revision } = attempt;
const previous = await tx.tbankAccount.findMany({
where: { userId, revision },
@@ -231,11 +232,11 @@ export class TbankAccessService {
async rejectMembershipToken(attempt: TbankSyncAttempt): Promise<boolean> {
return this.prisma.$transaction(async (tx) => {
const claimed = await claimSyncWork(tx, attempt, {
state: 'failed',
errorCode: TbankErrorCode.InvalidToken,
}, { withoutConnectionFence: true });
if (!claimed) return false;
const claimed = await tx.tbankSyncWork.updateMany({
where: { ...attempt, state: 'running' },
data: { state: 'failed', errorCode: TbankErrorCode.InvalidToken },
});
if (!claimed.count) return false;
await tx.tbankConnection.update({
where: {
userId_revision: {
src/integrations/tbank/tbank-sync-claim.ts
-54
View File
@@ -1,54 +0,0 @@
import type { Prisma } from '#generated/prisma/client';
import type { TbankSyncAttempt } from './tbank-access.service';
const NO_UPDATED_ROWS = 0;
// Shared owners for the tbank-sync DB claim/lock protocol.
// Both helpers are CAS fences: they run inside the caller's transaction and
// keep the exact where/data shapes they replaced. Callers keep deciding
// success from the claim count exactly as before.
// Claims the active TbankSyncWork row: only the still-running attempt of a
// valid connection may transition. `data` is the state transition to apply.
export type ClaimOptions = {
// Overrides the default 'running' fence (e.g. an initiator row also
// accepts 'complete').
state: Prisma.TbankSyncWorkWhereInput['state'] | undefined;
// true drops the `connection: { invalidToken: false }` guard for fences
// that must also fire on an invalidated connection.
withoutConnectionFence: boolean | undefined;
};
export async function claimSyncWork(
tx: Prisma.TransactionClient,
attempt: TbankSyncAttempt,
data: Prisma.TbankSyncWorkUpdateManyMutationInput,
options: Partial<ClaimOptions> = {},
): Promise<number> {
const result = await tx.tbankSyncWork.updateMany({
where: {
...attempt,
state: options.state ?? 'running',
...(options.withoutConnectionFence
? {}
: { connection: { invalidToken: false } }),
},
data,
});
return result.count;
}
// Locks the connection generation before reserving or publishing work: the
// row must still be the current revision with a valid token. `extra`
// (e.g. account membership) is merged into the where clause.
export async function lockConnectionGeneration(
tx: Prisma.TransactionClient,
owner: { revision: string; userId: string },
extra: Prisma.TbankConnectionWhereInput = {},
): Promise<boolean> {
const result = await tx.tbankConnection.updateMany({
where: { ...owner, ...extra, invalidToken: false },
data: { membershipRevision: { increment: 0 } },
});
return result.count > NO_UPDATED_ROWS;
}
src/integrations/tbank/tbank.api.ts
-1
View File
@@ -3,7 +3,6 @@ export { InstrumentMetadataService } from './instrument-metadata.service';
export { metadataKey } from './instrument-metadata.service';
export type { MetadataIdentity } from './instrument-metadata.service';
export {
isJoinableRunningAttempt,
TbankAccessService,
type TbankSyncAttempt,
} from './tbank-access.service';
src/integrations/tbank/tbank.client.spec.ts
-10
View File
@@ -236,16 +236,6 @@ describe('TbankClient metadata retries', () => {
jest.useRealTimers();
});
it.each([
['bondBy', (client: TbankClient, optIn: boolean) => client.getBond('token', 'uid', undefined, optIn)],
['etfBy', (client: TbankClient, optIn: boolean) => client.getEtf('token', 'uid', undefined, optIn)],
['getAssetBy', (client: TbankClient, optIn: boolean) => optIn ? client.getAssetBrand('token', 'uid') : client.getAssetDescription('token', 'uid')],
])('%s reports NOT_FOUND only for classification lookups', async (_method, invoke) => {
requestRpc.mockRejectedValue({ code: status.NOT_FOUND });
await expect(invoke(client, false)).rejects.toBeInstanceOf(ServiceUnavailableException);
await expect(invoke(client, true)).rejects.toBeInstanceOf(NotFoundException);
});
it.each([
status.UNAVAILABLE,
status.DEADLINE_EXCEEDED,
src/integrations/tbank/tbank.client.ts
+5 -24
View File
@@ -375,29 +375,18 @@ export class TbankClient {
).then((response) => response.instruments ?? []);
}
getBond(token: string, uid: string, idType = InstrumentIdType.Uid, notFound = false): Promise<null | TbankBond> {
getBond(token: string, uid: string): Promise<null | TbankBond> {
return this.call<{ instrument?: TbankBond }>(
token,
this.sparseInstruments,
'bondBy',
{
idType,
idType: InstrumentIdType.Uid,
id: uid,
},
notFound,
).then((response) => response.instrument ?? null);
}
getEtf(
token: string,
id: string,
idType = InstrumentIdType.Uid,
notFound = false,
): Promise<null | Pick<TbankShare, 'assetUid' | 'figi' | 'sector' | 'uid'>> {
return this.call<{ instrument?: TbankShare }>(token, this.sparseInstruments, 'etfBy', { idType, id }, notFound)
.then((response) => response.instrument ?? null);
}
getBondCoupons(
token: string,
uid: string,
@@ -416,25 +405,18 @@ export class TbankClient {
).then((response) => response.events ?? []);
}
getShare(token: string, uid: string, idType = InstrumentIdType.Uid, notFound = false): Promise<null | TbankShare> {
getShare(token: string, uid: string): Promise<null | TbankShare> {
return this.call<{ instrument?: TbankShare }>(
token,
this.instruments,
'shareBy',
{
idType,
idType: InstrumentIdType.Uid,
id: uid,
},
notFound,
).then((response) => response.instrument ?? null);
}
getAssetBrand(token: string, assetUid: string): Promise<null | { assetUid?: string; brand?: { name?: string; uid?: string } }> {
return this.call<{ asset?: { brand?: { name?: string; uid?: string }; uid?: string } }>(
token, this.instruments, 'getAssetBy', { id: assetUid }, true,
).then((response) => response.asset ? { assetUid: response.asset.uid, brand: response.asset.brand } : null);
}
getAssetDescription(token: string, assetUid: string): Promise<null | string> {
return this.call<{ asset?: { description?: string } }>(
token,
@@ -532,7 +514,6 @@ export class TbankClient {
client: TbankClientService,
method: string,
request: object,
notFound = false,
): Promise<Response> {
const metadataCall = method === 'getInstrumentBy';
for (let attempts = FIRST_ATTEMPT; attempts <= RPC_MAX_ATTEMPTS; attempts += ATTEMPT_INCREMENT) {
@@ -595,7 +576,7 @@ export class TbankClient {
}
if (
grpcCode === status.NOT_FOUND &&
(notFound || method === 'shareBy' || metadataCall)
(method === 'shareBy' || metadataCall)
) {
throw new NotFoundException();
}
src/modules/auth/application/auth.service.spec.ts
+2 -4
View File
@@ -2,14 +2,12 @@ import { ConflictException, UnauthorizedException } from '@nestjs/common';
import { JwtService } from '@nestjs/jwt';
import { createHash } from 'crypto';
import { AuthRepository } from '../infrastructure/auth.repository';
jest.mock('bcrypt', () => ({
hash: jest.fn(() => Promise.resolve('password-hash')),
compare: jest.fn(() => Promise.resolve(true)),
}));
jest.mock('#src/prisma/prisma.service', () => ({
jest.mock('../../../prisma/prisma.service', () => ({
PrismaService: class PrismaService {},
}));
@@ -53,7 +51,7 @@ describe('AuthService', () => {
delete: jest.fn(),
},
};
const service = new AuthService(new AuthRepository(prisma as never), jwt);
const service = new AuthService(prisma as never, jwt);
beforeEach(() => {
jest.clearAllMocks();
src/modules/auth/application/auth.service.ts
+67 -23
View File
@@ -7,14 +7,15 @@ import { JwtService } from '@nestjs/jwt';
import * as bcrypt from 'bcrypt';
import { createHash, randomUUID } from 'crypto';
import type { Session, User } from '#generated/prisma/client';
import { HttpErrorCode } from '#src/common/error-code';
import { AuthRepository } from '../infrastructure/auth.repository';
import { Session, User } from '../../../../generated/prisma/client';
import { HttpErrorCode } from '../../../common/error-code';
import { isPrismaErrorCode, PrismaErrorCode } from '../../../prisma/prisma-error-code';
import { PrismaService } from '../../../prisma/prisma.service';
import { AuthErrorCode } from './auth-error-code';
import { AuthenticationResult, AuthUser, RefreshPayload } from './auth.types';
const EXPECTED_ROTATED_SESSIONS = 1;
const PASSWORD_HASH_ROUNDS = 12;
export const REFRESH_TTL_MS = 604_800_000;
@@ -27,7 +28,7 @@ const DUMMY_PASSWORD_HASH =
@Injectable()
export class AuthService {
constructor(
private readonly repository: AuthRepository,
private readonly prisma: PrismaService,
private readonly jwt: JwtService,
) {}
@@ -35,18 +36,27 @@ export class AuthService {
email: string,
password: string,
): Promise<AuthenticationResult> {
const existing = await this.repository.findUserByEmail(email);
const existing = await this.prisma.user.findUnique({
where: { email },
});
if (existing) {
throw new ConflictException({ code: AuthErrorCode.EmailAlreadyRegistered });
}
const user = await this.repository.createUser({
id: randomUUID(),
email,
passwordHash: await bcrypt.hash(password, PASSWORD_HASH_ROUNDS),
});
if (!user) {
throw new ConflictException({ code: AuthErrorCode.EmailAlreadyRegistered });
let user: User;
try {
user = await this.prisma.user.create({
data: {
id: randomUUID(),
email,
passwordHash: await bcrypt.hash(password, PASSWORD_HASH_ROUNDS),
},
});
} catch (error) {
if (isUniqueConstraintError(error)) {
throw new ConflictException({ code: AuthErrorCode.EmailAlreadyRegistered });
}
throw error;
}
return this.createSession(user);
}
@@ -55,7 +65,9 @@ export class AuthService {
email: string,
password: string,
): Promise<AuthenticationResult> {
const user = await this.repository.findUserByEmail(email);
const user = await this.prisma.user.findUnique({
where: { email },
});
const valid = await bcrypt.compare(
password,
user?.passwordHash ?? DUMMY_PASSWORD_HASH,
@@ -80,7 +92,10 @@ export class AuthService {
if (payload.type !== 'refresh') {
throw new UnauthorizedException({ code: HttpErrorCode.Unauthorized });
}
const session = await this.repository.findSessionWithUser(payload.sid);
const session = await this.prisma.session.findUnique({
where: { id: payload.sid },
include: { user: true },
});
if (
!session ||
session.userId !== payload.sub ||
@@ -88,7 +103,7 @@ export class AuthService {
session.expiresAt <= new Date()
) {
if (session && !session.revokedAt) {
await this.repository.deleteSession(session.id);
await this.prisma.session.delete({ where: { id: session.id } });
}
throw new UnauthorizedException({ code: HttpErrorCode.Unauthorized });
}
@@ -109,13 +124,18 @@ export class AuthService {
return;
}
if (payload.type !== 'refresh') return;
const session = await this.repository.findSession(payload.sid);
const session = await this.prisma.session.findUnique({
where: { id: payload.sid },
});
if (
session &&
!session.revokedAt &&
session.refreshTokenHash === this.hash(token)
) {
await this.repository.revokeSession(session.id);
await this.prisma.session.update({
where: { id: session.id },
data: { revokedAt: new Date() },
});
}
}
@@ -124,7 +144,7 @@ export class AuthService {
}
async userById(id: string): Promise<User> {
const user = await this.repository.findUserById(id);
const user = await this.prisma.user.findUnique({ where: { id } });
if (!user) throw new UnauthorizedException({ code: HttpErrorCode.Unauthorized });
return user;
}
@@ -132,7 +152,14 @@ export class AuthService {
private async createSession(
user: User,
): Promise<AuthenticationResult> {
const session = await this.repository.createSession(user.id, randomUUID());
const session = await this.prisma.session.create({
data: {
id: randomUUID(),
userId: user.id,
refreshTokenHash: '',
expiresAt: new Date(),
},
});
return this.rotateSession({ ...session, user });
}
@@ -153,8 +180,16 @@ export class AuthService {
refreshTokenHash: this.hash(refreshToken),
expiresAt: new Date(Date.now() + REFRESH_TTL_MS),
};
if (!(await this.repository.rotateSession(session.id, data, expectedRefreshTokenHash))) {
throw new UnauthorizedException({ code: HttpErrorCode.Unauthorized });
if (expectedRefreshTokenHash) {
const updated = await this.prisma.session.updateMany({
where: { id: session.id, refreshTokenHash: expectedRefreshTokenHash },
data,
});
if (updated.count !== EXPECTED_ROTATED_SESSIONS) {
throw new UnauthorizedException({ code: HttpErrorCode.Unauthorized });
}
} else {
await this.prisma.session.update({ where: { id: session.id }, data });
}
return {
user: this.toUser(session.user),
@@ -170,3 +205,12 @@ export class AuthService {
return createHash('sha256').update(token).digest('hex');
}
}
function isUniqueConstraintError(error: unknown): boolean {
return (
typeof error === 'object' &&
error !== null &&
'code' in error &&
isPrismaErrorCode(error.code, PrismaErrorCode.UniqueConstraint)
);
}
src/modules/auth/auth.module.ts
+1 -2
View File
@@ -5,7 +5,6 @@ import { PassportModule } from '@nestjs/passport';
import { Environment } from '../../config/env.validation';
import { AuthService } from './application/auth.service';
import { AuthRepository } from './infrastructure/auth.repository';
import { JwtStrategy } from './infrastructure/jwt.strategy';
import { AuthController } from './presentation/auth.controller';
import { JwtAuthGuard } from './presentation/jwt-auth.guard';
@@ -23,6 +22,6 @@ import { JwtAuthGuard } from './presentation/jwt-auth.guard';
],
exports: [JwtAuthGuard],
controllers: [AuthController],
providers: [AuthService, AuthRepository, JwtStrategy, JwtAuthGuard],
providers: [AuthService, JwtStrategy, JwtAuthGuard],
})
export class AuthModule {}
src/modules/auth/infrastructure/auth.repository.ts
-81
View File
@@ -1,81 +0,0 @@
import { Injectable } from '@nestjs/common';
import { isPrismaErrorCode, PrismaErrorCode } from '#src/prisma/prisma-error-code';
import { PrismaService } from '#src/prisma/prisma.service';
const EXPECTED_ROTATED_SESSIONS = 1;
@Injectable()
export class AuthRepository {
constructor(private readonly prisma: PrismaService) {}
findUserByEmail(email: string) {
return this.prisma.user.findUnique({ where: { email } });
}
async createUser(data: { email: string; id: string; passwordHash: string }) {
try {
return await this.prisma.user.create({ data });
} catch (error) {
if (isUniqueConstraintError(error)) return null;
throw error;
}
}
findUserById(id: string) {
return this.prisma.user.findUnique({ where: { id } });
}
findSessionWithUser(id: string) {
return this.prisma.session.findUnique({
where: { id },
include: { user: true },
});
}
findSession(id: string) {
return this.prisma.session.findUnique({ where: { id } });
}
deleteSession(id: string) {
return this.prisma.session.delete({ where: { id } });
}
revokeSession(id: string) {
return this.prisma.session.update({
where: { id },
data: { revokedAt: new Date() },
});
}
createSession(userId: string, id: string) {
return this.prisma.session.create({
data: { id, userId, refreshTokenHash: '', expiresAt: new Date() },
});
}
async rotateSession(
id: string,
data: { expiresAt: Date; refreshTokenHash: string },
expectedRefreshTokenHash?: string,
): Promise<boolean> {
if (expectedRefreshTokenHash) {
const updated = await this.prisma.session.updateMany({
where: { id, refreshTokenHash: expectedRefreshTokenHash },
data,
});
return updated.count === EXPECTED_ROTATED_SESSIONS;
}
await this.prisma.session.update({ where: { id }, data });
return true;
}
}
function isUniqueConstraintError(error: unknown): boolean {
return (
typeof error === 'object' &&
error !== null &&
'code' in error &&
isPrismaErrorCode(error.code, PrismaErrorCode.UniqueConstraint)
);
}
src/modules/auth/infrastructure/jwt.strategy.ts
+2 -3
View File
@@ -3,9 +3,8 @@ import { ConfigService } from '@nestjs/config';
import { PassportStrategy } from '@nestjs/passport';
import { ExtractJwt, Strategy } from 'passport-jwt';
import { HttpErrorCode } from '#src/common/error-code';
import { Environment } from '#src/config/env.validation';
import { HttpErrorCode } from '../../../common/error-code';
import { Environment } from '../../../config/env.validation';
import { AccessPayload } from '../application/auth.types';
@Injectable()
src/modules/auth/presentation/auth.controller.ts
+2 -3
View File
@@ -20,9 +20,8 @@ import {
ApiTags,
} from '@nestjs/swagger';
import { ApiProblemResponses } from '#src/common/decorators/api-safe-error-response.decorator';
import { HttpErrorCode } from '#src/common/error-code';
import { ApiProblemResponses } from '../../../common/decorators/api-safe-error-response.decorator';
import { HttpErrorCode } from '../../../common/error-code';
import { AuthService, REFRESH_TTL_MS } from '../application/auth.service';
import { AccessPayload, AuthenticationResult } from '../application/auth.types';
import { LoginDto, RegisterDto } from './auth.dto';
src/modules/banking/bank-cards/application/bank-card-input.ts
+1 -2
View File
@@ -5,8 +5,7 @@ import {
} from '@nestjs/common';
import { createHash } from 'node:crypto';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '#src/common/time';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '../../../../common/time';
import {
MAX_CARD_NAME_LENGTH,
MAX_OPERATION_DESCRIPTION_LENGTH,
src/modules/banking/bank-cards/application/bank-cards.service.ts
+42 -24
View File
@@ -1,7 +1,7 @@
import { Injectable } from '@nestjs/common';
import type { BankCard, Prisma } from '#generated/prisma/client';
import { BankCard, Prisma } from '../../../../../generated/prisma/client';
import { PrismaService } from '../../../../prisma/prisma.service';
import { bankBalance } from '../domain/bank-card.calculations';
import { rubMoney } from '../domain/rub-money';
import { BankCardsRepository } from '../infrastructure/bank-cards.repository';
@@ -20,13 +20,24 @@ import {
missing,
} from './bank-card-input';
const EXPECTED_UPDATED_CARDS = 1;
type Tx = Prisma.TransactionClient;
@Injectable()
export class BankCardsService {
constructor(private readonly repository: BankCardsRepository) {}
constructor(
private readonly prisma: PrismaService,
private readonly repository: BankCardsRepository,
) {}
private async cardView(tx: Tx, card: BankCard): Promise<BankCardDto> {
const rows = await this.repository.cardOperations(tx, card);
const rows = await tx.bankCardOperation.findMany({
where: {
userId: card.userId,
deletedAt: null,
OR: [{ cardId: card.id }, { targetCardId: card.id }],
},
});
return {
id: card.id,
name: card.name,
@@ -42,15 +53,20 @@ export class BankCardsService {
}
list(userId: string, includeArchived = false) {
return this.repository.read(async (tx) =>
Promise.all((await this.repository.cards(tx, userId, includeArchived)).map(
(card) => this.cardView(tx, card),
)),
return this.prisma.$transaction(async (tx) =>
Promise.all(
(
await tx.bankCard.findMany({
where: { userId, ...(includeArchived ? {} : { archivedAt: null }) },
orderBy: [{ createdAt: 'asc' }, { id: 'asc' }],
})
).map((card) => this.cardView(tx, card)),
),
);
}
get(userId: string, id: string) {
return this.repository.read(async (tx) =>
return this.prisma.$transaction(async (tx) =>
this.cardView(tx, await this.repository.card(tx, userId, id)),
);
}
@@ -59,7 +75,7 @@ export class BankCardsService {
const input = cardInput(dto),
hash = fingerprint(input);
return this.repository.write(async (tx) => {
const existing = await this.repository.cardById(tx, dto.id);
const existing = await tx.bankCard.findUnique({ where: { id: dto.id } });
if (existing) {
if (existing.userId !== userId) missing();
// eslint-disable-next-line security/detect-possible-timing-attacks -- This compares an idempotency fingerprint after ownership validation, not a secret.
@@ -72,11 +88,8 @@ export class BankCardsService {
await this.repository.seed(tx, userId);
return this.cardView(
tx,
await this.repository.createCard(tx, {
...input,
id: dto.id,
userId,
createFingerprint: hash,
await tx.bankCard.create({
data: { ...input, id: dto.id, userId, createFingerprint: hash },
}),
);
});
@@ -109,16 +122,20 @@ export class BankCardsService {
}
currentDate(input.openingDate);
if (
await this.repository.hasOperationsBefore(tx, userId, id, input.openingDate)
await tx.bankCardOperation.findFirst({
where: {
userId,
deletedAt: null,
date: { lt: input.openingDate },
OR: [{ cardId: id }, { targetCardId: id }],
},
})
) {
fail(BankErrorCode.OpeningDateConflict);
}
const updated = await this.repository.updateCard(
tx,
userId,
id,
dto.version,
{
const changed = await tx.bankCard.updateMany({
where: { id, userId, version: dto.version },
data: {
...input,
paymentSystem: input.paymentSystem ?? null,
version: { increment: 1 },
@@ -130,8 +147,9 @@ export class BankCardsService {
: null,
}),
},
);
return this.cardView(tx, updated);
});
if (changed.count !== EXPECTED_UPDATED_CARDS) conflict();
return this.cardView(tx, await this.repository.card(tx, userId, id));
});
}
}
src/modules/banking/bank-cards/application/bank-operations.service.ts
+209 -43
View File
@@ -1,16 +1,12 @@
import { GoneException, Injectable } from '@nestjs/common';
import type {
import {
BankCardOperation,
Prisma,
} from '#generated/prisma/client';
} from '../../../../../generated/prisma/client';
import { PrismaService } from '../../../../prisma/prisma.service';
import { FIRST_PAGE } from '../domain/bank-card-limits';
import { BankOperationKind } from '../domain/bank-operation-kind';
import {
operationFieldConflict,
operationKindChanged,
} from '../domain/bank-operation.rules';
import { rubMoney, ZERO_KOPECKS } from '../domain/rub-money';
import { BankCardsRepository } from '../infrastructure/bank-cards.repository';
import {
@@ -32,22 +28,117 @@ import {
periodBounds,
} from './bank-card-input';
const EXPECTED_UPDATED_ROWS = 1;
type Tx = Prisma.TransactionClient;
@Injectable()
export class BankOperationsService {
constructor(private readonly repository: BankCardsRepository) {}
constructor(
private readonly prisma: PrismaService,
private readonly repository: BankCardsRepository,
) {}
private async operationView(
tx: Tx,
row: BankCardOperation,
): Promise<BankOperationDto> {
return (await this.pageViews(tx, [row]))[0];
const card = await this.repository.card(tx, row.userId, row.cardId);
const target = row.targetCardId
? await this.repository.card(tx, row.userId, row.targetCardId)
: null;
const source = row.originalExpenseId
? await this.repository.operation(tx, row.userId, row.originalExpenseId)
: null;
const categoryId = source?.categoryId ?? row.categoryId;
const category = categoryId
? await tx.expenseCategory.findFirst({
where: { id: categoryId, userId: row.userId },
})
: null;
const refunds =
row.kind === BankOperationKind.Expense || source
? await tx.bankCardOperation.findMany({
where: {
userId: row.userId,
originalExpenseId: source?.id ?? row.id,
deletedAt: null,
...(source ? { id: { not: row.id } } : {}),
},
})
: [];
return {
id: row.id,
kind: row.kind as BankOperationDto['kind'],
cardId: row.cardId,
cardName: card.name,
targetCardId: row.targetCardId,
targetCardName: target?.name ?? null,
categoryId,
categoryName: category?.name ?? null,
originalExpenseId: row.originalExpenseId,
amount: rubMoney(row.amountKopecks),
availableRefund:
row.kind === BankOperationKind.Expense || source
? rubMoney(
(source?.amountKopecks ?? row.amountKopecks) -
refunds.reduce((sum, r) => sum + r.amountKopecks, ZERO_KOPECKS),
)
: null,
date: row.date,
description: row.description,
version: row.version,
createdAt: row.createdAt.toISOString(),
};
}
private async pageViews(tx: Tx, rows: BankCardOperation[]) {
const userId = rows[0]?.userId;
if (!userId) return [];
const { cards, sources, categories, refunds } = await this.repository.operationViewData(tx, userId, rows);
const cardIds = new Set(
rows.flatMap((row) =>
[row.cardId, row.targetCardId].filter(
(id): id is string => id !== null,
),
),
);
const sourceIds = new Set(
rows.flatMap((row) => (row.originalExpenseId ? [row.originalExpenseId] : [])),
);
const [cards, sources] = await Promise.all([
tx.bankCard.findMany({ where: { userId, id: { in: [...cardIds] } } }),
tx.bankCardOperation.findMany({
where: { userId, id: { in: [...sourceIds] } },
}),
]);
const categoryIds = new Set(
rows
.map(
(row) =>
sources.find((source) => source.id === row.originalExpenseId)
?.categoryId ?? row.categoryId,
)
.filter((id): id is string => id !== null),
);
const expenseIds = new Set(
rows.flatMap((row) => {
const source = sources.find((item) => item.id === row.originalExpenseId);
return row.kind === BankOperationKind.Expense || source
? [source?.id ?? row.id]
: [];
}),
);
const [categories, refunds] = await Promise.all([
tx.expenseCategory.findMany({
where: { userId, id: { in: [...categoryIds] } },
}),
tx.bankCardOperation.findMany({
where: {
userId,
originalExpenseId: { in: [...expenseIds] },
deletedAt: null,
},
}),
]);
const cardsById = new Map(cards.map((card) => [card.id, card]));
const sourcesById = new Map(sources.map((source) => [source.id, source]));
const categoriesById = new Map(categories.map((category) => [category.id, category]));
@@ -116,28 +207,49 @@ export class BankOperationsService {
fail(BankErrorCode.InvalidDate);
}
}
if (old && operationKindChanged(old.kind, input.kind,
old.originalExpenseId, input.originalExpenseId)) {
if (
old &&
(old.kind !== input.kind ||
old.originalExpenseId !== input.originalExpenseId)
) {
fail(BankErrorCode.ImmutableOperation);
}
if (operationFieldConflict(input)) fail();
if (input.kind === BankOperationKind.Transfer) {
if (
!input.targetCardId ||
input.targetCardId === input.cardId ||
input.categoryId ||
input.originalExpenseId
) {
fail();
}
} else if (input.targetCardId) fail();
if (input.kind === BankOperationKind.Expense) {
if (input.originalExpenseId) fail();
if (!input.categoryId) {
const category = await this.repository.defaultCategory(tx, userId);
const category = await tx.expenseCategory.findUnique({
where: { userId_seedKey: { userId, seedKey: 'other' } },
});
if (!category) missing();
input.categoryId = category.id;
}
if (
!(await this.repository.category(tx, userId, input.categoryId))
!(await tx.expenseCategory.findFirst({
where: { userId, id: input.categoryId },
}))
) {
missing();
}
} else if (input.categoryId) fail();
if (input.kind !== BankOperationKind.Refund && input.originalExpenseId) {
fail();
}
if (input.kind === BankOperationKind.Refund) {
if (!input.originalExpenseId) fail();
const source = await this.repository.operation(
tx,
userId,
input.originalExpenseId as string,
input.originalExpenseId,
);
if (
source.deletedAt ||
@@ -146,11 +258,29 @@ export class BankOperationsService {
) {
fail(BankErrorCode.InvalidRefund);
}
await this.repository.updateOperation(tx,
{ id: source.id, userId, version: source.version, deletedAt: null },
{ version: { increment: 1 } },
);
const refunds = await this.repository.refunds(tx, userId, source.id, old?.id);
if (
(
await tx.bankCardOperation.updateMany({
where: {
id: source.id,
userId,
version: source.version,
deletedAt: null,
},
data: { version: { increment: 1 } },
})
).count !== EXPECTED_UPDATED_ROWS
) {
conflict();
}
const refunds = await tx.bankCardOperation.findMany({
where: {
userId,
originalExpenseId: source.id,
deletedAt: null,
...(old ? { id: { not: old.id } } : {}),
},
});
if (input.date < source.date) fail(BankErrorCode.InvalidDate);
if (
refunds.reduce((sum, r) => sum + r.amountKopecks, ZERO_KOPECKS) +
@@ -161,7 +291,9 @@ export class BankOperationsService {
}
}
if (old?.kind === BankOperationKind.Expense) {
const refunds = await this.repository.refunds(tx, userId, old.id);
const refunds = await tx.bankCardOperation.findMany({
where: { userId, originalExpenseId: old.id, deletedAt: null },
});
if (
refunds.length &&
(input.cardId !== old.cardId ||
@@ -178,7 +310,9 @@ export class BankOperationsService {
const normalized = operationInput(dto),
hash = fingerprint(normalized);
return this.repository.write(async (tx) => {
const existing = await this.repository.operationById(tx, dto.id);
const existing = await tx.bankCardOperation.findUnique({
where: { id: dto.id },
});
if (existing) {
if (existing.userId !== userId) missing();
// eslint-disable-next-line security/detect-possible-timing-attacks -- This compares an idempotency fingerprint after ownership validation, not a secret.
@@ -194,15 +328,15 @@ export class BankOperationsService {
await this.validateOperation(tx, userId, input);
return this.operationView(
tx,
await this.repository.createOperation(tx, {
...input, id: dto.id, userId, createFingerprint: hash,
await tx.bankCardOperation.create({
data: { ...input, id: dto.id, userId, createFingerprint: hash },
}),
);
});
}
getOperation(userId: string, id: string) {
return this.repository.read(async (tx) => {
return this.prisma.$transaction(async (tx) => {
const row = await this.repository.operation(tx, userId, id);
if (row.deletedAt) missing();
return this.operationView(tx, row);
@@ -227,10 +361,16 @@ export class BankOperationsService {
description: dto.description ?? old.description ?? undefined,
});
await this.validateOperation(tx, userId, input, old);
await this.repository.updateOperation(tx,
{ id, userId, version: dto.version, deletedAt: null },
{ ...input, version: { increment: 1 } },
);
if (
(
await tx.bankCardOperation.updateMany({
where: { id, userId, version: dto.version, deletedAt: null },
data: { ...input, version: { increment: 1 } },
})
).count !== EXPECTED_UPDATED_ROWS
) {
conflict();
}
return this.operationView(
tx,
await this.repository.operation(tx, userId, id),
@@ -249,7 +389,9 @@ export class BankOperationsService {
}
if (
row.kind === BankOperationKind.Expense &&
(await this.repository.dependentRefund(tx, userId, id))
(await tx.bankCardOperation.findFirst({
where: { userId, originalExpenseId: id, deletedAt: null },
}))
) {
conflict(BankErrorCode.DependentRefunds);
}
@@ -259,15 +401,27 @@ export class BankOperationsService {
userId,
row.originalExpenseId,
);
await this.repository.updateOperation(tx,
{ id: source.id, userId, version: source.version },
{ version: { increment: 1 } },
);
if (
(
await tx.bankCardOperation.updateMany({
where: { id: source.id, userId, version: source.version },
data: { version: { increment: 1 } },
})
).count !== EXPECTED_UPDATED_ROWS
) {
conflict();
}
}
if (
(
await tx.bankCardOperation.updateMany({
where: { id, userId, version, deletedAt: null },
data: { deletedAt: new Date(), version: { increment: 1 } },
})
).count !== EXPECTED_UPDATED_ROWS
) {
conflict();
}
await this.repository.updateOperation(tx,
{ id, userId, version, deletedAt: null },
{ deletedAt: new Date(), version: { increment: 1 } },
);
});
}
@@ -280,13 +434,25 @@ export class BankOperationsService {
const period = expenses
? undefined
: periodBounds(query as BankOperationsQueryDto);
return this.repository.read(async (tx) => {
return this.prisma.$transaction(async (tx) => {
await this.repository.card(tx, userId, id);
const limit = query.limit ?? DEFAULT_BANK_PAGE_SIZE,
page = query.page ?? FIRST_PAGE;
const { total, rows } = await this.repository.operationPage(
tx, userId, id, period, limit, page,
);
const where: Prisma.BankCardOperationWhereInput = {
userId,
deletedAt: null,
OR: [{ cardId: id }, { targetCardId: id }],
...(period
? { date: { gte: period.from, lte: period.to } }
: { kind: BankOperationKind.Expense }),
};
const total = await tx.bankCardOperation.count({ where });
const rows = await tx.bankCardOperation.findMany({
where,
orderBy: [{ date: 'desc' }, { createdAt: 'desc' }, { id: 'desc' }],
skip: (page - FIRST_PAGE) * limit,
take: limit,
});
return {
items: await this.pageViews(tx, rows),
total,
src/modules/banking/bank-cards/application/expense-categories.service.ts
+62 -5
View File
@@ -1,24 +1,81 @@
import { Injectable } from '@nestjs/common';
import { randomUUID } from 'node:crypto';
import { PrismaService } from '../../../../prisma/prisma.service';
import { MAX_CATEGORY_NAME_LENGTH } from '../domain/bank-card-limits';
import { BankCardsRepository } from '../infrastructure/bank-cards.repository';
import { name } from './bank-card-input';
import { conflict, missing, name } from './bank-card-input';
const EXPECTED_UPDATED_CATEGORIES = 1;
const VERSION_INCREMENT = 1;
@Injectable()
export class ExpenseCategoriesService {
constructor(private readonly repository: BankCardsRepository) {}
constructor(
private readonly prisma: PrismaService,
private readonly repository: BankCardsRepository,
) {}
async categories(userId: string) {
return this.repository.categories(userId);
return (
await this.prisma.expenseCategory.findMany({
where: { userId },
orderBy: [{ name: 'asc' }, { id: 'asc' }],
})
).map(({ id, name, seedKey, version }) => ({
id,
name,
isDefault: seedKey === 'other',
version,
}));
}
createCategory(userId: string, value: string) {
const label = name(value, MAX_CATEGORY_NAME_LENGTH);
return this.repository.createCategory(userId, label);
return this.repository.write(async (tx) => {
await this.repository.seed(tx, userId);
const row = await tx.expenseCategory.create({
data: {
id: randomUUID(),
userId,
name: label,
nameKey: label.toLocaleLowerCase('ru-RU'),
},
});
return {
id: row.id,
name: row.name,
isDefault: false,
version: row.version,
};
});
}
updateCategory(userId: string, id: string, value: string, version: number) {
const label = name(value, MAX_CATEGORY_NAME_LENGTH);
return this.repository.updateCategory(userId, id, label, version);
return this.repository.write(async (tx) => {
const row = await tx.expenseCategory.findFirst({ where: { id, userId } });
if (!row) missing();
if (
(
await tx.expenseCategory.updateMany({
where: { id, userId, version },
data: {
name: label,
nameKey: label.toLocaleLowerCase('ru-RU'),
version: { increment: 1 },
},
})
).count !== EXPECTED_UPDATED_CATEGORIES
) {
conflict();
}
return {
id,
name: label,
isDefault: row.seedKey === 'other',
version: version + VERSION_INCREMENT,
};
});
}
}
src/modules/banking/bank-cards/application/get-bank-summary.use-case.spec.ts
+3 -4
View File
@@ -1,9 +1,8 @@
jest.mock('#src/prisma/prisma.service', () => ({
jest.mock('../../../../prisma/prisma.service', () => ({
PrismaService: class {},
}));
jest.mock('#generated/prisma/client', () => ({ Prisma: {} }));
import { PrismaService } from '#src/prisma/prisma.service';
jest.mock('../../../../../generated/prisma/client', () => ({ Prisma: {} }));
import { PrismaService } from '../../../../prisma/prisma.service';
import { BankCardsRepository } from '../infrastructure/bank-cards.repository';
import { GetBankSummaryUseCase } from './get-bank-summary.use-case';
src/modules/banking/bank-cards/domain/bank-card.calculations.ts
+1 -2
View File
@@ -1,5 +1,4 @@
import { ISO_DATE_LENGTH, ISO_DATE_START } from '#src/common/time';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '../../../../common/time';
import { BankOperationKind } from './bank-operation-kind';
import { ZERO_KOPECKS } from './rub-money';
src/modules/banking/bank-cards/domain/bank-operation.rules.spec.ts
-141
View File
@@ -1,141 +0,0 @@
import { BankOperationKind } from './bank-operation-kind';
import {
operationFieldConflict,
OperationFieldRule,
operationKindChanged,
} from './bank-operation.rules';
const cardId = 'card-1';
function fields(
overrides: Partial<Parameters<typeof operationFieldConflict>[0]> = {},
) {
return { kind: BankOperationKind.Topup, cardId, ...overrides };
}
describe('operationFieldConflict', () => {
it('allows a valid topup', () => {
expect(operationFieldConflict(fields())).toBeNull();
});
it('rejects a topup with a purchase link', () => {
expect(
operationFieldConflict(
fields({ originalExpenseId: 'op-1' }),
),
).toBe(OperationFieldRule.InvalidCombination);
});
it('rejects a non-transfer with a target card', () => {
expect(
operationFieldConflict(fields({ targetCardId: 'card-2' })),
).toBe(OperationFieldRule.InvalidCombination);
});
describe('expense', () => {
it('allows the default category to be resolved by the service', () => {
expect(
operationFieldConflict(
fields({ kind: BankOperationKind.Expense }),
),
).toBeNull();
});
it('rejects a purchase link', () => {
expect(
operationFieldConflict(
fields({
kind: BankOperationKind.Expense,
categoryId: 'cat-1',
originalExpenseId: 'op-1',
}),
),
).toBe(OperationFieldRule.InvalidCombination);
});
it('allows a plain categorized expense', () => {
expect(
operationFieldConflict(
fields({ kind: BankOperationKind.Expense, categoryId: 'cat-1' }),
),
).toBeNull();
});
});
describe('transfer', () => {
it('requires a target card', () => {
expect(
operationFieldConflict(fields({ kind: BankOperationKind.Transfer })),
).toBe(OperationFieldRule.MissingTargetCard);
});
it('rejects a transfer to the same card', () => {
expect(
operationFieldConflict(
fields({
kind: BankOperationKind.Transfer,
targetCardId: cardId,
}),
),
).toBe(OperationFieldRule.SameTargetCard);
});
it('rejects a transfer with a category or purchase link', () => {
expect(
operationFieldConflict(
fields({
kind: BankOperationKind.Transfer,
targetCardId: 'card-2',
categoryId: 'cat-1',
}),
),
).toBe(OperationFieldRule.InvalidCombination);
expect(
operationFieldConflict(
fields({
kind: BankOperationKind.Transfer,
targetCardId: 'card-2',
originalExpenseId: 'op-1',
}),
),
).toBe(OperationFieldRule.InvalidCombination);
});
});
describe('refund', () => {
it('requires a purchase link', () => {
expect(
operationFieldConflict(fields({ kind: BankOperationKind.Refund })),
).toBe(OperationFieldRule.MissingOriginalExpense);
});
it('rejects a category', () => {
expect(
operationFieldConflict(
fields({
kind: BankOperationKind.Refund,
originalExpenseId: 'op-1',
categoryId: 'cat-1',
}),
),
).toBe(OperationFieldRule.InvalidCombination);
});
it('allows a linked refund', () => {
expect(
operationFieldConflict(
fields({ kind: BankOperationKind.Refund, originalExpenseId: 'op-1' }),
),
).toBeNull();
});
});
});
describe('operationKindChanged', () => {
it('flags kind and purchase link changes', () => {
expect(operationKindChanged('expense', 'expense', 'op-1', 'op-1')).toBe(false);
expect(operationKindChanged('expense', 'refund', null, null)).toBe(true);
expect(operationKindChanged('refund', 'refund', 'op-1', null)).toBe(true);
expect(operationKindChanged('refund', 'refund', null, 'op-1')).toBe(true);
});
});
src/modules/banking/bank-cards/domain/bank-operation.rules.ts
-79
View File
@@ -1,79 +0,0 @@
import { BankOperationKind } from './bank-operation-kind';
export type OperationFields = {
cardId: string;
categoryId?: null | string;
kind: BankOperationKind;
originalExpenseId?: null | string;
targetCardId?: null | string;
};
export enum OperationFieldRule {
InvalidCombination = 'invalidCombination',
MissingOriginalExpense = 'missingOriginalExpense',
MissingTargetCard = 'missingTargetCard',
SameTargetCard = 'sameTargetCard',
}
function transferConflict(fields: OperationFields): null | OperationFieldRule {
if (!fields.targetCardId) {
return OperationFieldRule.MissingTargetCard;
}
if (fields.targetCardId === fields.cardId) {
return OperationFieldRule.SameTargetCard;
}
if (fields.categoryId || fields.originalExpenseId) {
return OperationFieldRule.InvalidCombination;
}
return null;
}
function expenseConflict(fields: OperationFields): null | OperationFieldRule {
if (fields.originalExpenseId) {
return OperationFieldRule.InvalidCombination;
}
// Expense without a category uses the user's default category in the service.
return null;
}
function refundConflict(fields: OperationFields): null | OperationFieldRule {
return fields.originalExpenseId
? null
: OperationFieldRule.MissingOriginalExpense;
}
/**
* Pure kind/field compatibility rules for bank operations; no Prisma or Nest.
* Returns the first violated rule, or null when the combination is allowed.
*/
export function operationFieldConflict(
fields: OperationFields,
): null | OperationFieldRule {
if (fields.kind === BankOperationKind.Transfer) {
return transferConflict(fields);
}
if (fields.targetCardId) return OperationFieldRule.InvalidCombination;
if (fields.kind === BankOperationKind.Expense) {
return expenseConflict(fields);
}
if (fields.categoryId) return OperationFieldRule.InvalidCombination;
if (fields.kind === BankOperationKind.Refund) {
return refundConflict(fields);
}
// Topup: no target, no category, no purchase link.
return fields.originalExpenseId
? OperationFieldRule.InvalidCombination
: null;
}
export function operationKindChanged(
oldKind: string,
newKind: string,
oldOriginalExpenseId: null | string,
newOriginalExpenseId: null | string,
): boolean {
return (
oldKind !== newKind ||
oldOriginalExpenseId !== newOriginalExpenseId
);
}
src/modules/banking/bank-cards/domain/rub-money.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import type { Money } from '#src/common/money.types';
import type { Money } from '../../../../common/money.types';
import { DECIMAL_RADIX, decimalFromString, formatDecimal } from '#src/common/decimal';
import { DECIMAL_RADIX, decimalFromString, formatDecimal } from '../../../../common/decimal';
export const ZERO_KOPECKS = 0n;
src/modules/banking/bank-cards/infrastructure/bank-cards.repository.ts
+3 -223
View File
@@ -1,24 +1,18 @@
import { Injectable } from '@nestjs/common';
import { randomUUID } from 'node:crypto';
import { BankCard, BankCardOperation, Prisma } from '#generated/prisma/client';
import { isPrismaErrorCode, PrismaErrorCode } from '#src/prisma/prisma-error-code';
import { PrismaService } from '#src/prisma/prisma.service';
import { Prisma } from '../../../../../generated/prisma/client';
import { isPrismaErrorCode, PrismaErrorCode } from '../../../../prisma/prisma-error-code';
import { PrismaService } from '../../../../prisma/prisma.service';
import {
BankErrorCode,
conflict,
missing,
} from '../application/bank-card-input';
import { FIRST_PAGE } from '../domain/bank-card-limits';
import { BankOperationKind } from '../domain/bank-operation-kind';
const INITIAL_RETRY_COUNT = 0;
const LAST_SEED_OFFSET = 1;
const EXPECTED_UPDATED_CARDS = 1;
const EXPECTED_UPDATED_OPERATIONS = 1;
const EXPECTED_UPDATED_CATEGORIES = 1;
const VERSION_INCREMENT = 1;
type Tx = Prisma.TransactionClient;
const TRANSACTION_MAX_WAIT_MS = 10_000;
@@ -38,220 +32,6 @@ const seeds = [
@Injectable()
export class BankCardsRepository {
constructor(private readonly prisma: PrismaService) {}
read<T>(run: (tx: Tx) => Promise<T>): Promise<T> {
return this.prisma.$transaction(run);
}
cards(tx: Tx, userId: string, includeArchived = false) {
return tx.bankCard.findMany({
where: { userId, ...(includeArchived ? {} : { archivedAt: null }) },
orderBy: [{ createdAt: 'asc' }, { id: 'asc' }],
});
}
cardOperations(tx: Tx, card: BankCard) {
return tx.bankCardOperation.findMany({
where: {
userId: card.userId,
deletedAt: null,
OR: [{ cardId: card.id }, { targetCardId: card.id }],
},
});
}
operationById(tx: Tx, id: string) {
return tx.bankCardOperation.findUnique({ where: { id } });
}
createOperation(tx: Tx, data: Prisma.BankCardOperationUncheckedCreateInput) {
return tx.bankCardOperation.create({ data });
}
async updateOperation(
tx: Tx,
where: Prisma.BankCardOperationWhereInput,
data: Prisma.BankCardOperationUpdateManyMutationInput,
) {
const result = await tx.bankCardOperation.updateMany({ where, data });
if (result.count !== EXPECTED_UPDATED_OPERATIONS) conflict();
}
category(tx: Tx, userId: string, id: string) {
return tx.expenseCategory.findFirst({ where: { id, userId } });
}
defaultCategory(tx: Tx, userId: string) {
return tx.expenseCategory.findUnique({
where: { userId_seedKey: { userId, seedKey: 'other' } },
});
}
refunds(tx: Tx, userId: string, originalExpenseId: string, excludeId?: string) {
return tx.bankCardOperation.findMany({
where: {
userId,
originalExpenseId,
deletedAt: null,
...(excludeId ? { id: { not: excludeId } } : {}),
},
});
}
dependentRefund(tx: Tx, userId: string, originalExpenseId: string) {
return tx.bankCardOperation.findFirst({
where: { userId, originalExpenseId, deletedAt: null },
});
}
async operationViewData(tx: Tx, userId: string, rows: BankCardOperation[]) {
const cardIds = new Set(rows.flatMap((row) =>
[row.cardId, row.targetCardId].filter((id): id is string => id !== null),
));
const sourceIds = new Set(rows.flatMap((row) =>
row.originalExpenseId ? [row.originalExpenseId] : [],
));
const [cards, sources] = await Promise.all([
tx.bankCard.findMany({ where: { userId, id: { in: [...cardIds] } } }),
tx.bankCardOperation.findMany({ where: { userId, id: { in: [...sourceIds] } } }),
]);
const categoryIds = new Set(rows.map((row) =>
sources.find((source) => source.id === row.originalExpenseId)?.categoryId ?? row.categoryId,
).filter((id): id is string => id !== null));
const expenseIds = new Set(rows.flatMap((row) => {
const source = sources.find((item) => item.id === row.originalExpenseId);
return row.kind === BankOperationKind.Expense || source ? [source?.id ?? row.id] : [];
}));
const [categories, refunds] = await Promise.all([
tx.expenseCategory.findMany({ where: { userId, id: { in: [...categoryIds] } } }),
tx.bankCardOperation.findMany({
where: { userId, originalExpenseId: { in: [...expenseIds] }, deletedAt: null },
}),
]);
return { cards, sources, categories, refunds };
}
async operationPage(
tx: Tx,
userId: string,
id: string,
period: undefined | { from: string; to: string },
limit: number,
page: number,
) {
const where: Prisma.BankCardOperationWhereInput = {
userId,
deletedAt: null,
OR: [{ cardId: id }, { targetCardId: id }],
...(period
? { date: { gte: period.from, lte: period.to } }
: { kind: BankOperationKind.Expense }),
};
const total = await tx.bankCardOperation.count({ where });
const rows = await tx.bankCardOperation.findMany({
where,
orderBy: [{ date: 'desc' }, { createdAt: 'desc' }, { id: 'desc' }],
skip: (page - FIRST_PAGE) * limit,
take: limit,
});
return { total, rows };
}
cardById(tx: Tx, id: string) {
return tx.bankCard.findUnique({ where: { id } });
}
createCard(tx: Tx, data: Prisma.BankCardUncheckedCreateInput) {
return tx.bankCard.create({ data });
}
async updateCard(
tx: Tx,
userId: string,
id: string,
version: number,
data: Prisma.BankCardUpdateManyMutationInput,
) {
const changed = await tx.bankCard.updateMany({
where: { id, userId, version },
data,
});
if (changed.count !== EXPECTED_UPDATED_CARDS) conflict();
return this.card(tx, userId, id);
}
hasOperationsBefore(tx: Tx, userId: string, id: string, openingDate: string) {
return tx.bankCardOperation.findFirst({
where: {
userId,
deletedAt: null,
date: { lt: openingDate },
OR: [{ cardId: id }, { targetCardId: id }],
},
});
}
async categories(userId: string) {
return (
await this.prisma.expenseCategory.findMany({
where: { userId },
orderBy: [{ name: 'asc' }, { id: 'asc' }],
})
).map(({ id, name, seedKey, version }) => ({
id,
name,
isDefault: seedKey === 'other',
version,
}));
}
createCategory(userId: string, label: string) {
return this.write(async (tx) => {
await this.seed(tx, userId);
const row = await tx.expenseCategory.create({
data: {
id: randomUUID(),
userId,
name: label,
nameKey: label.toLocaleLowerCase('ru-RU'),
},
});
return {
id: row.id,
name: row.name,
isDefault: false,
version: row.version,
};
});
}
updateCategory(userId: string, id: string, label: string, version: number) {
return this.write(async (tx) => {
const row = await tx.expenseCategory.findFirst({ where: { id, userId } });
if (!row) missing();
if (
(
await tx.expenseCategory.updateMany({
where: { id, userId, version },
data: {
name: label,
nameKey: label.toLocaleLowerCase('ru-RU'),
version: { increment: 1 },
},
})
).count !== EXPECTED_UPDATED_CATEGORIES
) {
conflict();
}
return {
id,
name: label,
isDefault: row.seedKey === 'other',
version: version + VERSION_INCREMENT,
};
});
}
async write<T>(run: (tx: Tx) => Promise<T>): Promise<T> {
for (let attempt = INITIAL_RETRY_COUNT; ; attempt++) {
try {
src/modules/banking/bank-cards/presentation/bank-card.dto.ts
+1 -46
View File
@@ -1,7 +1,6 @@
import {
ApiProperty,
ApiPropertyOptional,
getSchemaPath,
IntersectionType,
OmitType,
PartialType,
@@ -24,8 +23,7 @@ import {
ValidateNested,
} from 'class-validator';
import { MoneyDto } from '#src/common/money.dto';
import { MoneyDto } from '../../../../common/money.dto';
import {
FIRST_PAGE,
MAX_CARD_NAME_LENGTH,
@@ -155,49 +153,6 @@ export class CreateBankOperationDto {
@MaxLength(MAX_OPERATION_DESCRIPTION_LENGTH)
description?: string;
}
// OpenAPI-only variants. Runtime validation stays on CreateBankOperationDto so
// invalid combinations keep the existing BANK_INVALID_INPUT response.
class BankOperationCreateBaseDto extends OmitType(CreateBankOperationDto, [
'kind', 'targetCardId', 'categoryId', 'originalExpenseId',
] as const) {}
export class CreateExpenseOperationDto extends BankOperationCreateBaseDto {
@ApiProperty({ enum: [BankOperationKind.Expense] }) declare kind: 'expense';
@ApiPropertyOptional({ format: 'uuid' }) declare categoryId?: string;
}
export class CreateTopupOperationDto extends BankOperationCreateBaseDto {
@ApiProperty({ enum: [BankOperationKind.Topup] }) declare kind: 'topup';
}
export class CreateTransferOperationDto extends BankOperationCreateBaseDto {
@ApiProperty({ enum: [BankOperationKind.Transfer] }) declare kind: 'transfer';
@ApiProperty({ format: 'uuid' }) declare targetCardId: string;
}
export class CreateRefundOperationDto extends BankOperationCreateBaseDto {
@ApiProperty({ enum: [BankOperationKind.Refund] }) declare kind: 'refund';
@ApiProperty({ format: 'uuid' }) declare originalExpenseId: string;
}
export const createBankOperationSchema = {
oneOf: [
CreateExpenseOperationDto,
CreateTopupOperationDto,
CreateTransferOperationDto,
CreateRefundOperationDto,
].map((model) => ({ $ref: getSchemaPath(model) })),
discriminator: {
propertyName: 'kind',
mapping: {
expense: getSchemaPath(CreateExpenseOperationDto),
topup: getSchemaPath(CreateTopupOperationDto),
transfer: getSchemaPath(CreateTransferOperationDto),
refund: getSchemaPath(CreateRefundOperationDto),
},
},
};
export class UpdateBankOperationDto extends PartialType(
OmitType(CreateBankOperationDto, ['id'] as const),
{ skipNullProperties: false },
src/modules/banking/bank-cards/presentation/bank-cards.controller.ts
+2 -17
View File
@@ -16,9 +16,7 @@ import {
} from '@nestjs/common';
import {
ApiBearerAuth,
ApiBody,
ApiCreatedResponse,
ApiExtraModels,
ApiNoContentResponse,
ApiOkResponse,
ApiResponse,
@@ -29,9 +27,8 @@ import {
import {
ApiProblemResponses,
ProblemDetailsDto,
} from '#src/common/decorators/api-safe-error-response.decorator';
import { AccessPayload, JwtAuthGuard } from '#src/modules/auth/auth.api';
} from '../../../../common/decorators/api-safe-error-response.decorator';
import { AccessPayload, JwtAuthGuard } from '../../../auth/auth.api';
import { BankCardsService } from '../application/bank-cards.service';
import { BankOperationsService } from '../application/bank-operations.service';
import { ExpenseCategoriesService } from '../application/expense-categories.service';
@@ -49,11 +46,6 @@ import {
CategoryNameDto,
CreateBankCardDto,
CreateBankOperationDto,
createBankOperationSchema,
CreateExpenseOperationDto,
CreateRefundOperationDto,
CreateTopupOperationDto,
CreateTransferOperationDto,
ExpenseCategoryDto,
UpdateBankCardDto,
UpdateBankOperationDto,
@@ -81,12 +73,6 @@ type AuthRequest = Request & { user: AccessPayload };
},
})
@ApiTags('bank-cards')
@ApiExtraModels(
CreateExpenseOperationDto,
CreateTopupOperationDto,
CreateTransferOperationDto,
CreateRefundOperationDto,
)
@ApiBearerAuth()
@ApiProblemResponses()
@UseGuards(JwtAuthGuard)
@@ -145,7 +131,6 @@ export class BankCardsController {
}
@Post('operations')
@ApiBody({ schema: createBankOperationSchema })
@ApiCreatedResponse({ type: BankOperationDto })
createOperation(
@Req() req: AuthRequest,
src/modules/investments/brokerage-accounts/brokerage-account.dto.ts
+1 -2
View File
@@ -1,7 +1,6 @@
import { ApiProperty } from '@nestjs/swagger';
import { MoneyDto } from '#src/common/money.dto';
import { MoneyDto } from '../../../common/money.dto';
import { InvestmentResourceMetaDto } from '../investment-resource.dto';
import { PortfolioStructureDto } from '../portfolio/portfolio.api';
import { HourlySyncStatusDto } from '../tbank-sync/tbank-sync.dto';
src/modules/investments/brokerage-accounts/brokerage-accounts.controller.ts
+1 -2
View File
@@ -3,8 +3,7 @@ import type { Request } from 'express';
import { Controller, Get, Req, UseGuards } from '@nestjs/common';
import { ApiBearerAuth, ApiOkResponse, ApiTags } from '@nestjs/swagger';
import { ApiProblemResponses } from '#src/common/decorators/api-safe-error-response.decorator';
import { ApiProblemResponses } from '../../../common/decorators/api-safe-error-response.decorator';
import { AccessPayload, JwtAuthGuard } from '../../auth/auth.api';
import { BrokerageAccountsResourceDto } from './brokerage-account.dto';
import { BrokerageAccountsService } from './brokerage-accounts.service';
src/modules/investments/brokerage-accounts/brokerage-accounts.module.ts
+1 -2
View File
@@ -1,7 +1,6 @@
import { Module } from '@nestjs/common';
import { TbankModule } from '#src/integrations/tbank/tbank.module';
import { TbankModule } from '../../../integrations/tbank/tbank.module';
import { AuthModule } from '../../auth/auth.module';
import { PortfolioModule } from '../portfolio/portfolio.module';
import { TbankSyncRepositoryModule } from '../tbank-sync/tbank-sync-repository.module';
src/modules/investments/brokerage-accounts/brokerage-accounts.service.spec.ts
+1 -1
View File
@@ -1,4 +1,4 @@
jest.mock('#src/prisma/prisma.service', () => ({
jest.mock('../../../prisma/prisma.service', () => ({
PrismaService: class {},
}));
import { investmentResourceMeta } from '../investment-resource.mapper';
src/modules/investments/brokerage-accounts/brokerage-accounts.service.ts
+1 -2
View File
@@ -7,8 +7,7 @@ import {
formatDecimal,
isZero,
multiply,
} from '#src/common/decimal';
} from '../../../common/decimal';
import { investmentResourceMeta } from '../investment-resource.mapper';
import { sumMoneyByCurrency } from '../portfolio/domain/portfolio-totals';
import { PortfolioPositionDto, PortfolioService } from '../portfolio/portfolio.api';
src/modules/investments/income/income-analytics.controller.ts
+8 -2
View File
@@ -3,9 +3,9 @@ import type { Request } from 'express';
import { Controller, Get, Param, Query, Req, UseGuards } from '@nestjs/common';
import { ApiBearerAuth, ApiOkResponse, ApiTags } from '@nestjs/swagger';
import { ApiProblemResponses } from '#src/common/decorators/api-safe-error-response.decorator';
import { ApiProblemResponses } from '../../../common/decorators/api-safe-error-response.decorator';
import { AccessPayload, JwtAuthGuard } from '../../auth/auth.api';
import { InvestmentReadQueryDto } from '../investment-resource.dto';
import {
IncomeAnalyticsQueryDto,
IncomeAnalyticsResourceDto,
@@ -25,10 +25,12 @@ export class IncomeAnalyticsController {
@ApiOkResponse({ type: IncomeSummaryResourceDto })
allSummary(
@Req() request: Request & { user: AccessPayload },
@Query() query: InvestmentReadQueryDto,
) {
return this.income.summary(
request.user.sub,
'all',
query.sync === 'observe',
);
}
@@ -43,6 +45,7 @@ export class IncomeAnalyticsController {
'all',
query.from,
query.to,
query.sync === 'observe',
);
}
@@ -51,10 +54,12 @@ export class IncomeAnalyticsController {
summary(
@Req() request: Request & { user: AccessPayload },
@Param('accountId') accountId: string,
@Query() query: InvestmentReadQueryDto,
) {
return this.income.summary(
request.user.sub,
accountId,
query.sync === 'observe',
);
}
@@ -70,6 +75,7 @@ export class IncomeAnalyticsController {
accountId,
query.from,
query.to,
query.sync === 'observe',
);
}
}
src/modules/investments/income/income-analytics.dto.ts
+3 -3
View File
@@ -1,17 +1,17 @@
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import { IsOptional, Matches } from 'class-validator';
import { MoneyDto } from '#src/common/money.dto';
import { MoneyDto } from '../../../common/money.dto';
import {
InvestmentDependencyDto,
InvestmentReadQueryDto,
InvestmentResourceMetaDto,
} from '../investment-resource.dto';
import { BrokerageOperationDto } from '../operations/operations.api';
const dateOnly = /^\d{4}-\d{2}-\d{2}$/;
export class IncomeAnalyticsQueryDto {
export class IncomeAnalyticsQueryDto extends InvestmentReadQueryDto {
@ApiPropertyOptional({
format: 'date',
description:
src/modules/investments/income/income-analytics.service.spec.ts
+1 -1
View File
@@ -1,4 +1,4 @@
jest.mock('#src/prisma/prisma.service', () => ({
jest.mock('../../../prisma/prisma.service', () => ({
PrismaService: class {},
}));
jest.mock('../operations/application/brokerage-operations.service', () => ({
src/modules/investments/income/income-analytics.service.ts
+6 -3
View File
@@ -6,9 +6,8 @@ import {
compare,
decimalFromString,
formatDecimal,
} from '#src/common/decimal';
import { isTbankProtocolValue, TbankOperationType } from '#src/integrations/tbank/tbank-protocol';
} from '../../../common/decimal';
import { isTbankProtocolValue, TbankOperationType } from '../../../integrations/tbank/tbank-protocol';
import { DateOnlyRange, moscowDate } from '../investment-calendar';
import { investmentResourceMeta } from '../investment-resource.mapper';
import {
@@ -44,12 +43,14 @@ export class IncomeAnalyticsService {
async summary(
userId: string,
accountId: string,
observe = false,
): Promise<IncomeSummaryResourceDto> {
const plan = planIncomePeriod(undefined, undefined);
const [selected] = await this.operations.collectRanges(
userId,
accountId,
() => [plan.selected],
observe,
);
if (selected.items === null) return { data: null, meta: selected.meta };
assert(selected.meta.lastSuccessfulAt);
@@ -69,12 +70,14 @@ export class IncomeAnalyticsService {
accountId: string,
from: string | undefined,
to: string | undefined,
observe = false,
): Promise<IncomeAnalyticsResourceDto> {
const plan = planIncomePeriod(from, to);
const [current] = await this.operations.collectRanges(
userId,
accountId,
() => [plan.selected],
observe,
);
const dependencies: IncomeDependencyDto[] = [
{ ...current.meta, role: 'selected' },
src/modules/investments/income/income-period.ts
+1 -2
View File
@@ -1,7 +1,6 @@
import { BadRequestException } from '@nestjs/common';
import { ISO_DATE_LENGTH, ISO_DATE_START, MILLISECONDS_PER_DAY } from '#src/common/time';
import { ISO_DATE_LENGTH, ISO_DATE_START, MILLISECONDS_PER_DAY } from '../../../common/time';
import {
DateOnlyRange,
dateParts,
src/modules/investments/instruments/application/candle.service.spec.ts
+1 -1
View File
@@ -4,7 +4,7 @@ jest.mock('../infrastructure/candle.repository', () => ({
jest.mock('./catalog-enrichment.service', () => ({
CatalogEnrichmentService: class {},
}));
jest.mock('#src/integrations/tbank/tbank.api', () => ({
jest.mock('../../../../integrations/tbank/tbank.api', () => ({
TbankAccessService: class {},
TbankClient: class {},
}));
src/modules/investments/instruments/application/candle.service.ts
+6 -7
View File
@@ -5,16 +5,15 @@ import {
} from '@nestjs/common';
import { randomUUID } from 'node:crypto';
import { StructuredLogger } from '#src/common/logging/structured-logger.service';
import { MILLISECONDS_PER_DAY } from '#src/common/time';
import { isTbankErrorCode, TbankErrorCode } from '#src/integrations/tbank/tbank-error-code';
import { StructuredLogger } from '../../../../common/logging/structured-logger.service';
import { MILLISECONDS_PER_DAY } from '../../../../common/time';
import { isTbankErrorCode, TbankErrorCode } from '../../../../integrations/tbank/tbank-error-code';
import {
TbankAccessService,
TbankClient,
type TbankShare,
type TbankSyncAttempt,
} from '#src/integrations/tbank/tbank.api';
} from '../../../../integrations/tbank/tbank.api';
import { investmentResourceMeta } from '../../investment-resource.mapper';
import {
candleGaps,
@@ -99,7 +98,7 @@ export class CandleService {
private readonly logger: StructuredLogger,
) {}
async read(userId: string, input: CandleInput) {
async read(userId: string, input: CandleInput, observe = false) {
const { revision } = await this.access.local(userId);
const [detail] = await this.sources.readMany(
userId,
@@ -119,7 +118,7 @@ export class CandleService {
const hasCompleteRange = Boolean(
range && saved && candleGaps(range, saved.coverage, now).length === NO_CANDLE_GAPS,
);
if (!saved || !hasCompleteRange) {
if (!observe && (!saved || !hasCompleteRange)) {
await this.request(userId, revision, input, now);
}
const work = await this.repository.work(userId, revision, scope(input));
src/modules/investments/instruments/application/catalog-discovery.service.ts
+203 -28
View File
@@ -8,15 +8,16 @@ import {
TbankAccessService,
TbankClient,
tbankSourceTtlMs,
} from '#src/integrations/tbank/tbank.api';
} from '../../../../integrations/tbank/tbank.api';
import { investmentResourceMeta } from '../../investment-resource.mapper';
import { InstrumentErrorCode } from '../domain/instrument-error-code';
import {
CatalogDiscoveryRepository,
catalogQuery,
type CatalogQuery,
catalogScope,
} from '../infrastructure/catalog-discovery.repository';
import { CatalogEnrichmentService } from './catalog-enrichment.service';
import {
catalogSearchLimit,
selectCatalogInstruments,
@@ -24,6 +25,7 @@ import {
import { publicInstrument } from './public-instrument';
const UNAMBIGUOUS_MATCH_COUNT = 1;
const NO_MATCHES = 0;
const FIRST_RESULT_OFFSET = 0;
const tickerAmbiguityLimit = 2;
@@ -31,56 +33,203 @@ const tickerAmbiguityLimit = 2;
@Injectable()
export class CatalogDiscoveryService {
constructor(
private readonly repository: CatalogDiscoveryRepository,
private readonly access: TbankAccessService,
private readonly tbank: TbankClient,
private readonly enrichment: CatalogEnrichmentService,
) {}
async search(userId: string, input: CatalogQuery) {
return this.onlineSearch(userId, catalogQuery(input));
async read(userId: string, input: CatalogQuery) {
input = catalogQuery(input);
const connection = await this.access.local(userId);
const saved = await this.repository.read(input);
return {
data: saved.data,
meta: investmentResourceMeta({
resourceKey: catalogScope(input),
dataRevision: saved.dataRevision,
availability: saved.data === null ? 'missing' : 'complete',
fetchedAt: saved.fetchedAt,
freshForMs: Number.MAX_SAFE_INTEGER,
work: await this.repository.work(userId, connection.revision, input),
}),
};
}
async search(userId: string, input: CatalogQuery, observe = false) {
if (!observe) return this.onlineSearch(userId, catalogQuery(input));
const discovery = await this.read(userId, input);
const sources = discovery.data
? await this.enrichment.readMany(
userId,
input.instrumentType,
discovery.data.map((item) => item.uid),
observe,
)
: [];
const dependencies = [
discovery.meta,
...sources.map((source) => source.meta),
];
return {
data:
discovery.data?.map((short) => ({
...short,
detail:
sources.find(
(source) =>
source.input.uid === short.uid &&
source.input.kind === 'detail',
)?.instrument ?? null,
price:
sources.find(
(source) =>
source.input.uid === short.uid &&
source.input.kind === 'last-price',
)?.price ?? null,
})) ?? null,
meta: investmentResourceMeta({
resourceKey: `search:${catalogScope(catalogQuery(input))}`,
dataRevision: dependencies
.map((dependency) => dependency.dataRevision)
.join('/'),
availability:
discovery.data === null
? 'missing'
: sources.every((source) => source.meta.completeness === 'complete')
? 'complete'
: 'partial',
fetchedAt: discovery.meta.lastSuccessfulAt
? new Date(discovery.meta.lastSuccessfulAt)
: null,
freshForMs: Number.MAX_SAFE_INTEGER,
work: discovery.meta.sync.id
? {
id: discovery.meta.sync.id,
state: discovery.meta.sync.state,
errorCode: discovery.meta.sync.errorCode,
}
: null,
dependencies,
}),
};
}
async detail(
userId: string,
instrumentType: 'bond' | 'share',
uid: string,
observe = false,
) {
const instrument = await this.access.online(userId, ({ token }) =>
instrumentType === 'share'
? this.tbank.getShare(token, uid)
: this.tbank.getBond(token, uid),
if (!observe) {
const instrument = await this.access.online(userId, ({ token }) =>
instrumentType === 'share'
? this.tbank.getShare(token, uid)
: this.tbank.getBond(token, uid),
);
if (!instrument) throw new NotFoundException();
return {
data: { ...publicInstrument({ ...instrument, uid }), uid, slug: instrument.ticker?.toUpperCase() ?? uid },
meta: investmentResourceMeta({
resourceKey: `${instrumentType}/detail/${uid}`,
dataRevision: `online:${Date.now()}`,
availability: 'complete',
fetchedAt: new Date(),
freshForMs: tbankSourceTtlMs.portfolio,
work: null,
}),
};
}
const sources = await this.enrichment.readMany(
userId,
instrumentType,
[uid],
observe,
['detail'],
);
if (!instrument) throw new NotFoundException();
const source = sources[0];
if (source.meta.completeness === 'complete' && !source.instrument) {
throw new NotFoundException();
}
const instrument = source.instrument;
let slug = uid;
const dependencies = [source.meta];
if (
instrument?.ticker &&
/^[A-Z0-9][\w.@+-]{0,79}$/i.test(instrument.ticker)
) {
const alias = await this.read(userId, {
instrumentType,
query: instrument.ticker,
exactTicker: true,
});
if (alias.data?.length === UNAMBIGUOUS_MATCH_COUNT && alias.data[0].uid === uid) {
slug = instrument.ticker.toUpperCase();
}
dependencies.push(alias.meta);
}
return {
data: { ...publicInstrument({ ...instrument, uid }), uid, slug: instrument.ticker?.toUpperCase() ?? uid },
data: instrument ? { ...instrument, uid, slug } : null,
meta: investmentResourceMeta({
resourceKey: `${instrumentType}/detail/${uid}`,
dataRevision: `online:${Date.now()}`,
availability: 'complete',
fetchedAt: new Date(),
dataRevision: dependencies
.map((dependency) => dependency.dataRevision)
.join('/'),
availability: source.meta.availability,
fetchedAt: source.meta.lastSuccessfulAt
? new Date(source.meta.lastSuccessfulAt)
: null,
freshForMs: tbankSourceTtlMs.portfolio,
work: null,
work: source.meta.sync.id
? {
id: source.meta.sync.id,
state: source.meta.sync.state,
errorCode: source.meta.sync.errorCode,
}
: null,
dependencies,
}),
};
}
// eslint-disable-next-line sonarjs/cognitive-complexity -- Online and observe paths intentionally preserve distinct error semantics.
async byTicker(
userId: string,
instrumentType: 'bond' | 'share',
ticker: string,
observe = false,
) {
const query = ticker.trim().toUpperCase();
const found = await this.access.online(userId, ({ token }) =>
instrumentType === 'share'
? this.tbank.findShares(token, query)
: this.tbank.findBonds(token, query),
);
const matches = selectCatalogInstruments(
found.filter((item) => item.ticker?.trim().toUpperCase() === query),
query,
if (!observe) {
const query = ticker.trim().toUpperCase();
const found = await this.access.online(userId, ({ token }) =>
instrumentType === 'share'
? this.tbank.findShares(token, query)
: this.tbank.findBonds(token, query),
);
const matches = selectCatalogInstruments(
found.filter((item) => item.ticker?.trim().toUpperCase() === query),
query,
instrumentType,
).slice(FIRST_RESULT_OFFSET, tickerAmbiguityLimit);
if (!matches.length) throw new NotFoundException();
if (matches.length > UNAMBIGUOUS_MATCH_COUNT) {
throw new ConflictException({
code:
instrumentType === 'share'
? InstrumentErrorCode.StockTickerAmbiguous
: InstrumentErrorCode.BondTickerAmbiguous,
});
}
const result = await this.detail(userId, instrumentType, matches[0].uid);
return { ...result, data: result.data ? { ...result.data, slug: query } : null };
}
const lookup = await this.read(userId, {
instrumentType,
).slice(FIRST_RESULT_OFFSET, tickerAmbiguityLimit);
if (!matches.length) throw new NotFoundException();
if (matches.length > UNAMBIGUOUS_MATCH_COUNT) {
query: ticker,
exactTicker: true,
});
if (lookup.data?.length === NO_MATCHES) throw new NotFoundException();
if (lookup.data && lookup.data.length > UNAMBIGUOUS_MATCH_COUNT) {
throw new ConflictException({
code:
instrumentType === 'share'
@@ -88,8 +237,34 @@ export class CatalogDiscoveryService {
: InstrumentErrorCode.BondTickerAmbiguous,
});
}
const result = await this.detail(userId, instrumentType, matches[0].uid);
return { ...result, data: result.data ? { ...result.data, slug: query } : null };
const result = lookup.data
? await this.detail(userId, instrumentType, lookup.data[0].uid, observe)
: null;
const dependencies = [lookup.meta, ...(result ? [result.meta] : [])];
return {
data: result?.data
? { ...result.data, slug: ticker.trim().toUpperCase() }
: null,
meta: investmentResourceMeta({
resourceKey: `${instrumentType}/ticker/${ticker.trim().toUpperCase()}`,
dataRevision: dependencies
.map((dependency) => dependency.dataRevision)
.join('/'),
availability: result?.meta.availability ?? 'missing',
fetchedAt: lookup.meta.lastSuccessfulAt
? new Date(lookup.meta.lastSuccessfulAt)
: null,
freshForMs: tbankSourceTtlMs.portfolio,
work: lookup.meta.sync.id
? {
id: lookup.meta.sync.id,
state: lookup.meta.sync.state,
errorCode: lookup.meta.sync.errorCode,
}
: null,
dependencies,
}),
};
}
private async onlineSearch(userId: string, input: CatalogQuery) {
src/modules/investments/instruments/application/catalog-enrichment.service.ts
+231 -30
View File
@@ -1,26 +1,43 @@
import { Injectable, NotFoundException } from '@nestjs/common';
import { randomUUID } from 'node:crypto';
import { StructuredLogger } from '#src/common/logging/structured-logger.service';
import { isTbankErrorCode, TbankErrorCode } from '#src/integrations/tbank/tbank-error-code';
import {
decimalFromString,
divide,
} from '../../../../common/decimal';
import { StructuredLogger } from '../../../../common/logging/structured-logger.service';
import {
MILLISECONDS_PER_DAY,
MILLISECONDS_PER_SECOND,
} from '../../../../common/time';
import { type MoexBondEvent, MoexClient } from '../../../../integrations/moex/moex.api';
import { NcrRatingsClient } from '../../../../integrations/ncr/ncr.api';
import { isTbankErrorCode, TbankErrorCode } from '../../../../integrations/tbank/tbank-error-code';
import {
TbankAccessService,
type TbankBond,
type TbankCandle,
TbankClient,
TbankLastPrice,
type TbankCoupon,
type TbankDividend,
type TbankFundamentals,
type TbankLastPrice,
type TbankShare,
tbankSourceNeedsRefresh,
tbankSourceTtlMs,
type TbankSyncAttempt,
} from '#src/integrations/tbank/tbank.api';
} from '../../../../integrations/tbank/tbank.api';
import { investmentResourceMeta } from '../../investment-resource.mapper';
import { candleGaps, utcDay } from '../domain/candle-coverage';
import { CandleRepository } from '../infrastructure/candle.repository';
import {
CatalogDiscoveryRepository,
catalogScope,
type CatalogSource,
} from '../infrastructure/catalog-discovery.repository';
import { type CatalogPayload, CatalogSourceLoader } from './catalog-source.loader';
export type { CatalogPayload } from './catalog-source.loader';
import { toSavedCandle } from '../infrastructure/tbank-candle.mapper';
import { catalogSearchLimit } from './catalog-selection';
import { previousClose, timestamp } from './instrument-market';
import { publicInstrument } from './public-instrument';
const MISSING_DATA_REVISION = 0;
@@ -76,7 +93,9 @@ export class CatalogEnrichmentService {
private readonly access: TbankAccessService,
private readonly tbank: TbankClient,
private readonly logger: StructuredLogger,
private readonly loader: CatalogSourceLoader,
private readonly moex: MoexClient,
private readonly ratings: NcrRatingsClient,
private readonly candles: CandleRepository,
) {}
async readMany(
@@ -91,7 +110,6 @@ export class CatalogEnrichmentService {
tickers?: Record<string, string>;
to: string;
},
refreshBefore?: Date,
) {
const { revision } = await this.access.local(userId);
const inputs = sourceInputs(instrumentType, uids, kinds, range);
@@ -105,7 +123,6 @@ export class CatalogEnrichmentService {
false,
kinds,
range,
refreshBefore,
);
}
const work = inputs.length
@@ -158,7 +175,6 @@ export class CatalogEnrichmentService {
tickers?: Record<string, string>;
to: string;
},
refreshBefore?: Date,
) {
const inputs = sourceInputs(instrumentType, uids, kinds, range);
const reservation = this.reservations.then(async () => {
@@ -173,9 +189,7 @@ export class CatalogEnrichmentService {
);
const policy = sourcePolicy(input.kind);
const needsRefresh = force || !row?.fetchedAt ||
(policy === 'quote' && tbankSourceNeedsRefresh('quote', row.fetchedAt, new Date())) ||
// A walk reads a saved calendar once: later accounts see the new fetchedAt.
(policy === 'calendar' && refreshBefore !== undefined && row.fetchedAt < refreshBefore);
(policy === 'quote' && tbankSourceNeedsRefresh('quote', row.fetchedAt, new Date()));
if (!needsRefresh) {
continue;
}
@@ -222,8 +236,9 @@ export class CatalogEnrichmentService {
instrumentType: 'bond' | 'share',
uid: string,
section: 'company' | 'metrics' | 'quote',
observe = false,
) {
if (section === 'company') {
if (section === 'company' && !observe) {
const { description, fundamentals, instrument } = await this.access.online(userId, async ({ token }) => {
const instrument =
instrumentType === 'share'
@@ -253,22 +268,25 @@ export class CatalogEnrichmentService {
observedAt: meta.lastSuccessfulAt ?? new Date().toISOString(),
};
}
const kinds: CatalogSource['kind'][] = [
...(instrumentType === 'bond'
? ['bond-current' as const]
: ['detail' as const]),
'last-price',
'trading-status',
'comparison',
...(section === 'metrics'
? ['coupons' as const, 'yield' as const, 'rating' as const]
: []),
];
const kinds: CatalogSource['kind'][] =
section === 'company'
? ['detail', 'description', 'fundamentals']
: [
...(instrumentType === 'bond'
? ['bond-current' as const]
: ['detail' as const]),
'last-price',
'trading-status',
'comparison',
...(section === 'metrics'
? ['coupons' as const, 'yield' as const, 'rating' as const]
: []),
];
const sources = await this.readMany(
userId,
instrumentType,
[uid],
false,
observe,
kinds,
);
const first = sources[0];
@@ -296,7 +314,7 @@ export class CatalogEnrichmentService {
fetchedAt: first.meta.lastSuccessfulAt
? new Date(first.meta.lastSuccessfulAt)
: null,
freshForMs: tbankSourceTtlMs.quote,
freshForMs: section === 'company' ? Number.MAX_SAFE_INTEGER : tbankSourceTtlMs.quote,
work: null,
dependencies,
});
@@ -314,6 +332,169 @@ export class CatalogEnrichmentService {
};
}
// eslint-disable-next-line sonarjs/cognitive-complexity -- Source loading intentionally dispatches by persisted resource kind.
private async load(
input: CatalogSource,
token: string,
attempt: TbankSyncAttempt,
): Promise<CatalogPayload> {
if (input.kind === 'detail' || input.kind === 'bond-current') {
const instrument =
input.instrumentType === 'share'
? await this.tbank.getShare(token, input.uid)
: await this.tbank.getBond(token, input.uid);
if (instrument && instrument.uid !== input.uid) {
throw new Error('Catalog UID mismatch');
}
// eslint-disable-next-line sonarjs/different-types-comparison -- Defensive validation rejects missing upstream payloads instead of caching them as absence.
if (instrument === undefined) throw new Error('Missing catalog response');
return { instrument: instrument ? publicInstrument({ ...instrument, uid: input.uid }) : null };
}
if (input.kind === 'trading-status') {
return {
tradingStatus: await this.tbank.getTradingStatus(token, input.uid),
};
}
if (input.kind === 'comparison') {
const prices = await this.repository.readSources([
{ ...input, kind: 'last-price', rangeKey: undefined },
]);
if (!prices.length) throw new Error('Price dependency missing');
const price = (prices[0].payload as CatalogPayload).price;
const priceAt = timestamp(price?.time);
if (!priceAt) return { candle: null };
const now = new Date();
const range = {
from: utcDay(new Date(Date.parse(priceAt) - previousCloseLookbackMs)),
to: new Date(priceAt),
};
const saved = await this.candles.read(input.uid, range);
const gaps = candleGaps(range, saved.coverage, now);
for (const gap of gaps) {
const response = await this.tbank.getCandles(
token,
input.uid,
gap.from,
gap.to,
);
const rows = response.map(toSavedCandle);
if (!(await this.candles.stage(attempt, gap, rows, now))) {
throw new Error('Cancelled candle comparison');
}
}
if (
gaps.length &&
!(await this.candles.publish(
attempt,
{ uid: input.uid, ranges: gaps },
false,
))
) {
throw new Error('Cancelled candle comparison');
}
const values = (await this.candles.read(input.uid, range)).data.map(
(row) => {
const value = divide(
decimalFromString(row.close),
decimalFromString('1'),
quotationScale,
).value;
return {
time: {
seconds: String(Date.parse(row.time) / MILLISECONDS_PER_SECOND),
},
close: {
units: String(value / quotationUnits),
nano: Number(value % quotationUnits),
},
isComplete: row.isComplete,
};
},
);
return { candle: previousClose(values, priceAt) };
}
const details = await this.repository.readSources([
{ ...input, kind: 'detail', rangeKey: undefined },
...(input.instrumentType === 'bond'
? [{ ...input, kind: 'bond-current' as const, rangeKey: undefined }]
: []),
]);
const instrument = details
.map((row) => (row.payload as CatalogPayload).instrument)
.find(Boolean);
if (
!instrument &&
!['bond-events', 'coupons', 'dividends'].includes(input.kind)
) {
throw new Error('Instrument dependency missing');
}
if (input.kind === 'description') {
return {
description: instrument?.assetUid
? await this.tbank.getAssetDescription(token, instrument?.assetUid)
: null,
};
}
if (input.kind === 'fundamentals') {
return {
fundamentals: instrument?.assetUid
? await this.tbank.getFundamentals(token, instrument?.assetUid)
: null,
};
}
if (input.kind === 'coupons' || input.kind === 'dividends') {
const year = Number(input.rangeKey);
const [from, to] = input.rangeKey?.startsWith('[')
? (JSON.parse(input.rangeKey) as [string, string])
: [
`${year - payoutHistoryYears}-01-01`,
`${year + payoutFutureYears}-01-01`,
];
return input.kind === 'coupons'
? {
coupons: await this.tbank.getBondCoupons(
token,
input.uid,
from,
to,
),
}
: {
dividends: await this.tbank.getDividends(
token,
input.uid,
from,
to,
),
};
}
if (input.kind === 'bond-events') {
const ticker = instrument?.ticker || input.ticker;
if (!ticker) throw new Error('Bond ticker missing');
return { bondEvents: await this.moex.bondEvents(ticker) };
}
if (input.kind === 'yield') {
return {
effectiveYield:
instrument?.ticker && instrument.isin && instrument.classCode
? await this.moex.bondYield(
instrument.ticker,
instrument.isin,
instrument.classCode,
)
: null,
};
}
if (input.kind === 'rating') {
return {
creditRating: instrument?.isin
? await this.ratings.rating(instrument.isin)
: null,
};
}
throw new Error('Unsupported catalog source');
}
// eslint-disable-next-line sonarjs/cognitive-complexity -- Queue draining coordinates publication fences and observer completion.
private async drain() {
try {
@@ -351,7 +532,7 @@ export class CatalogEnrichmentService {
batch.map((item) => item.input.uid),
);
} else {
payload = await this.loader.load(producer.input, token, producer.attempt);
payload = await this.load(producer.input, token, producer.attempt);
}
} catch (error) {
failed = true;
@@ -453,6 +634,24 @@ function sourceInputs(
})),
);
}
const previousCloseLookbackDays = 20;
const previousCloseLookbackMs =
previousCloseLookbackDays * MILLISECONDS_PER_DAY;
const payoutHistoryYears = 5;
const payoutFutureYears = 2;
export type CatalogPayload = {
bondEvents?: MoexBondEvent[];
candle?: null | TbankCandle;
coupons?: TbankCoupon[];
creditRating?: Awaited<ReturnType<NcrRatingsClient['rating']>>;
description?: null | string;
dividends?: TbankDividend[];
effectiveYield?: Awaited<ReturnType<MoexClient['bondYield']>>;
fundamentals?: null | TbankFundamentals;
instrument?: null | TbankBond | TbankShare;
price?: null | TbankLastPrice;
tradingStatus?: null | string;
};
function sourcePolicy(kind: CatalogSource['kind']) {
if (
@@ -466,7 +665,6 @@ function sourcePolicy(kind: CatalogSource['kind']) {
) {
return 'quote';
}
if (['bond-events', 'dividends'].includes(kind)) return 'calendar';
return 'stable';
}
function producerKey(input: CatalogSource) {
@@ -475,3 +673,6 @@ function producerKey(input: CatalogSource) {
? `bond-metadata:${input.uid}`
: catalogScope(input);
}
const quotationScale = 9;
const quotationUnits = 1_000_000_000n;
src/modules/investments/instruments/application/catalog-selection.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import type { TbankShare } from '#src/integrations/tbank/tbank.api';
import type { TbankShare } from '../../../../integrations/tbank/tbank.api';
import { TbankInstrumentType } from '#src/integrations/tbank/tbank-protocol';
import { TbankInstrumentType } from '../../../../integrations/tbank/tbank-protocol';
export const catalogSearchLimit = 30;
src/modules/investments/instruments/application/catalog-source.loader.ts
-229
View File
@@ -1,229 +0,0 @@
import { Injectable } from '@nestjs/common';
import {
decimalFromString,
divide,
} from '#src/common/decimal';
import {
MILLISECONDS_PER_DAY,
MILLISECONDS_PER_SECOND,
} from '#src/common/time';
import { type MoexBondEvent, MoexClient } from '#src/integrations/moex/moex.api';
import { NcrRatingsClient } from '#src/integrations/ncr/ncr.api';
import {
type TbankBond,
type TbankCandle,
TbankClient,
type TbankCoupon,
type TbankDividend,
type TbankFundamentals,
type TbankLastPrice,
type TbankShare,
type TbankSyncAttempt,
} from '#src/integrations/tbank/tbank.api';
import { candleGaps, utcDay } from '../domain/candle-coverage';
import { CandleRepository } from '../infrastructure/candle.repository';
import {
CatalogDiscoveryRepository,
type CatalogSource,
} from '../infrastructure/catalog-discovery.repository';
import { toSavedCandle } from '../infrastructure/tbank-candle.mapper';
import { previousClose, timestamp } from './instrument-market';
import { publicInstrument } from './public-instrument';
export type CatalogPayload = {
bondEvents?: MoexBondEvent[];
candle?: null | TbankCandle;
coupons?: TbankCoupon[];
creditRating?: Awaited<ReturnType<NcrRatingsClient['rating']>>;
description?: null | string;
dividends?: TbankDividend[];
effectiveYield?: Awaited<ReturnType<MoexClient['bondYield']>>;
fundamentals?: null | TbankFundamentals;
instrument?: null | TbankBond | TbankShare;
price?: null | TbankLastPrice;
tradingStatus?: null | string;
};
const previousCloseLookbackDays = 20;
const previousCloseLookbackMs =
previousCloseLookbackDays * MILLISECONDS_PER_DAY;
const payoutHistoryYears = 5;
const payoutFutureYears = 2;
const quotationScale = 9;
const quotationUnits = 1_000_000_000n;
@Injectable()
export class CatalogSourceLoader {
constructor(
private readonly repository: CatalogDiscoveryRepository,
private readonly tbank: TbankClient,
private readonly moex: MoexClient,
private readonly ratings: NcrRatingsClient,
private readonly candles: CandleRepository,
) {}
// eslint-disable-next-line sonarjs/cognitive-complexity -- Source loading intentionally dispatches by persisted resource kind.
async load(
input: CatalogSource,
token: string,
attempt: TbankSyncAttempt,
): Promise<CatalogPayload> {
if (input.kind === 'detail' || input.kind === 'bond-current') {
const instrument =
input.instrumentType === 'share'
? await this.tbank.getShare(token, input.uid)
: await this.tbank.getBond(token, input.uid);
if (instrument && instrument.uid !== input.uid) {
throw new Error('Catalog UID mismatch');
}
// eslint-disable-next-line sonarjs/different-types-comparison -- Defensive validation rejects missing upstream payloads instead of caching them as absence.
if (instrument === undefined) throw new Error('Missing catalog response');
return { instrument: instrument ? publicInstrument({ ...instrument, uid: input.uid }) : null };
}
if (input.kind === 'trading-status') {
return {
tradingStatus: await this.tbank.getTradingStatus(token, input.uid),
};
}
if (input.kind === 'comparison') {
const prices = await this.repository.readSources([
{ ...input, kind: 'last-price', rangeKey: undefined },
]);
if (!prices.length) throw new Error('Price dependency missing');
const price = (prices[0].payload as CatalogPayload).price;
const priceAt = timestamp(price?.time);
if (!priceAt) return { candle: null };
const now = new Date();
const range = {
from: utcDay(new Date(Date.parse(priceAt) - previousCloseLookbackMs)),
to: new Date(priceAt),
};
const saved = await this.candles.read(input.uid, range);
const gaps = candleGaps(range, saved.coverage, now);
for (const gap of gaps) {
const response = await this.tbank.getCandles(
token,
input.uid,
gap.from,
gap.to,
);
const rows = response.map(toSavedCandle);
if (!(await this.candles.stage(attempt, gap, rows, now))) {
throw new Error('Cancelled candle comparison');
}
}
if (
gaps.length &&
!(await this.candles.publish(
attempt,
{ uid: input.uid, ranges: gaps },
false,
))
) {
throw new Error('Cancelled candle comparison');
}
const values = (await this.candles.read(input.uid, range)).data.map(
(row) => {
const value = divide(
decimalFromString(row.close),
decimalFromString('1'),
quotationScale,
).value;
return {
time: {
seconds: String(Date.parse(row.time) / MILLISECONDS_PER_SECOND),
},
close: {
units: String(value / quotationUnits),
nano: Number(value % quotationUnits),
},
isComplete: row.isComplete,
};
},
);
return { candle: previousClose(values, priceAt) };
}
const details = await this.repository.readSources([
{ ...input, kind: 'detail', rangeKey: undefined },
...(input.instrumentType === 'bond'
? [{ ...input, kind: 'bond-current' as const, rangeKey: undefined }]
: []),
]);
const instrument = details
.map((row) => (row.payload as CatalogPayload).instrument)
.find(Boolean);
if (
!instrument &&
!['bond-events', 'coupons', 'dividends'].includes(input.kind)
) {
throw new Error('Instrument dependency missing');
}
if (input.kind === 'description') {
return {
description: instrument?.assetUid
? await this.tbank.getAssetDescription(token, instrument?.assetUid)
: null,
};
}
if (input.kind === 'fundamentals') {
return {
fundamentals: instrument?.assetUid
? await this.tbank.getFundamentals(token, instrument?.assetUid)
: null,
};
}
if (input.kind === 'coupons' || input.kind === 'dividends') {
const year = Number(input.rangeKey);
const [from, to] = input.rangeKey?.startsWith('[')
? (JSON.parse(input.rangeKey) as [string, string])
: [
`${year - payoutHistoryYears}-01-01`,
`${year + payoutFutureYears}-01-01`,
];
return input.kind === 'coupons'
? {
coupons: await this.tbank.getBondCoupons(
token,
input.uid,
from,
to,
),
}
: {
dividends: await this.tbank.getDividends(
token,
input.uid,
from,
to,
),
};
}
if (input.kind === 'bond-events') {
const ticker = instrument?.ticker || input.ticker;
if (!ticker) throw new Error('Bond ticker missing');
return { bondEvents: await this.moex.bondEvents(ticker) };
}
if (input.kind === 'yield') {
return {
effectiveYield:
instrument?.ticker && instrument.isin && instrument.classCode
? await this.moex.bondYield(
instrument.ticker,
instrument.isin,
instrument.classCode,
)
: null,
};
}
if (input.kind === 'rating') {
return {
creditRating: instrument?.isin
? await this.ratings.rating(instrument.isin)
: null,
};
}
throw new Error('Unsupported catalog source');
}
}
src/modules/investments/instruments/application/instrument-market.ts
+2 -2
View File
@@ -1,9 +1,9 @@
import type {
TbankCandle,
TbankTimestamp,
} from '#src/integrations/tbank/tbank.api';
} from '../../../../integrations/tbank/tbank.api';
import { ISO_DATE_LENGTH, ISO_DATE_START, MILLISECONDS_PER_SECOND } from '#src/common/time';
import { ISO_DATE_LENGTH, ISO_DATE_START, MILLISECONDS_PER_SECOND } from '../../../../common/time';
const MIN_TIMESTAMP_SECONDS_EXCLUSIVE = 0;
src/modules/investments/instruments/application/instrument-position.spec.ts
-2
View File
@@ -22,8 +22,6 @@ const row = (
isin: null,
ticker: null,
logoName: null,
sector: null,
issuer: null,
});
const portfolio = (positions: PortfolioPositionDto[]): PortfolioDto => ({
positions,
src/modules/investments/instruments/application/instrument-position.ts
+2 -3
View File
@@ -4,9 +4,8 @@ import {
divide,
formatDecimal,
multiply,
} from '#src/common/decimal';
import { MoneyDto } from '#src/common/money.dto';
} from '../../../../common/decimal';
import { MoneyDto } from '../../../../common/money.dto';
import {
PortfolioDto,
PortfolioPositionDto,
src/modules/investments/instruments/application/public-instrument.spec.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import type {
TbankBond,
TbankShare,
} from '#src/integrations/tbank/tbank.api';
} from '../../../../integrations/tbank/tbank.api';
import { publicInstrument } from './public-instrument';
src/modules/investments/instruments/application/public-instrument.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import type {
TbankBond,
TbankShare,
} from '#src/integrations/tbank/tbank.api';
} from '../../../../integrations/tbank/tbank.api';
export function publicInstrument(value: TbankBond | TbankShare) {
const bond = value as TbankBond;
src/modules/investments/instruments/bonds/application/bond-catalog.service.ts
+10 -7
View File
@@ -1,10 +1,9 @@
import { Injectable } from '@nestjs/common';
import type { TbankBond } from '#src/integrations/tbank/tbank.api';
import { formatDecimal } from '#src/common/decimal';
import { decimal } from '#src/integrations/tbank/decimal';
import type { TbankBond } from '../../../../../integrations/tbank/tbank.api';
import { formatDecimal } from '../../../../../common/decimal';
import { decimal } from '../../../../../integrations/tbank/decimal';
import { CatalogDiscoveryService } from '../../application/catalog-discovery.service';
import { timestamp } from '../../application/instrument-market';
import {
@@ -15,8 +14,7 @@ import {
type IdentifiedBond = TbankBond & { uid: string };
import { ISO_DATE_LENGTH, ISO_DATE_START } from '#src/common/time';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '../../../../../common/time';
import { money } from '../infrastructure/bond-money.mapper';
const MIN_LOT_EXCLUSIVE = 0;
@@ -27,10 +25,12 @@ export class BondCatalogService {
async search(
userId: string,
query: string,
observe = false,
): Promise<BondSearchResourceDto> {
const result = await this.discovery.search(
userId,
{ instrumentType: 'bond', query },
observe,
);
return {
...result,
@@ -58,8 +58,9 @@ export class BondCatalogService {
async get(
userId: string,
uid: string,
observe = false,
): Promise<BondResourceDto> {
const result = await this.discovery.detail(userId, 'bond', uid);
const result = await this.discovery.detail(userId, 'bond', uid, observe);
return {
...result,
data: result.data
@@ -71,11 +72,13 @@ export class BondCatalogService {
async getByTicker(
userId: string,
ticker: string,
observe = false,
): Promise<BondResourceDto> {
const result = await this.discovery.byTicker(
userId,
'bond',
ticker,
observe,
);
return {
...result,
src/modules/investments/instruments/bonds/application/bond-income.service.ts
+9 -7
View File
@@ -5,20 +5,19 @@ import {
divide,
formatDecimal,
multiply,
} from '#src/common/decimal';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '#src/common/time';
import { isTbankProtocolValue, TbankCouponType } from '#src/integrations/tbank/tbank-protocol';
} from '../../../../../common/decimal';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '../../../../../common/time';
import { isTbankProtocolValue, TbankCouponType } from '../../../../../integrations/tbank/tbank-protocol';
import {
TbankAccessService,
type TbankBond,
type TbankCoupon,
tbankSourceNeedsRefresh,
} from '#src/integrations/tbank/tbank.api';
} from '../../../../../integrations/tbank/tbank.api';
import {
ForecastService,
PortfolioService,
} from '#src/modules/investments/portfolio/portfolio.api';
} from '../../../portfolio/portfolio.api';
import {
CatalogEnrichmentService,
type CatalogPayload,
@@ -55,12 +54,14 @@ export class BondIncomeService {
async metrics(
userId: string,
uid: string,
observe = false,
): Promise<BondMetricsResourceDto> {
const result = await this.sources.section(
userId,
'bond',
uid,
'metrics',
observe,
);
return {
data: result.values.instrument
@@ -81,6 +82,7 @@ export class BondIncomeService {
async coupons(
userId: string,
uid: string,
observe = false,
): Promise<BondCouponsResourceDto> {
const connection = await this.access.local(userId);
const today = moscowDay(new Date().toISOString());
@@ -91,7 +93,7 @@ export class BondIncomeService {
userId,
'bond',
[uid],
false,
observe,
['detail', 'coupons'],
{ from, to },
);
src/modules/investments/instruments/bonds/application/bond-market.service.ts
+8 -5
View File
@@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common';
import type { TbankBond } from '#src/integrations/tbank/tbank.api';
import type { TbankBond } from '../../../../../integrations/tbank/tbank.api';
import {
add,
@@ -9,10 +9,9 @@ import {
formatDecimal,
multiply,
subtract,
} from '#src/common/decimal';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '#src/common/time';
import { decimal } from '#src/integrations/tbank/decimal';
} from '../../../../../common/decimal';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '../../../../../common/time';
import { decimal } from '../../../../../integrations/tbank/decimal';
import { CandleService } from '../../application/candle.service';
import {
CatalogEnrichmentService,
@@ -39,12 +38,14 @@ export class BondMarketService {
async quote(
userId: string,
uid: string,
observe = false,
): Promise<BondQuoteResourceDto> {
const result = await this.sources.section(
userId,
'bond',
uid,
'quote',
observe,
);
return {
data: result.values.instrument
@@ -58,10 +59,12 @@ export class BondMarketService {
userId: string,
uid: string,
period: BondCandlesQueryDto['period'] = 'month',
observe = false,
) {
return this.history.read(
userId,
{ uid, instrumentType: 'bond', period },
observe,
);
}
}
src/modules/investments/instruments/bonds/application/bond.spec.ts
+2 -2
View File
@@ -1,9 +1,9 @@
import type { PortfolioDto } from '#src/modules/investments/portfolio/portfolio.api';
import type { PortfolioDto } from '../../../portfolio/portfolio.api';
import { instrumentPosition } from '../../application/instrument-position';
import { bondCoupons, bondMetrics } from './bond-income.service';
import { bondQuote } from './bond-market.service';
jest.mock('#src/prisma/prisma.service', () => ({
jest.mock('../../../../../prisma/prisma.service', () => ({
PrismaService: class {},
}));
const time = (value: string) => ({ seconds: String(Date.parse(value) / 1000) });
src/modules/investments/instruments/bonds/infrastructure/bond-money.mapper.ts
+3 -3
View File
@@ -1,6 +1,6 @@
import { formatDecimal } from '#src/common/decimal';
import { decimal } from '#src/integrations/tbank/decimal';
import { type TbankMoney } from '#src/integrations/tbank/tbank.api';
import { formatDecimal } from '../../../../../common/decimal';
import { decimal } from '../../../../../integrations/tbank/decimal';
import { type TbankMoney } from '../../../../../integrations/tbank/tbank.api';
export function money(value?: TbankMoney) {
const currency = value?.currency?.toUpperCase();
src/modules/investments/instruments/bonds/presentation/bond.controller.ts
+15 -7
View File
@@ -11,9 +11,9 @@ import {
} from '@nestjs/common';
import { ApiBearerAuth, ApiOkResponse, ApiTags } from '@nestjs/swagger';
import { ApiProblemResponses } from '#src/common/decorators/api-safe-error-response.decorator';
import { AccessPayload, JwtAuthGuard } from '#src/modules/auth/auth.api';
import { ApiProblemResponses } from '../../../../../common/decorators/api-safe-error-response.decorator';
import { AccessPayload, JwtAuthGuard } from '../../../../auth/auth.api';
import { InvestmentReadQueryDto } from '../../../investment-resource.dto';
import { BondCatalogService } from '../application/bond-catalog.service';
import { BondIncomeService } from '../application/bond-income.service';
import { BondMarketService } from '../application/bond-market.service';
@@ -47,8 +47,9 @@ export class BondController {
metrics(
@Req() request: Request & { user: AccessPayload },
@Param('uid', new ParseUUIDPipe()) uid: string,
@Query() query: InvestmentReadQueryDto,
) {
return this.income.metrics(request.user.sub, uid);
return this.income.metrics(request.user.sub, uid, query.sync === 'observe');
}
@Get()
@@ -60,6 +61,7 @@ export class BondController {
return this.bonds.search(
request.user.sub,
query.query,
query.sync === 'observe',
);
}
@@ -68,10 +70,12 @@ export class BondController {
getByTicker(
@Req() request: Request & { user: AccessPayload },
@Param() params: BondTickerParamsDto,
@Query() query: InvestmentReadQueryDto,
) {
return this.bonds.getByTicker(
request.user.sub,
params.ticker,
query.sync === 'observe',
);
}
@@ -80,8 +84,9 @@ export class BondController {
get(
@Req() request: Request & { user: AccessPayload },
@Param('uid', new ParseUUIDPipe()) uid: string,
@Query() query: InvestmentReadQueryDto,
) {
return this.bonds.get(request.user.sub, uid);
return this.bonds.get(request.user.sub, uid, query.sync === 'observe');
}
@Get(':uid/quote')
@@ -89,8 +94,9 @@ export class BondController {
quote(
@Req() request: Request & { user: AccessPayload },
@Param('uid', new ParseUUIDPipe()) uid: string,
@Query() query: InvestmentReadQueryDto,
) {
return this.market.quote(request.user.sub, uid);
return this.market.quote(request.user.sub, uid, query.sync === 'observe');
}
@Get(':uid/candles')
@@ -104,6 +110,7 @@ export class BondController {
request.user.sub,
uid,
query.period,
query.sync === 'observe',
);
}
@@ -121,7 +128,8 @@ export class BondController {
coupons(
@Req() request: Request & { user: AccessPayload },
@Param('uid', new ParseUUIDPipe()) uid: string,
@Query() query: InvestmentReadQueryDto,
) {
return this.income.coupons(request.user.sub, uid);
return this.income.coupons(request.user.sub, uid, query.sync === 'observe');
}
}
src/modules/investments/instruments/bonds/presentation/bond.dto.ts
+2 -3
View File
@@ -1,8 +1,7 @@
import { ApiProperty } from '@nestjs/swagger';
import { MoneyDto } from '#src/common/money.dto';
import { InvestmentResourceMetaDto } from '#src/modules/investments/investment-resource.dto';
import { MoneyDto } from '../../../../../common/money.dto';
import { InvestmentResourceMetaDto } from '../../../investment-resource.dto';
import {
StockCandlesDto,
StockCandlesQueryDto,
src/modules/investments/instruments/domain/candle-coverage.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import { MILLISECONDS_PER_DAY } from '#src/common/time';
import { MILLISECONDS_PER_DAY } from '../../../../common/time';
const FIRST_RANGE_END_INDEX = 1;
src/modules/investments/instruments/infrastructure/candle.repository.ts
+57 -37
View File
@@ -1,19 +1,10 @@
import { Injectable } from '@nestjs/common';
import { createHash, randomUUID } from 'node:crypto';
import type { Prisma } from '#generated/prisma/client';
import {
claimSyncWork,
lockConnectionGeneration,
} from '#src/integrations/tbank/tbank-sync-claim';
import {
isJoinableRunningAttempt,
type TbankSyncAttempt,
} from '#src/integrations/tbank/tbank.api';
import { PrismaService } from '#src/prisma/prisma.service';
import { toJson } from '#src/prisma/to-json';
import type { Prisma } from '../../../../../generated/prisma/client';
import type { TbankSyncAttempt } from '../../../../integrations/tbank/tbank.api';
import { PrismaService } from '../../../../prisma/prisma.service';
import {
type CandleRange,
confirmedCandleCoverage,
@@ -71,30 +62,34 @@ export class CandleRepository {
priority = 1,
) {
return this.prisma.$transaction(async (tx) => {
const current = await lockConnectionGeneration(tx, owner);
if (!current) return null;
const current = await tx.tbankConnection.updateMany({
where: { ...owner, invalidToken: false },
data: { membershipRevision: { increment: 0 } },
});
if (!current.count) return null;
const scope = { ...owner, scopeKey };
const previous = await tx.tbankSyncWork.findUnique({
where: { userId_revision_scopeKey: scope },
});
const joinable = isJoinableRunningAttempt(previous, runId, active)
? previous
: null;
if (joinable) {
const previousIntent = joinable.intent as Prisma.JsonObject;
if (
previous?.state === 'running' &&
previous.processRunId === runId &&
active.has(previous.attemptId)
) {
const previousIntent = previous.intent as Prisma.JsonObject;
const previousNow =
typeof previousIntent.now === 'string' ? previousIntent.now : '';
const nextPriority = Math.min(joinable.priority, priority);
const nextPriority = Math.min(previous.priority, priority);
if (
nextPriority === joinable.priority &&
nextPriority === previous.priority &&
(!intent.force ||
(previousIntent.force === true &&
(!intent.now || intent.now <= previousNow)))
) {
return { work: joinable, launch: false };
return { work: previous, launch: false };
}
const work = await tx.tbankSyncWork.update({
where: { id: joinable.id },
where: { id: previous.id },
data: {
priority: nextPriority,
intent: {
@@ -120,7 +115,7 @@ export class CandleRepository {
processRunId: runId,
state: 'running',
priority,
intent: toJson(intent),
intent: JSON.parse(JSON.stringify(intent)) as Prisma.InputJsonObject,
progress: {},
errorCode: null,
};
@@ -168,17 +163,24 @@ export class CandleRepository {
).values(),
];
return this.prisma.$transaction(async (tx) => {
const valid = await claimSyncWork(tx, attempt, {
progress: { lastWindow: key },
const valid = await tx.tbankSyncWork.updateMany({
where: {
...attempt,
state: 'running',
connection: { invalidToken: false },
},
data: { progress: { lastWindow: key } },
});
if (!valid) return false;
if (!valid.count) return false;
const identity = {
workId: attempt.id,
attemptId: attempt.attemptId,
sourceKey: 'candles',
itemKey: key,
};
const payload = toJson({ range, candles: rows, fetchedAt });
const payload = JSON.parse(
JSON.stringify({ range, candles: rows, fetchedAt }),
) as Prisma.InputJsonObject;
await tx.tbankSyncStage.upsert({
where: { workId_attemptId_sourceKey_itemKey: identity },
create: { ...identity, payload },
@@ -194,11 +196,18 @@ export class CandleRepository {
completeWork = true,
) {
return this.prisma.$transaction(async (tx) => {
const claimed = await claimSyncWork(tx, attempt, {
...(completeWork ? { state: 'complete' } : {}),
errorCode: null,
const claimed = await tx.tbankSyncWork.updateMany({
where: {
...attempt,
state: 'running',
connection: { invalidToken: false },
},
data: {
...(completeWork ? { state: 'complete' } : {}),
errorCode: null,
},
});
if (!claimed) return false;
if (!claimed.count) return false;
const staged = await tx.tbankSyncStage.findMany({
where: {
workId: attempt.id,
@@ -302,17 +311,28 @@ export class CandleRepository {
},
});
if (!origin) return false;
const result = await claimSyncWork(tx, attempt, {
state: 'complete',
errorCode: null,
const result = await tx.tbankSyncWork.updateMany({
where: {
...attempt,
state: 'running',
connection: { invalidToken: false },
},
data: { state: 'complete', errorCode: null },
});
return result > NO_UPDATED_ROWS;
return result.count > NO_UPDATED_ROWS;
});
}
fail(attempt: TbankSyncAttempt, errorCode: string) {
return this.prisma.$transaction(async (tx) => {
await claimSyncWork(tx, attempt, { state: 'failed', errorCode });
await tx.tbankSyncWork.updateMany({
where: {
...attempt,
state: 'running',
connection: { invalidToken: false },
},
data: { state: 'failed', errorCode },
});
await tx.tbankSyncStage.deleteMany({
where: { workId: attempt.id, attemptId: attempt.attemptId },
});
src/modules/investments/instruments/infrastructure/catalog-discovery.repository.ts
+75 -46
View File
@@ -2,11 +2,11 @@ import { Injectable } from '@nestjs/common';
import { randomUUID } from 'node:crypto';
import { isDeepStrictEqual } from 'node:util';
import { TbankErrorCode } from '#src/integrations/tbank/tbank-error-code';
import { claimSyncWork, lockConnectionGeneration } from '#src/integrations/tbank/tbank-sync-claim';
import { isJoinableRunningAttempt, type TbankBond, type TbankShare, type TbankSyncAttempt } from '#src/integrations/tbank/tbank.api';
import { PrismaService } from '#src/prisma/prisma.service';
import { toJson } from '#src/prisma/to-json';
import type { Prisma } from '../../../../../generated/prisma/client';
import type { TbankBond, TbankShare, TbankSyncAttempt } from '../../../../integrations/tbank/tbank.api';
import { TbankErrorCode } from '../../../../integrations/tbank/tbank-error-code';
import { PrismaService } from '../../../../prisma/prisma.service';
const UNCHANGED_REVISION_INCREMENT = 0;
const REVISION_INCREMENT = 1;
@@ -159,19 +159,27 @@ export class CatalogDiscoveryRepository {
initiator: TbankSyncAttempt = attempt,
) {
return this.prisma.$transaction(async (tx) => {
const origin = await claimSyncWork(
tx,
initiator,
{ progress: {} },
{ state: { in: ['running', 'complete'] } },
);
if (!origin) return false;
const claimed = await claimSyncWork(tx, attempt, {
state: 'complete',
progress: {},
const origin = await tx.tbankSyncWork.updateMany({
where: {
...initiator,
state: { in: ['running', 'complete'] },
connection: { invalidToken: false },
},
data: { progress: {} },
});
if (!claimed) return false;
const payload = toJson(value);
if (!origin.count) return false;
const claimed = await tx.tbankSyncWork.updateMany({
where: {
...attempt,
state: 'running',
connection: { invalidToken: false },
},
data: { state: 'complete', progress: {} },
});
if (!claimed.count) return false;
const payload = JSON.parse(
JSON.stringify(value),
) as Prisma.InputJsonObject;
const identity = { provider, uid: input.uid };
await tx.tbankInstrument.upsert({
where: { provider_uid: identity },
@@ -194,10 +202,12 @@ export class CatalogDiscoveryRepository {
const previous = await tx.tbankInstrument.findUniqueOrThrow({
where: { provider_uid: identity },
});
const metadata = toJson({
...instrument,
instrumentType: input.instrumentType,
});
const metadata = JSON.parse(
JSON.stringify({
...instrument,
instrumentType: input.instrumentType,
}),
) as Prisma.InputJsonObject;
await tx.tbankInstrument.update({
where: { provider_uid: identity },
data: {
@@ -274,13 +284,20 @@ export class CatalogDiscoveryRepository {
active: ReadonlySet<string>,
) {
return this.prisma.$transaction(async (tx) => {
const current = await lockConnectionGeneration(tx, owner);
if (!current) return null;
const current = await tx.tbankConnection.updateMany({
where: { ...owner, invalidToken: false },
data: { membershipRevision: { increment: 0 } },
});
if (!current.count) return null;
const scope = { ...owner, scopeKey: catalogScope(input) };
const previous = await tx.tbankSyncWork.findUnique({
where: { userId_revision_scopeKey: scope },
});
if (isJoinableRunningAttempt(previous, runId, active)) {
if (
previous?.state === 'running' &&
previous.processRunId === runId &&
active.has(previous.attemptId)
) {
return { work: previous, launch: false };
}
const data = {
@@ -328,28 +345,34 @@ export class CatalogDiscoveryRepository {
now: Date,
) {
return this.prisma.$transaction(async (tx) => {
const claimed = await claimSyncWork(tx, attempt, {
state: 'complete',
progress: {},
const claimed = await tx.tbankSyncWork.updateMany({
where: {
...attempt,
state: 'running',
connection: { invalidToken: false },
},
data: { state: 'complete', progress: {} },
});
if (!claimed) return false;
if (!claimed.count) return false;
for (const instrument of instruments) {
// Discovery can create a minimal identity, but cannot overwrite verified metadata.
const identity = { provider, uid: instrument.uid };
const payload = toJson({
uid: instrument.uid,
figi: instrument.figi,
ticker: instrument.ticker,
name: instrument.name,
isin: instrument.isin,
classCode: instrument.classCode,
instrumentKind: instrument.instrumentKind,
apiTradeAvailableFlag: instrument.apiTradeAvailableFlag,
currency: instrument.currency,
brand: instrument.brand
? { logoName: instrument.brand.logoName }
: undefined,
});
const payload = JSON.parse(
JSON.stringify({
uid: instrument.uid,
figi: instrument.figi,
ticker: instrument.ticker,
name: instrument.name,
isin: instrument.isin,
classCode: instrument.classCode,
instrumentKind: instrument.instrumentKind,
apiTradeAvailableFlag: instrument.apiTradeAvailableFlag,
currency: instrument.currency,
brand: instrument.brand
? { logoName: instrument.brand.logoName }
: undefined,
}),
) as Prisma.InputJsonObject;
await tx.tbankInstrument.upsert({
where: { provider_uid: identity },
update: {},
@@ -442,7 +465,6 @@ export class CatalogDiscoveryRepository {
finish(attempt: TbankSyncAttempt, success: boolean) {
return this.prisma.$transaction(async (tx) => {
// Fails sibling attempts whose connection was invalidated mid-flight.
await tx.tbankSyncWork.updateMany({
where: {
...attempt,
@@ -451,9 +473,16 @@ export class CatalogDiscoveryRepository {
},
data: { state: 'failed', errorCode: TbankErrorCode.InvalidToken },
});
await claimSyncWork(tx, attempt, {
state: success ? 'complete' : 'failed',
errorCode: success ? null : TbankErrorCode.Unavailable,
await tx.tbankSyncWork.updateMany({
where: {
...attempt,
state: 'running',
connection: { invalidToken: false },
},
data: {
state: success ? 'complete' : 'failed',
errorCode: success ? null : TbankErrorCode.Unavailable,
},
});
});
}
src/modules/investments/instruments/infrastructure/tbank-candle.mapper.ts
+3 -5
View File
@@ -1,10 +1,8 @@
import type { TbankCandle } from '#src/integrations/tbank/tbank.api';
import { formatDecimal } from '#src/common/decimal';
import { decimal } from '#src/integrations/tbank/decimal';
import type { TbankCandle } from '../../../../integrations/tbank/tbank.api';
import type { SavedCandle } from '../domain/candle-coverage';
import { formatDecimal } from '../../../../common/decimal';
import { decimal } from '../../../../integrations/tbank/decimal';
import { timestamp } from '../application/instrument-market';
function toSavedCandle(candle: TbankCandle): SavedCandle {
src/modules/investments/instruments/instrument-sources.module.ts
+3 -6
View File
@@ -1,13 +1,11 @@
import { Module } from '@nestjs/common';
import { MoexModule } from '#src/integrations/moex/moex.module';
import { NcrModule } from '#src/integrations/ncr/ncr.module';
import { TbankModule } from '#src/integrations/tbank/tbank.module';
import { MoexModule } from '../../../integrations/moex/moex.module';
import { NcrModule } from '../../../integrations/ncr/ncr.module';
import { TbankModule } from '../../../integrations/tbank/tbank.module';
import { CandleService } from './application/candle.service';
import { CatalogDiscoveryService } from './application/catalog-discovery.service';
import { CatalogEnrichmentService } from './application/catalog-enrichment.service';
import { CatalogSourceLoader } from './application/catalog-source.loader';
import { CandleRepository } from './infrastructure/candle.repository';
import { CatalogDiscoveryRepository } from './infrastructure/catalog-discovery.repository';
@@ -17,7 +15,6 @@ import { CatalogDiscoveryRepository } from './infrastructure/catalog-discovery.r
CandleService,
CandleRepository,
CatalogEnrichmentService,
CatalogSourceLoader,
CatalogDiscoveryService,
CatalogDiscoveryRepository,
],
src/modules/investments/instruments/instruments.module.ts
+3 -2
View File
@@ -1,7 +1,7 @@
import { Module } from '@nestjs/common';
import { TbankModule } from '#src/integrations/tbank/tbank.module';
import { TbankAccessService } from '../../../integrations/tbank/tbank-access.service';
import { TbankModule } from '../../../integrations/tbank/tbank.module';
import { AuthModule } from '../../auth/auth.module';
import { PortfolioModule } from '../portfolio/portfolio.module';
import { BondCatalogService } from './bonds/application/bond-catalog.service';
@@ -21,6 +21,7 @@ import { StockController } from './stocks/presentation/stock.controller';
controllers: [StockController, BondController],
exports: [StockIncomeService, BondIncomeService],
providers: [
{ provide: 'TBANK_ACCESS', useExisting: TbankAccessService },
BondIncomeService,
BondMarketService,
GetStockCompanyUseCase,
src/modules/investments/instruments/stocks/application/get-stock-company.use-case.ts
+3 -1
View File
@@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common';
import type { TbankFundamentals } from '#src/integrations/tbank/tbank.api';
import type { TbankFundamentals } from '../../../../../integrations/tbank/tbank.api';
import { CatalogEnrichmentService } from '../../application/catalog-enrichment.service';
import {
@@ -13,12 +13,14 @@ export class GetStockCompanyUseCase {
async execute(
userId: string,
uid: string,
observe = false,
): Promise<StockCompanyResourceDto> {
const result = await this.sources.section(
userId,
'share',
uid,
'company',
observe,
);
return {
data: result.values.instrument
src/modules/investments/instruments/stocks/application/stock-catalog.service.ts
+9 -5
View File
@@ -1,10 +1,9 @@
import { Injectable } from '@nestjs/common';
import type { TbankShare } from '#src/integrations/tbank/tbank.api';
import { formatDecimal } from '#src/common/decimal';
import { decimal } from '#src/integrations/tbank/decimal';
import type { TbankShare } from '../../../../../integrations/tbank/tbank.api';
import { formatDecimal } from '../../../../../common/decimal';
import { decimal } from '../../../../../integrations/tbank/decimal';
import { CatalogDiscoveryService } from '../../application/catalog-discovery.service';
import { timestamp } from '../../application/instrument-market';
import {
@@ -23,10 +22,12 @@ export class StockCatalogService {
async search(
userId: string,
query: string,
observe = false,
): Promise<StockSearchResourceDto> {
const result = await this.discovery.search(
userId,
{ instrumentType: 'share', query },
observe,
);
return {
...result,
@@ -58,8 +59,9 @@ export class StockCatalogService {
async get(
userId: string,
uid: string,
observe = false,
): Promise<StockResourceDto> {
const result = await this.discovery.detail(userId, 'share', uid);
const result = await this.discovery.detail(userId, 'share', uid, observe);
return {
...result,
data: result.data
@@ -71,11 +73,13 @@ export class StockCatalogService {
async getByTicker(
userId: string,
ticker: string,
observe = false,
): Promise<StockResourceDto> {
const result = await this.discovery.byTicker(
userId,
'share',
ticker,
observe,
);
return {
...result,
src/modules/investments/instruments/stocks/application/stock-income.service.ts
+7 -7
View File
@@ -4,19 +4,18 @@ import {
decimalFromString,
formatDecimal,
multiply,
} from '#src/common/decimal';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '#src/common/time';
import { decimal } from '#src/integrations/tbank/decimal';
} from '../../../../../common/decimal';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '../../../../../common/time';
import { decimal } from '../../../../../integrations/tbank/decimal';
import {
TbankAccessService,
type TbankDividend,
tbankSourceNeedsRefresh,
} from '#src/integrations/tbank/tbank.api';
} from '../../../../../integrations/tbank/tbank.api';
import {
ForecastService,
PortfolioService,
} from '#src/modules/investments/portfolio/portfolio.api';
} from '../../../portfolio/portfolio.api';
import { CatalogEnrichmentService } from '../../application/catalog-enrichment.service';
import { moscowDay, timestamp } from '../../application/instrument-market';
import { instrumentPosition } from '../../application/instrument-position';
@@ -52,6 +51,7 @@ export class StockIncomeService {
async dividends(
userId: string,
uid: string,
observe = false,
): Promise<StockDividendsResourceDto> {
const connection = await this.access.local(userId);
const today = moscowDay(new Date().toISOString());
@@ -62,7 +62,7 @@ export class StockIncomeService {
userId,
'share',
[uid],
false,
observe,
['detail', 'dividends'],
{ from, to },
);
src/modules/investments/instruments/stocks/application/stock-market.service.ts
+7 -4
View File
@@ -6,10 +6,9 @@ import {
formatDecimal,
multiply,
subtract,
} from '#src/common/decimal';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '#src/common/time';
import { decimal } from '#src/integrations/tbank/decimal';
} from '../../../../../common/decimal';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '../../../../../common/time';
import { decimal } from '../../../../../integrations/tbank/decimal';
import { CandleService } from '../../application/candle.service';
import {
CatalogEnrichmentService,
@@ -35,12 +34,14 @@ export class StockMarketService {
async quote(
userId: string,
uid: string,
observe = false,
): Promise<StockQuoteResourceDto> {
const result = await this.sources.section(
userId,
'share',
uid,
'quote',
observe,
);
return {
data: result.values.instrument
@@ -54,10 +55,12 @@ export class StockMarketService {
userId: string,
uid: string,
period: StockCandlesQueryDto['period'] = 'month',
observe = false,
) {
return this.history.read(
userId,
{ uid, instrumentType: 'share', period },
observe,
);
}
}
src/modules/investments/instruments/stocks/application/stock-screener.service.spec.ts
+2 -6
View File
@@ -1,10 +1,6 @@
jest.mock('#src/integrations/tbank/tbank.api', () => ({
TbankAccessService: class {},
}));
import { NotFoundException, ServiceUnavailableException } from '@nestjs/common';
import type { TbankShare } from '#src/integrations/tbank/tbank.api';
import type { TbankShare } from '../../../../../integrations/tbank/tbank.api';
import { StockScreenerService } from './stock-screener.service';
@@ -40,7 +36,7 @@ describe('StockScreenerService', () => {
client.getAllShares.mockResolvedValue(
Array.from({ length: pageSize + 1 }, (_, index) => share(index)),
);
service = new StockScreenerService(access as never, client as never, logger as never);
service = new StockScreenerService(access, client as never, logger as never);
});
it('stores the full selected catalog and returns stable non-overlapping pages', async () => {
src/modules/investments/instruments/stocks/application/stock-screener.service.ts
+9 -6
View File
@@ -1,17 +1,16 @@
import {
BadRequestException,
Inject,
Injectable,
NotFoundException,
ServiceUnavailableException,
} from '@nestjs/common';
import { randomUUID } from 'node:crypto';
import type { TbankShare } from '#src/integrations/tbank/tbank-market.types';
import { StructuredLogger } from '#src/common/logging/structured-logger.service';
import { TbankAccessService } from '#src/integrations/tbank/tbank.api';
import { TbankClient } from '#src/integrations/tbank/tbank.client';
import type { TbankShare } from '../../../../../integrations/tbank/tbank-market.types';
import { StructuredLogger } from '../../../../../common/logging/structured-logger.service';
import { TbankClient } from '../../../../../integrations/tbank/tbank.client';
import {
selectStockScreenerInstruments,
type StockScreenerConditions,
@@ -48,13 +47,17 @@ type StockScreenerPage = {
searchId: string;
};
type Snapshot = { asOf: string; expiresAt: number; items: StockScreenerItem[]; revision: string; userId: string };
type TbankAccess = {
local(userId: string): Promise<{ revision: string }>;
online<T>(userId: string, run: (connection: { revision: string; token: string }) => Promise<T>): Promise<T>;
};
@Injectable()
export class StockScreenerService {
private readonly snapshots = new Map<string, Snapshot>();
constructor(
private readonly access: TbankAccessService,
@Inject('TBANK_ACCESS') private readonly access: TbankAccess,
private readonly client: TbankClient,
private readonly logger: StructuredLogger,
) {}
src/modules/investments/instruments/stocks/application/stock.spec.ts
+1 -1
View File
@@ -2,7 +2,7 @@ import { previousClose } from '../../application/instrument-market';
import { metrics } from './get-stock-company.use-case';
import { stockDividends } from './stock-income.service';
import { stockQuote } from './stock-market.service';
jest.mock('#src/prisma/prisma.service', () => ({
jest.mock('../../../../../prisma/prisma.service', () => ({
PrismaService: class {},
}));
const time = (value: string) => ({ seconds: String(Date.parse(value) / 1000) });
src/modules/investments/instruments/stocks/domain/stock-screener-selection.rules.spec.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import type { TbankShare } from '#src/integrations/tbank/tbank.api';
import type { TbankShare } from '../../../../../integrations/tbank/tbank.api';
import { selectStockScreenerInstruments } from './stock-screener-selection.rules';
src/modules/investments/instruments/stocks/domain/stock-screener-selection.rules.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import type { TbankShare } from '#src/integrations/tbank/tbank.api';
import type { TbankShare } from '../../../../../integrations/tbank/tbank.api';
export type StockScreenerCatalog = {
asOf: Date;
src/modules/investments/instruments/stocks/presentation/stock.controller.ts
+15 -6
View File
@@ -17,9 +17,9 @@ import {
} from '@nestjs/common';
import { ApiBearerAuth, ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
import { ApiProblemResponses } from '#src/common/decorators/api-safe-error-response.decorator';
import { AccessPayload, JwtAuthGuard } from '#src/modules/auth/auth.api';
import { ApiProblemResponses } from '../../../../../common/decorators/api-safe-error-response.decorator';
import { AccessPayload, JwtAuthGuard } from '../../../../auth/auth.api';
import { InvestmentReadQueryDto } from '../../../investment-resource.dto';
import { GetStockCompanyUseCase } from '../application/get-stock-company.use-case';
import { StockCatalogService } from '../application/stock-catalog.service';
import { StockIncomeService } from '../application/stock-income.service';
@@ -64,6 +64,7 @@ export class StockController {
return this.stocks.search(
request.user.sub,
query.query,
query.sync === 'observe',
);
}
@@ -72,10 +73,12 @@ export class StockController {
getByTicker(
@Req() request: Request & { user: AccessPayload },
@Param() params: StockTickerParamsDto,
@Query() query: InvestmentReadQueryDto,
) {
return this.stocks.getByTicker(
request.user.sub,
params.ticker,
query.sync === 'observe',
);
}
@@ -88,7 +91,6 @@ export class StockController {
@Body(new ValidationPipe({ forbidNonWhitelisted: true, forbidUnknownValues: true, whitelist: true }))
criteria: StockScreenerCriteriaDto,
) {
// The global whitelist pipe strips unknown keys before this param pipe runs, so only the raw body can reject them.
const allowed = new Set(['countryOfRisk', 'currency', 'maxLot', 'query', 'realExchange', 'sector', 'shareType']);
if (Object.keys(request.body as object).some((key) => !allowed.has(key))) {
throw new BadRequestException();
@@ -112,8 +114,9 @@ export class StockController {
get(
@Req() request: Request & { user: AccessPayload },
@Param('uid', new ParseUUIDPipe()) uid: string,
@Query() query: InvestmentReadQueryDto,
) {
return this.stocks.get(request.user.sub, uid);
return this.stocks.get(request.user.sub, uid, query.sync === 'observe');
}
@Get(':uid/quote')
@@ -121,8 +124,9 @@ export class StockController {
quote(
@Req() request: Request & { user: AccessPayload },
@Param('uid', new ParseUUIDPipe()) uid: string,
@Query() query: InvestmentReadQueryDto,
) {
return this.market.quote(request.user.sub, uid);
return this.market.quote(request.user.sub, uid, query.sync === 'observe');
}
@Get(':uid/candles')
@@ -136,6 +140,7 @@ export class StockController {
request.user.sub,
uid,
query.period,
query.sync === 'observe',
);
}
@@ -153,10 +158,12 @@ export class StockController {
company(
@Req() request: Request & { user: AccessPayload },
@Param('uid', new ParseUUIDPipe()) uid: string,
@Query() query: InvestmentReadQueryDto,
) {
return this.companyInfo.execute(
request.user.sub,
uid,
query.sync === 'observe',
);
}
@@ -165,10 +172,12 @@ export class StockController {
dividends(
@Req() request: Request & { user: AccessPayload },
@Param('uid', new ParseUUIDPipe()) uid: string,
@Query() query: InvestmentReadQueryDto,
) {
return this.income.dividends(
request.user.sub,
uid,
query.sync === 'observe',
);
}
}
src/modules/investments/instruments/stocks/presentation/stock.dto.ts
+7 -6
View File
@@ -11,15 +11,16 @@ import {
MinLength,
} from 'class-validator';
import { MoneyDto } from '#src/common/money.dto';
import { MoneyDto } from '../../../../../common/money.dto';
import {
MAX_INSTRUMENT_QUERY_LENGTH,
MIN_INSTRUMENT_QUERY_LENGTH,
} from '#src/modules/investments/instrument-query';
} from '../../../instrument-query';
import {
InvestmentReadQueryDto,
InvestmentResourceMetaDto,
} from '#src/modules/investments/investment-resource.dto';
import { PortfolioPositionDto } from '#src/modules/investments/portfolio/portfolio.api';
} from '../../../investment-resource.dto';
import { PortfolioPositionDto } from '../../../portfolio/portfolio.api';
const MIN_TICKER_LENGTH = 1;
const MAX_SCREENER_QUERY_LENGTH = 80;
@@ -103,7 +104,7 @@ export class StockScreenerPageDto {
@ApiProperty({ type: StockScreenerItemDto, isArray: true, maxItems: 30 }) declare items: StockScreenerItemDto[];
}
export class StockSearchQueryDto {
export class StockSearchQueryDto extends InvestmentReadQueryDto {
@ApiProperty({ minLength: MIN_INSTRUMENT_QUERY_LENGTH, maxLength: MAX_INSTRUMENT_QUERY_LENGTH })
@Transform(({ value }: { value: unknown }) =>
typeof value === 'string' ? value.trim() : value,
@@ -125,7 +126,7 @@ export class StockTickerParamsDto {
@Matches(/^[A-Z0-9][\w.@+-]*$/i)
declare ticker: string;
}
export class StockCandlesQueryDto {
export class StockCandlesQueryDto extends InvestmentReadQueryDto {
@ApiPropertyOptional({
enum: ['month', 'halfYear', 'year', 'all'],
default: 'month',
src/modules/investments/investment-resource.dto.ts
+8
View File
@@ -1,4 +1,5 @@
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import { IsIn, IsOptional } from 'class-validator';
export const availabilityValues = [
'available',
@@ -16,6 +17,13 @@ export const attemptStateValues = [
'failed',
] as const;
export class InvestmentReadQueryDto {
@ApiPropertyOptional({ enum: ['observe'] })
@IsOptional()
@IsIn(['observe'])
declare sync?: 'observe';
}
export class InvestmentAttemptProblemDto {
@ApiProperty({ enum: ['membership', 'portfolio', 'operations', 'events'] })
declare section: 'events' | 'membership' | 'operations' | 'portfolio';
src/modules/investments/investment-sync-plan.spec.ts
+188 -8
View File
@@ -1,16 +1,196 @@
import { accountHistory, ledgerRange } from './investment-sync-plan';
import {
accountHistory,
ledgerRange,
planInvestmentScreen,
} from './investment-sync-plan';
// Missing opening dates must not silently narrow the reported history boundary.
describe('account history boundaries', () => {
describe('screen dependency and history planning', () => {
const now = new Date('2026-09-25T12:00:00Z');
const accounts = [{ accountId: 'a', openedOn: null }];
it('retains the unknown opening boundary for history and instrument ledger', () => {
expect(accountHistory(accounts, now)[0].from.toISOString()).toBe(
const context = {
membershipKnown: true,
accounts: [{ accountId: 'a', openedOn: '2020-01-01' }],
instruments: [
{
uid: 'uid',
type: 'STOCK' as const,
historyFrom: new Date('2020-01-01Z'),
},
],
};
it('prioritizes discovery, the selected period, then history; Moscow dates are converted once', () => {
const plan = planInvestmentScreen(
{
screen: 'income',
accountId: 'a',
from: '2024-02-01',
to: '2024-02-29',
},
context,
now,
);
expect(plan.sources[0].kind).toBe('membership');
const selected = plan.sources.filter(
(source) => source.kind === 'operations' && source.priority === 'screen',
);
// The single selected range is chunked into month-aligned intervals.
expect(selected).toHaveLength(2);
expect(
selected.every(
(source) =>
source.from != null &&
source.from.toISOString() >= '2024-01-31T21:00:00.000Z' &&
source.to != null &&
source.to.toISOString() <= '2024-02-29T21:00:00.000Z',
),
).toBe(true);
expect(
selected.some(
(source) => source.from?.toISOString() === '2024-01-31T21:00:00.000Z',
),
).toBe(true);
expect(
selected.some(
(source) => source.to?.toISOString() === '2024-02-29T21:00:00.000Z',
),
).toBe(true);
expect(plan.unavailable).toEqual([]);
const firstHistory = plan.sources.findIndex(
(source) => source.priority === 'history',
);
expect(
plan.sources
.slice(firstHistory)
.every((source) => source.priority === 'history'),
).toBe(true);
});
it('force contains only shown dependencies and retains instrument reconciliation predicates', () => {
const plan = planInvestmentScreen(
{
screen: 'stock',
instrumentUid: 'uid',
from: '2026-01-01',
to: '2026-02-01',
candlePeriod: 'year',
},
context,
now,
true,
);
expect(plan.sources.map((source) => source.kind)).toEqual(
expect.arrayContaining([
'membership',
'portfolio',
'operations',
'metadata',
'quote',
'company',
'calendar',
'candles',
]),
);
expect(plan.sources.every((source) => source.priority !== 'history')).toBe(
true,
);
expect(
plan.sources
.filter((source) => source.kind === 'operations')
.every((source) => source.instrumentUid === 'uid'),
).toBe(true);
const accounts = planInvestmentScreen(
{ screen: 'accounts' },
context,
now,
true,
);
expect(
accounts.sources.some((source) => source.kind === 'operations'),
).toBe(false);
});
it('never invents an account or candle history boundary; discovery gates unknown membership', () => {
const unknown = {
...context,
accounts: [{ accountId: 'a', openedOn: null }],
instruments: [],
};
expect(accountHistory(unknown.accounts, now)[0].from.toISOString()).toBe(
'1970-01-01T00:00:00.000Z',
);
expect(
ledgerRange(undefined, undefined, 'uid', accounts, now).from.toISOString(),
ledgerRange(
undefined,
undefined,
'uid',
unknown.accounts,
now,
).from.toISOString(),
).toBe('1970-01-01T00:00:00.000Z');
const plan = planInvestmentScreen(
{ screen: 'bond', instrumentUid: 'uid', candlePeriod: 'all' },
unknown,
now,
);
expect(plan.sources.some((source) => source.kind === 'candles')).toBe(
false,
);
expect(plan.unavailable[0].reason).toBe('history_start_unavailable');
expect(
planInvestmentScreen(
{ screen: 'account' },
{ ...context, membershipKnown: false },
now,
).sources,
).toEqual([{ kind: 'membership', priority: 'discovery' }]);
});
it('keeps UTC event days separate from Moscow instrument calendar days at year rollover', () => {
const rollover = new Date('2026-12-31T22:00:00Z');
const events = planInvestmentScreen(
{ screen: 'events' },
context,
rollover,
true,
);
expect(
events.sources.find((source) => source.kind === 'calendar')?.from,
).toEqual(new Date('2026-12-31Z'));
const stock = planInvestmentScreen(
{ screen: 'stock', instrumentUid: 'uid' },
context,
rollover,
true,
);
expect(
stock.sources.find((source) => source.kind === 'calendar'),
).toMatchObject({
from: new Date('2022-01-01Z'),
to: new Date('2028-01-01Z'),
});
expect(rollover.toISOString()).toBe('2026-12-31T22:00:00.000Z');
});
it('keeps search queries separate and events scoped to their inclusive period', () => {
const search = planInvestmentScreen(
{ screen: 'stocks', query: ' sber ' },
context,
now,
true,
);
expect(
search.sources.find((source) => source.kind === 'catalog')?.query,
).toBe('SBER');
const events = planInvestmentScreen(
{ screen: 'events', from: '2026-10-01', to: '2026-10-31' },
context,
now,
true,
);
expect(
events.sources.find((source) => source.kind === 'calendar'),
).toMatchObject({
from: new Date('2026-10-01Z'),
to: new Date('2026-10-31Z'),
});
expect(events.sources.some((source) => source.kind === 'operations')).toBe(
false,
);
});
});
src/modules/investments/investment-sync-plan.ts
+257 -1
View File
@@ -1,11 +1,267 @@
import type { OperationInterval } from './operations/domain/operations-sync-plan';
import { ISO_DATE_LENGTH, ISO_DATE_START } from '../../common/time';
import { planIncomePeriod } from './income/income.api';
import { dateOnlyBounds, moscowDate } from './investment-calendar';
import {
type OperationInterval,
operationIntervals,
} from './operations/domain/operations-sync-plan';
const FORECAST_YEARS = 1;
const JANUARY_INDEX = 0;
const FIRST_DAY_OF_MONTH = 1;
const EXCLUSIVE_END_OFFSET_MS = 1;
const NO_END_OFFSET_MS = 0;
export type InvestmentScreen = {
accountId?: string;
candlePeriod?: 'all' | 'halfYear' | 'month' | 'year';
candleRange?: { from: Date; to: Date };
from?: string;
instrumentUid?: string;
query?: string;
screen:
| 'account' |
'accounts' |
'bond' |
'bonds' |
'events' |
'income' |
'operations' |
'stock' |
'stocks';
to?: string;
};
const defaultEventDays = 30;
const incomeHistoryYears = 5;
const candleMonths = { month: 1, halfYear: 6, year: 12 };
type Account = { accountId: string; openedOn: null | string };
type Instrument = {
historyFrom: Date | null;
type: 'BOND' | 'STOCK';
uid: string;
};
type Source = {
accountId?: string;
from?: Date;
instrumentType?: 'BOND' | 'STOCK';
instrumentUid?: string;
kind:
| 'calendar' |
'candles' |
'catalog' |
'company' |
'membership' |
'metadata' |
'metrics' |
'operations' |
'portfolio' |
'quote';
priority: 'discovery' | 'history' | 'screen';
query?: string;
to?: Date;
};
// Expands screen scope, never credentials or arbitrary caller-supplied jobs.
// Owners execute their own sources and expand instruments after discovery.
export function planInvestmentScreen(
screen: InvestmentScreen,
context: {
accounts: Account[];
instruments: Instrument[];
membershipKnown: boolean;
},
now: Date,
force = false,
) {
const sources: Source[] = [{ kind: 'membership', priority: 'discovery' }];
const accounts = context.accounts.filter(
(account) =>
!screen.accountId ||
screen.accountId === 'all' ||
account.accountId === screen.accountId,
);
const unavailable: { reason: string; resourceKey: string }[] = [];
const operations = (from: Date, to: Date, instrumentUid?: string) => {
const targets = accounts.flatMap((account) =>
from < to
? [
{
accountId: account.accountId,
from,
to,
...(instrumentUid ? { instrumentUid } : {}),
},
]
: [],
);
sources.push(
...operationIntervals(targets).map((range) => ({
...range,
kind: 'operations' as const,
priority: 'screen' as const,
})),
);
};
const portfolio = () =>
sources.push(
...accounts.map(({ accountId }) => ({
kind: 'portfolio' as const,
accountId,
priority: 'screen' as const,
})),
);
if (!context.membershipKnown) return { sources, unavailable, now };
if (
['account', 'accounts', 'bond', 'events', 'stock'].includes(screen.screen)
) {
portfolio();
}
if (
screen.screen === 'operations' ||
screen.screen === 'stock' ||
screen.screen === 'bond'
) {
const range = ledgerRange(
screen.from,
screen.to,
screen.instrumentUid,
accounts,
now,
);
operations(range.from, range.to, force ? screen.instrumentUid : undefined);
}
if (screen.screen === 'account' || screen.screen === 'income') {
const period = planIncomePeriod(
screen.screen === 'income' ? screen.from : undefined,
screen.screen === 'income' ? screen.to : undefined,
);
const bounds = dateOnlyBounds(period.selected, now);
operations(bounds.from, bounds.to);
if (screen.screen === 'account') {
const range = ledgerRange(
screen.from,
screen.to,
undefined,
accounts,
now,
);
operations(range.from, range.to);
}
}
if (screen.screen === 'stocks' || screen.screen === 'bonds') {
sources.push({
kind: 'catalog',
instrumentType: screen.screen === 'stocks' ? 'STOCK' : 'BOND',
query: screen.query?.trim().toUpperCase() ?? '',
priority: 'screen',
});
}
const instruments = context.instruments.filter(
(instrument) =>
!screen.instrumentUid || instrument.uid === screen.instrumentUid,
);
if (
screen.instrumentUid &&
!instruments.length &&
(screen.screen === 'stock' || screen.screen === 'bond')
) {
instruments.push({
uid: screen.instrumentUid,
type: screen.screen === 'stock' ? 'STOCK' : 'BOND',
historyFrom: null,
});
}
for (const instrument of instruments) {
const identity = {
instrumentUid: instrument.uid,
instrumentType: instrument.type,
};
sources.push({ ...identity, kind: 'metadata', priority: 'screen' });
if (['bond', 'bonds', 'stock', 'stocks'].includes(screen.screen)) {
sources.push({ ...identity, kind: 'quote', priority: 'screen' });
}
if (screen.screen === 'stock' || screen.screen === 'bond') {
sources.push({
...identity,
kind: screen.screen === 'stock' ? 'company' : 'metrics',
priority: 'screen',
});
const from = new Date(now);
const period = screen.candlePeriod ?? 'month';
if (period !== 'all') {
// eslint-disable-next-line security/detect-object-injection -- The period belongs to the validated candle-period union.
from.setUTCMonth(from.getUTCMonth() - candleMonths[period]);
}
const range =
screen.candleRange ??
(period === 'all'
? instrument.historyFrom
? { from: instrument.historyFrom, to: now }
: null
: { from, to: now });
if (range) {
sources.push({
...identity,
kind: 'candles',
...range,
priority: 'screen',
});
} else {
unavailable.push({
resourceKey: `candles/${instrument.uid}/all`,
reason: 'history_start_unavailable',
});
}
}
if (['account', 'bond', 'events', 'stock'].includes(screen.screen)) {
const day =
screen.screen === 'stock' || screen.screen === 'bond'
? moscowDate(now)
: now.toISOString().slice(ISO_DATE_START, ISO_DATE_LENGTH);
const from =
screen.screen === 'events' && screen.from
? new Date(`${screen.from}T00:00:00Z`)
: new Date(`${day}T00:00:00Z`);
const to =
screen.screen === 'events' && screen.to
? new Date(`${screen.to}T00:00:00Z`)
: new Date(from);
if (
!(screen.screen === 'events' && screen.to) &&
screen.screen !== 'stock' &&
screen.screen !== 'bond'
) {
to.setUTCDate(to.getUTCDate() + defaultEventDays);
}
if (screen.screen === 'stock' || screen.screen === 'bond') {
from.setUTCFullYear(from.getUTCFullYear() - incomeHistoryYears);
to.setUTCFullYear(to.getUTCFullYear() + FORECAST_YEARS);
}
sources.push({
...identity,
kind: 'calendar',
from,
to,
priority: 'screen',
});
}
}
if (!force && !['bonds', 'stocks'].includes(screen.screen)) {
sources.push(
...accountHistory(accounts, now).map((range) => ({
...range,
kind: 'operations' as const,
priority: 'history' as const,
})),
);
}
const priorities = { discovery: 0, screen: 1, history: 2 };
sources.sort(
(left, right) => priorities[left.priority] - priorities[right.priority],
);
return { sources, unavailable, now };
}
export function accountHistory(
accounts: Account[],
src/modules/investments/operations/application/brokerage-operations-sync.service.ts
+32 -6
View File
@@ -1,17 +1,18 @@
import { Injectable, NotFoundException } from '@nestjs/common';
import { randomUUID } from 'node:crypto';
import { StructuredLogger } from '#src/common/logging/structured-logger.service';
import { MILLISECONDS_PER_SECOND } from '#src/common/time';
import { isTbankErrorCode, TbankErrorCode } from '#src/integrations/tbank/tbank-error-code';
import { TbankOperationState } from '#src/integrations/tbank/tbank-protocol';
import { TbankAccessService, TbankClient } from '#src/integrations/tbank/tbank.api';
import { StructuredLogger } from '../../../../common/logging/structured-logger.service';
import { MILLISECONDS_PER_SECOND } from '../../../../common/time';
import { isTbankErrorCode, TbankErrorCode } from '../../../../integrations/tbank/tbank-error-code';
import { TbankOperationState } from '../../../../integrations/tbank/tbank-protocol';
import { TbankAccessService, TbankClient } from '../../../../integrations/tbank/tbank.api';
import { accountHistory } from '../../investment-sync-plan';
import {
type OperationInterval,
operationIntervals,
operationsSyncPriority,
planOperationRead,
uncoveredOperationIntervals,
} from '../domain/operations-sync-plan';
import {
BrokerageOperationsRepository,
@@ -47,6 +48,7 @@ export class BrokerageOperationsSyncService {
intervals: OperationInterval[],
options: {
force?: boolean;
history?: boolean;
movingEnd?: boolean;
observe?: boolean;
revision?: string;
@@ -97,6 +99,30 @@ export class BrokerageOperationsSyncService {
connection.revision,
)
: null;
if (!options.observe && !options.force && options.history) {
const accountIds = new Set(
intervals.map((interval) => interval.accountId),
);
const history = accountHistory(
connection.accounts.filter((account) =>
accountIds.has(account.accountId),
),
now,
);
const missing = planOperationRead(history, coverage, now, {
movingEnd: true,
}).load;
const remaining = uncoveredOperationIntervals(missing, targets);
if (remaining.length) {
await this.request(
userId,
remaining,
false,
'history',
connection.revision,
);
}
}
return { plan, handle };
}
src/modules/investments/operations/application/brokerage-operations.service.ts
+229 -55
View File
@@ -1,57 +1,68 @@
import { Injectable } from '@nestjs/common';
import { createHash } from 'node:crypto';
import { BadRequestException, Injectable } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { createHash, createHmac, timingSafeEqual } from 'node:crypto';
import {
InstrumentMetadataService,
metadataKey,
TbankAccessService,
TbankMembershipService,
type TbankOperationItem,
tbankSourceTtlMs,
} from '#src/integrations/tbank/tbank.api';
} from '../../../../integrations/tbank/tbank.api';
import { dateOnlyBounds, DateOnlyRange } from '../../investment-calendar';
import { investmentResourceMeta } from '../../investment-resource.mapper';
import { ledgerRange } from '../../investment-sync-plan';
import {
accountHistory,
ledgerRange,
planInvestmentScreen,
} from '../../investment-sync-plan';
import {
hourlyAttempt,
TbankSyncRepository,
} from '../../tbank-sync/tbank-sync.api';
import {
coverageAsOf,
deriveReadCoverage,
historyState,
serializeRange,
} from '../domain/operations-coverage';
import { OperationErrorCode } from '../domain/operation-error-code';
import {
confirmedOperationRanges,
operationIntervalsOverlap,
operationsSyncPriority,
planOperationRead,
uncoveredOperationIntervals,
} from '../domain/operations-sync-plan';
import { mapBrokerageOperation } from '../infrastructure/brokerage-operation.mapper';
import { BrokerageOperationsReadRepository } from '../infrastructure/brokerage-operations-read.repository';
import { BrokerageOperationsRepository } from '../infrastructure/brokerage-operations.repository';
import {
BrokerageOperationsQueryDto,
DEFAULT_OPERATIONS_PAGE_SIZE,
} from '../presentation/brokerage-operation.dto';
import { BrokerageOperationsSyncService } from './brokerage-operations-sync.service';
import { LocalOperationsCursorCodec } from './local-operations-cursor.codec';
const EXCLUSIVE_END_OFFSET_MS = 1;
const FIRST_RESULT_OFFSET = 0;
const MISSING_MEMBERSHIP_REVISION = 0;
const STALE_FRESHNESS_MS = 0;
const NO_COVERAGE_ROWS = 0;
const UNKNOWN_AS_OF_MS = 0;
const LAST_ROW_INDEX = -1;
const UNIX_EPOCH_MS = 0;
type LocalOperationsCursor = {
accountId: string;
at: string;
binding: string;
id: string;
movingEnd?: boolean;
to: string;
};
@Injectable()
export class BrokerageOperationsService {
constructor(
private readonly access: TbankAccessService,
private readonly metadata: InstrumentMetadataService,
private readonly repository: BrokerageOperationsReadRepository,
private readonly repository: BrokerageOperationsRepository,
private readonly sync: BrokerageOperationsSyncService,
private readonly cursorCodec: LocalOperationsCursorCodec,
private readonly membership: TbankMembershipService,
private readonly config: ConfigService,
private readonly hourlySync: TbankSyncRepository,
) {}
@@ -61,7 +72,7 @@ export class BrokerageOperationsService {
query: BrokerageOperationsQueryDto,
) {
const connection = await this.access.local(userId, accountId);
const cursor = query.cursor ? this.cursorCodec.decode(query.cursor) : undefined;
const cursor = query.cursor ? this.decodeCursor(query.cursor) : undefined;
const selected = connection.accounts.filter(
(account) => accountId === 'all' || account.accountId === accountId,
);
@@ -106,32 +117,99 @@ export class BrokerageOperationsService {
cursor,
};
if (cursor) await this.repository.readPage(readInput);
const intervals = selected.flatMap((account) =>
from < to ? [{ accountId: account.accountId, from, to }] : [],
const screen = planInvestmentScreen(
{
screen: 'operations',
accountId,
from: from.toISOString(),
to: new Date(to.valueOf() - EXCLUSIVE_END_OFFSET_MS).toISOString(),
},
{
accounts: selected,
instruments: [],
membershipKnown: Boolean(connection.membershipAt),
},
now,
);
const intervals = screen.sources.flatMap((source) =>
source.kind === 'operations' &&
source.priority === 'screen' &&
source.accountId &&
source.from &&
source.to
? [{ accountId: source.accountId, from: source.from, to: source.to }]
: [],
);
// The ledger only starts the first-time load of missing intervals; the
// mutable tail belongs to the hourly walk and membership is not rechecked.
if (intervals.length) {
await this.sync.readPlan(userId, intervals, {
movingEnd,
history: true,
revision: connection.revision,
});
}
const saved = await this.repository.readPage(readInput);
const hourly = await this.hourlySync.hourly(userId);
const accounts = saved?.connection.accounts ?? [];
const view = deriveReadCoverage({
accounts,
connectionMembershipAt: saved?.connection.membershipAt ?? null,
coverage: saved?.coverage ?? [],
from,
instrumentUid: query.instrumentUid,
const targets = accounts.flatMap((account) =>
from < to
? [
{
accountId: account.accountId,
from,
to,
instrumentUid: query.instrumentUid,
},
]
: [],
);
const plan = planOperationRead(targets, saved?.coverage ?? [], now, {
movingEnd,
now,
to,
work: saved?.work ?? [],
});
const { targets, plan, confirmed, missing, available, complete, lastSuccessfulAt, history, knownBoundary, work } = view;
const confirmed = confirmedOperationRanges(plan.intervals, saved?.coverage ?? []);
const missing = uncoveredOperationIntervals(
plan.intervals,
confirmed.map((range) => ({
...range,
instrumentUid: query.instrumentUid,
})),
);
const available = Boolean(saved?.connection.membershipAt);
const complete = available && !missing.length;
const relevant =
saved?.work.filter((work) =>
work.intervals.some((interval) =>
targets.some((target) => operationIntervalsOverlap(interval, target)),
),
) ?? [];
const work =
relevant.find((work) => work.state === 'running') ??
relevant.find((work) => work.state === 'failed') ??
null;
const sources = (saved?.coverage ?? []).filter((row) =>
targets.some(
(target) =>
operationIntervalsOverlap(row, target) &&
(!row.instrumentUid || row.instrumentUid === target.instrumentUid),
),
);
const lastSuccessfulAt =
sources
.map((row) => row.fetchedAt)
.sort((a, b) => a.valueOf() - b.valueOf())[0] ??
(complete ? saved?.connection.membershipAt : null) ??
null;
const historyTargets = accountHistory(accounts, now);
const history = planOperationRead(
historyTargets,
saved?.coverage ?? [],
now,
{ movingEnd: true },
);
const knownBoundary = accounts.every(
(account) => account.openedOn !== null,
);
const rows = saved?.rows.slice(FIRST_RESULT_OFFSET, limit) ?? [];
const instruments = await this.metadata.savedMany(
rows.map((row) => row.payload as TbankOperationItem),
@@ -174,17 +252,49 @@ export class BrokerageOperationsService {
lastAttempt: hourlyAttempt(hourly, 'operations', accountId === 'all' ? undefined : accountId),
dependencies: [membershipMeta, ...metadataDependencies],
coverage: {
requested: targets.map(serializeRange),
completeRanges: confirmed.map(serializeRange),
missingRanges: missing.map(serializeRange),
asOf: coverageAsOf(plan, accounts.map((account) => account.accountId)),
requested: targets.map(serialize),
completeRanges: confirmed.map(serialize),
missingRanges: missing.map(serialize),
asOf:
accounts.length &&
accounts.every((account) =>
plan.intervals.some(
(interval) =>
interval.accountId === account.accountId && interval.asOf,
),
)
? new Date(
Math.min(
...accounts.map((account) =>
Math.max(
...plan.intervals
.filter(
(interval) =>
interval.accountId === account.accountId,
)
.map((interval) => interval.asOf?.valueOf() ?? UNKNOWN_AS_OF_MS),
),
),
),
).toISOString()
: null,
historyBoundary: knownBoundary ? 'known' : 'unknown',
historyState: historyState(
knownBoundary,
history,
saved?.work ?? [],
saved?.coverage.length ?? NO_COVERAGE_ROWS,
),
historyState: saved?.work.some(
(work) => work.state === 'running' && work.priority > operationsSyncPriority.screen,
)
? 'loading'
: saved?.work.some(
(work) => work.state === 'failed' && work.priority > operationsSyncPriority.screen,
)
? 'failed'
: knownBoundary &&
history.intervals.every(
(interval) => interval.availability === 'complete',
)
? 'complete'
: saved?.coverage.length
? 'partial'
: 'missing',
},
});
const last = rows.at(LAST_ROW_INDEX);
@@ -219,7 +329,7 @@ export class BrokerageOperationsService {
hasNext,
nextCursor:
hasNext && last && saved
? this.cursorCodec.encode({
? this.encodeCursor({
binding: saved.binding,
movingEnd,
to: to.toISOString(),
@@ -234,10 +344,55 @@ export class BrokerageOperationsService {
};
}
private encodeCursor(value: LocalOperationsCursor): string {
const body = Buffer.from(JSON.stringify(value)).toString('base64url');
return `${body}.${createHmac('sha256', this.config.getOrThrow<string>('JWT_SECRET')).update(body).digest('base64url')}`;
}
private decodeCursor(value: string): LocalOperationsCursor {
try {
const [body, signature, extra] = value.split('.');
const expected = createHmac(
'sha256',
this.config.getOrThrow<string>('JWT_SECRET'),
)
.update(body)
.digest();
const actual = Buffer.from(signature ?? '', 'base64url');
if (
extra ||
actual.length !== expected.length ||
!timingSafeEqual(actual, expected)
) {
throw new Error();
}
const cursor = JSON.parse(
Buffer.from(body, 'base64url').toString(),
) as Partial<LocalOperationsCursor>;
if (
(cursor.movingEnd !== undefined &&
typeof cursor.movingEnd !== 'boolean') ||
!cursor.binding ||
!cursor.accountId ||
!cursor.id ||
!cursor.at ||
!cursor.to ||
!Number.isFinite(Date.parse(cursor.at)) ||
!Number.isFinite(Date.parse(cursor.to))
) {
throw new Error();
}
return cursor as LocalOperationsCursor;
} catch {
throw new BadRequestException({ code: OperationErrorCode.InvalidOperationsCursor });
}
}
async collectRanges(
userId: string,
accountId: string,
ranges: (openedAt: Date | undefined) => DateOnlyRange[],
observe = false,
) {
const connection = await this.access.local(userId, accountId);
const input = {
@@ -251,19 +406,34 @@ export class BrokerageOperationsService {
periods: ranges,
};
let saved = await this.repository.readPage(input);
const targets = (saved?.connection.accounts ?? []).flatMap((account) =>
(saved?.periods ?? []).map((period) => ({
accountId: account.accountId,
...period,
})),
);
if (targets.length) {
await this.sync.readPlan(userId, targets, {
movingEnd: saved?.periods?.some((period) => period.movingEnd),
revision: connection.revision,
});
const schedule = async () => {
const current = await this.access.local(userId, accountId);
if (current.revision !== connection.revision) return;
const snapshot = await this.repository.readPage(input);
if (!snapshot?.connection.membershipAt) return;
const targets = snapshot.connection.accounts.flatMap((account) =>
(snapshot.periods ?? []).map((period) => ({
accountId: account.accountId,
...period,
})),
);
if (targets.length) {
await this.sync.readPlan(userId, targets, {
movingEnd: snapshot.periods?.some((period) => period.movingEnd),
history: true,
revision: connection.revision,
});
}
};
if (!observe) {
const discovery = await this.membership.request(
userId,
connection.revision,
);
if (discovery) void discovery.done.then(schedule).catch(() => undefined);
else await schedule();
saved = await this.repository.readPage(input);
}
saved = await this.repository.readPage(input);
const now = new Date();
const hourly = await this.hourlySync.hourly(userId);
const membership = investmentResourceMeta({
@@ -337,12 +507,12 @@ export class BrokerageOperationsService {
lastAttempt: hourlyAttempt(hourly, 'operations', accountId === 'all' ? undefined : accountId),
dependencies: [membership],
coverage: {
requested: targets.map(serializeRange),
completeRanges: confirmed.map(serializeRange),
requested: targets.map(serialize),
completeRanges: confirmed.map(serialize),
missingRanges: uncoveredOperationIntervals(
plan.intervals,
confirmed,
).map(serializeRange),
).map(serialize),
asOf:
complete && targets.length
? new Date(
@@ -412,3 +582,7 @@ export class BrokerageOperationsService {
});
}
}
function serialize(range: { accountId: string; from: Date; to: Date }) {
return { accountId: range.accountId, from: range.from.toISOString(), to: range.to.toISOString() };
}
src/modules/investments/operations/application/local-operations-cursor.codec.spec.ts
-23
View File
@@ -1,23 +0,0 @@
import { decode, encode } from './local-operations-cursor.codec';
const secret = 'secret';
const cursor = {
accountId: 'account',
at: '2026-01-01T00:00:00.000Z',
binding: 'owner-filter-binding',
id: 'operation',
movingEnd: false,
to: '2026-02-01T00:00:00.000Z',
};
describe('local operations cursor', () => {
it('roundtrips the opaque cursor, including its owner and filter binding', () => {
expect(decode(encode(cursor, secret), secret)).toEqual(cursor);
});
it('rejects a tampered cursor and a cursor signed with a different key', () => {
const encoded = encode(cursor, secret);
expect(() => decode(`${encoded}x`, secret)).toThrow();
expect(() => decode(encoded, 'different-secret')).toThrow();
});
});
src/modules/investments/operations/application/local-operations-cursor.codec.ts
-72
View File
@@ -1,72 +0,0 @@
import { BadRequestException, Injectable } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { createHmac, timingSafeEqual } from 'node:crypto';
import { OperationErrorCode } from '../domain/operation-error-code';
export type LocalOperationsCursor = {
accountId: string;
at: string;
binding: string;
id: string;
movingEnd?: boolean;
to: string;
};
// Opaque cursor: base64url body + HMAC-SHA256 signature over JWT_SECRET.
// Wire format and validation are part of the HTTP contract and must not change.
export function encode(value: LocalOperationsCursor, secret: string): string {
const body = Buffer.from(JSON.stringify(value)).toString('base64url');
return `${body}.${createHmac('sha256', secret).update(body).digest('base64url')}`;
}
export function decode(value: string, secret: string): LocalOperationsCursor {
try {
const [body, signature, extra] = value.split('.');
const expected = createHmac('sha256', secret).update(body).digest();
const actual = Buffer.from(signature ?? '', 'base64url');
if (
extra ||
actual.length !== expected.length ||
!timingSafeEqual(actual, expected)
) {
throw new Error();
}
const cursor = JSON.parse(
Buffer.from(body, 'base64url').toString(),
) as Partial<LocalOperationsCursor>;
if (
(cursor.movingEnd !== undefined &&
typeof cursor.movingEnd !== 'boolean') ||
!cursor.binding ||
!cursor.accountId ||
!cursor.id ||
!cursor.at ||
!cursor.to ||
!Number.isFinite(Date.parse(cursor.at)) ||
!Number.isFinite(Date.parse(cursor.to))
) {
throw new Error();
}
return cursor as LocalOperationsCursor;
} catch {
throw new BadRequestException({ code: OperationErrorCode.InvalidOperationsCursor });
}
}
@Injectable()
export class LocalOperationsCursorCodec {
constructor(private readonly config: ConfigService) {}
encode(value: LocalOperationsCursor): string {
return encode(value, this.secret());
}
decode(value: string): LocalOperationsCursor {
return decode(value, this.secret());
}
private secret(): string {
return this.config.getOrThrow<string>('JWT_SECRET');
}
}
src/modules/investments/operations/domain/operations-coverage.ts
-165
View File
@@ -1,165 +0,0 @@
import { accountHistory } from '../../investment-sync-plan';
import { confirmedOperationRanges, type OperationCoverage,
type OperationInterval,
operationIntervalsOverlap,
operationsSyncPriority,
planOperationRead,
uncoveredOperationIntervals } from './operations-sync-plan';
const UNKNOWN_AS_OF_MS = 0;
type WorkState = {
errorCode: null | string;
id: string;
intervals: OperationInterval[];
priority: number;
state: string;
};
type CoverageAccount = { accountId: string; openedOn: null | string };
// Pure derivation of the ledger read view: what was requested, what is
// confirmed, what is missing, and which sync work is currently relevant.
export function deriveReadCoverage(input: {
accounts: CoverageAccount[];
connectionMembershipAt: Date | null;
coverage: OperationCoverage[];
from: Date;
instrumentUid?: string;
movingEnd: boolean;
now: Date;
to: Date;
work: WorkState[];
}) {
const targets = input.accounts.flatMap((account) =>
input.from < input.to
? [
{
accountId: account.accountId,
from: input.from,
to: input.to,
instrumentUid: input.instrumentUid,
},
]
: [],
);
const plan = planOperationRead(targets, input.coverage, input.now, {
movingEnd: input.movingEnd,
});
const confirmed = confirmedOperationRanges(plan.intervals, input.coverage);
const missing = uncoveredOperationIntervals(
plan.intervals,
confirmed.map((range) => ({
...range,
instrumentUid: input.instrumentUid,
})),
);
const available = Boolean(input.connectionMembershipAt);
const complete = available && !missing.length;
const relevant = input.work.filter((work) =>
work.intervals.some((interval) =>
targets.some((target) => operationIntervalsOverlap(interval, target)),
),
);
const work =
relevant.find((work) => work.state === 'running') ??
relevant.find((work) => work.state === 'failed') ??
null;
const sources = input.coverage.filter((row) =>
targets.some(
(target) =>
operationIntervalsOverlap(row, target) &&
(!row.instrumentUid || row.instrumentUid === target.instrumentUid),
),
);
const lastSuccessfulAt =
sources
.map((row) => row.fetchedAt)
.sort((a, b) => a.valueOf() - b.valueOf())[0] ??
(complete ? input.connectionMembershipAt : null) ??
null;
const history = planOperationRead(
accountHistory(input.accounts, input.now),
input.coverage,
input.now,
{ movingEnd: true },
);
const knownBoundary = input.accounts.every(
(account) => account.openedOn !== null,
);
return {
targets,
plan,
confirmed,
missing,
available,
complete,
work,
lastSuccessfulAt,
history,
knownBoundary,
};
}
export function coverageAsOf(
plan: ReturnType<typeof planOperationRead>,
accountIds: string[],
): null | string {
if (
accountIds.length &&
accountIds.every((accountId) =>
plan.intervals.some(
(interval) =>
interval.accountId === accountId && interval.asOf,
),
)
) {
return new Date(
Math.min(
...accountIds.map((accountId) =>
Math.max(
...plan.intervals
.filter((interval) => interval.accountId === accountId)
.map((interval) => interval.asOf?.valueOf() ?? UNKNOWN_AS_OF_MS),
),
),
),
).toISOString();
}
return null;
}
export function historyState(
knownBoundary: boolean,
history: ReturnType<typeof planOperationRead>,
work: WorkState[],
coverageCount: number,
): 'complete' | 'failed' | 'loading' | 'missing' | 'partial' {
if (
work.some(
(work) => work.state === 'running' && work.priority > operationsSyncPriority.screen,
)
) {
return 'loading';
}
if (
work.some(
(work) => work.state === 'failed' && work.priority > operationsSyncPriority.screen,
)
) {
return 'failed';
}
if (
knownBoundary &&
history.intervals.every(
(interval) => interval.availability === 'complete',
)
) {
return 'complete';
}
return coverageCount ? 'partial' : 'missing';
}
export function serializeRange(range: { accountId: string; from: Date; to: Date }) {
return { accountId: range.accountId, from: range.from.toISOString(), to: range.to.toISOString() };
}
src/modules/investments/operations/domain/operations-interval-codec.ts
-67
View File
@@ -1,67 +0,0 @@
import { type OperationInterval,
operationIntervalsOverlap,
operationsSyncPriority } from './operations-sync-plan';
export type OperationsIntent = {
atomic: boolean;
atomicIntervals?: string[];
intervals: string[];
screenIntervals?: string[];
};
export function intervalKey(interval: OperationInterval): string {
// eslint-disable-next-line sonarjs/no-inverted-boolean-check -- Negation also rejects Invalid Date; >= would silently accept NaN.
if (!(interval.from < interval.to)) {
throw new Error('Invalid operations interval');
}
return JSON.stringify([
interval.accountId,
interval.from.toISOString(),
interval.to.toISOString(),
interval.instrumentUid ?? '',
]);
}
export function decodeInterval(key: string): OperationInterval {
const [accountId, from, to, instrumentUid] = JSON.parse(key) as string[];
return {
accountId,
from: new Date(from),
to: new Date(to),
...(instrumentUid ? { instrumentUid } : {}),
};
}
export function extendRunningIntent(input: {
additions: OperationInterval[];
intervals: OperationInterval[];
pending: OperationInterval[];
previous: OperationsIntent | undefined;
previousPriority: number;
priority: number;
publicationAtomic: boolean;
}): OperationsIntent {
const { previous, pending, additions, intervals, priority, previousPriority, publicationAtomic } = input;
const overlapsRequested = (item: OperationInterval) =>
intervals.some((target) => operationIntervalsOverlap(item, target));
const retainedScreen = previous?.screenIntervals ??
(previousPriority === operationsSyncPriority.screen ? (previous?.intervals ?? []) : []);
const addedScreen = priority === operationsSyncPriority.screen
? [...pending, ...additions].filter(overlapsRequested).map(intervalKey)
: [];
const ordered = priority < previousPriority
? [
...pending.filter(overlapsRequested),
...additions,
...pending.filter((item) => !overlapsRequested(item)),
]
: [...pending, ...additions];
return {
atomic: previous?.atomic ?? publicationAtomic,
atomicIntervals: previous?.atomic
? [...new Set([...(previous.atomicIntervals ?? previous.intervals), ...additions.map(intervalKey)])]
: [],
screenIntervals: [...new Set([...retainedScreen, ...addedScreen])],
intervals: ordered.map(intervalKey),
};
}
src/modules/investments/operations/infrastructure/brokerage-operation.mapper.ts
+5 -6
View File
@@ -1,9 +1,8 @@
import { formatDecimal } from '#src/common/decimal';
import { MILLISECONDS_PER_SECOND } from '#src/common/time';
import { decimal } from '#src/integrations/tbank/decimal';
import { TbankOperationType } from '#src/integrations/tbank/tbank-protocol';
import { TbankMoney, TbankOperationItem } from '#src/integrations/tbank/tbank.api';
import { formatDecimal } from '../../../../common/decimal';
import { MILLISECONDS_PER_SECOND } from '../../../../common/time';
import { decimal } from '../../../../integrations/tbank/decimal';
import { TbankOperationType } from '../../../../integrations/tbank/tbank-protocol';
import { TbankMoney, TbankOperationItem } from '../../../../integrations/tbank/tbank.api';
import { type OperationCategory } from '../../operation-category';
import { BrokerageOperationDto } from '../presentation/brokerage-operation.dto';
src/modules/investments/operations/infrastructure/brokerage-operations-read.repository.ts
-193
View File
@@ -1,193 +0,0 @@
import {
BadRequestException,
Injectable,
NotFoundException,
} from '@nestjs/common';
import { createHash } from 'node:crypto';
import { PrismaService } from '#src/prisma/prisma.service';
import {
dateOnlyBounds,
DateOnlyRange,
moscowDate,
} from '../../investment-calendar';
import { OperationErrorCode } from '../domain/operation-error-code';
import { decodeInterval } from '../domain/operations-interval-codec';
const CURSOR_LOOKAHEAD_ROWS = 1;
@Injectable()
export class BrokerageOperationsReadRepository {
constructor(private readonly prisma: PrismaService) {}
async readPage(input: {
accountId: string;
categories: string[];
cursor?: { accountId: string; at: string; binding: string; id: string };
filterKey: string;
from: Date;
instrumentUid?: string;
limit?: number;
periods?: (openedAt: Date | undefined) => DateOnlyRange[];
revision: string;
to: Date;
userId: string;
}) {
return this.prisma.$transaction(async (tx) => {
const connection = await tx.tbankConnection.findUnique({
where: {
userId_revision: { userId: input.userId, revision: input.revision },
invalidToken: false,
},
select: {
membershipAt: true,
membershipRevision: true,
accounts: {
where:
input.accountId === 'all' ? {} : { accountId: input.accountId },
orderBy: { accountId: 'asc' },
select: {
accountId: true,
name: true,
openedOn: true,
operationsRevision: true,
},
},
},
});
if (!connection) return null;
if (
connection.membershipAt &&
input.accountId !== 'all' &&
!connection.accounts.length
) {
throw new NotFoundException();
}
const accounts = connection.accounts;
// eslint-disable-next-line sonarjs/no-alphabetical-sort -- Code-unit ordering is intentional for canonical keys and ISO dates; locale collation would change persisted bindings.
const oldest = accounts.map((account) => account.openedOn).sort()[0];
const openedAt =
oldest && accounts.every((account) => account.openedOn)
? new Date(`${oldest}T00:00:00+03:00`)
: undefined;
const periods = input.periods?.(openedAt).map((period) => {
const now = new Date();
const bounds = dateOnlyBounds(period, now);
return {
...bounds,
key: `${period.from}/${period.to}`,
movingEnd: period.to >= moscowDate(now),
};
});
const binding = createHash('sha256')
.update(
JSON.stringify([
input.userId,
input.revision,
input.accountId === 'all' ? connection.membershipRevision : null,
accounts.map((account) => [
account.accountId,
account.operationsRevision,
]),
input.filterKey,
]),
)
.digest('base64url');
if (input.cursor && input.cursor.binding !== binding) {
throw new BadRequestException({ code: OperationErrorCode.InvalidOperationsCursor });
}
const scope = {
userId: input.userId,
revision: input.revision,
accountId: { in: accounts.map((account) => account.accountId) },
};
const coverage = await tx.tbankOperationCoverage.findMany({
where: scope,
});
const work = await tx.tbankSyncWork.findMany({
where: {
userId: input.userId,
revision: input.revision,
scopeKey: { startsWith: 'operations:' },
state: { in: ['running', 'failed'] },
},
select: {
id: true,
state: true,
errorCode: true,
intent: true,
priority: true,
},
});
const membershipWork = await tx.tbankSyncWork.findUnique({
where: {
userId_revision_scopeKey: {
userId: input.userId,
revision: input.revision,
scopeKey: 'membership',
},
},
select: { id: true, state: true, errorCode: true },
});
const after = input.cursor;
const rows = await tx.tbankOperation.findMany({
where: {
...scope,
...(periods
? {
OR: periods.map((period) => ({
occurredAt: { gte: period.from, lt: period.to },
})),
}
: { occurredAt: { gte: input.from, lt: input.to } }),
...(input.instrumentUid
? { instrumentUid: input.instrumentUid }
: {}),
...(input.categories.length
? { category: { in: input.categories } }
: {}),
...(after
? {
OR: [
{ occurredAt: { lt: new Date(after.at) } },
{
occurredAt: new Date(after.at),
accountId: { gt: after.accountId },
},
{
occurredAt: new Date(after.at),
accountId: after.accountId,
brokerOperationId: { gt: after.id },
},
],
}
: {}),
},
orderBy: [
{ occurredAt: 'desc' },
{ accountId: 'asc' },
{ brokerOperationId: 'asc' },
],
...(input.limit === undefined ? {} : { take: input.limit + CURSOR_LOOKAHEAD_ROWS }),
});
return {
connection,
periods,
membershipWork,
binding,
rows,
coverage: coverage.map(({ instrumentPredicate, ...row }) => ({
...row,
instrumentUid: instrumentPredicate || undefined,
})),
work: work.map(({ intent, ...row }) => ({
...row,
intervals: (intent as { intervals: string[] }).intervals.map(
decodeInterval,
),
})),
};
});
}
}
src/modules/investments/operations/infrastructure/brokerage-operations.repository.ts
+276 -25
View File
@@ -1,25 +1,26 @@
import { Injectable, NotFoundException } from '@nestjs/common';
import {
BadRequestException,
Injectable,
NotFoundException,
} from '@nestjs/common';
import { createHash, randomUUID } from 'node:crypto';
import { isDeepStrictEqual } from 'node:util';
import type { Prisma } from '#generated/prisma/client';
import type { Prisma } from '../../../../../generated/prisma/client';
import type {
TbankOperationItem,
TbankOperationsByCursorResponse,
} from '../../../../integrations/tbank/tbank.api';
import { TbankErrorCode } from '#src/integrations/tbank/tbank-error-code';
import { isTbankProtocolValue, TbankOperationState } from '#src/integrations/tbank/tbank-protocol';
import { claimSyncWork, lockConnectionGeneration } from '#src/integrations/tbank/tbank-sync-claim';
import { TbankErrorCode } from '../../../../integrations/tbank/tbank-error-code';
import { isTbankProtocolValue, TbankOperationState } from '../../../../integrations/tbank/tbank-protocol';
import { PrismaService } from '../../../../prisma/prisma.service';
import {
isJoinableRunningAttempt,
type TbankOperationItem, type TbankOperationsByCursorResponse,
} from '#src/integrations/tbank/tbank.api';
import { PrismaService } from '#src/prisma/prisma.service';
import { toJson } from '#src/prisma/to-json';
import {
decodeInterval,
extendRunningIntent,
intervalKey,
type OperationsIntent,
} from '../domain/operations-interval-codec';
dateOnlyBounds,
DateOnlyRange,
moscowDate,
} from '../../investment-calendar';
import { OperationErrorCode } from '../domain/operation-error-code';
import {
type OperationInterval,
operationIntervals,
@@ -32,13 +33,13 @@ import {
operationTimestamp,
} from './brokerage-operation.mapper';
const CURSOR_LOOKAHEAD_ROWS = 1;
const EMPTY_INTERVAL_COUNT = 0;
const SINGLE_WORK_GROUP = 1;
const INITIAL_PAGE_COUNT = 0;
const PAGE_INCREMENT = 1;
const EXPECTED_UPDATED_WORK_ITEMS = 1;
export type { OperationsIntent } from '../domain/operations-interval-codec';
export type { OperationInterval } from '../domain/operations-sync-plan';
export type OperationAttempt = {
@@ -47,6 +48,12 @@ export type OperationAttempt = {
revision: string;
userId: string;
};
type OperationsIntent = {
atomic: boolean;
atomicIntervals?: string[];
intervals: string[];
screenIntervals?: string[];
};
type PageProgress = {
complete: boolean;
cursor: string;
@@ -59,6 +66,176 @@ const progressItem = '';
export class BrokerageOperationsRepository {
constructor(private readonly prisma: PrismaService) {}
async readPage(input: {
accountId: string;
categories: string[];
cursor?: { accountId: string; at: string; binding: string; id: string };
filterKey: string;
from: Date;
instrumentUid?: string;
limit?: number;
periods?: (openedAt: Date | undefined) => DateOnlyRange[];
revision: string;
to: Date;
userId: string;
}) {
return this.prisma.$transaction(async (tx) => {
const connection = await tx.tbankConnection.findUnique({
where: {
userId_revision: { userId: input.userId, revision: input.revision },
invalidToken: false,
},
select: {
membershipAt: true,
membershipRevision: true,
accounts: {
where:
input.accountId === 'all' ? {} : { accountId: input.accountId },
orderBy: { accountId: 'asc' },
select: {
accountId: true,
name: true,
openedOn: true,
operationsRevision: true,
},
},
},
});
if (!connection) return null;
if (
connection.membershipAt &&
input.accountId !== 'all' &&
!connection.accounts.length
) {
throw new NotFoundException();
}
const accounts = connection.accounts;
// eslint-disable-next-line sonarjs/no-alphabetical-sort -- Code-unit ordering is intentional for canonical keys and ISO dates; locale collation would change persisted bindings.
const oldest = accounts.map((account) => account.openedOn).sort()[0];
const openedAt =
oldest && accounts.every((account) => account.openedOn)
? new Date(`${oldest}T00:00:00+03:00`)
: undefined;
const periods = input.periods?.(openedAt).map((period) => {
const now = new Date();
const bounds = dateOnlyBounds(period, now);
return {
...bounds,
key: `${period.from}/${period.to}`,
movingEnd: period.to >= moscowDate(now),
};
});
const binding = createHash('sha256')
.update(
JSON.stringify([
input.userId,
input.revision,
input.accountId === 'all' ? connection.membershipRevision : null,
accounts.map((account) => [
account.accountId,
account.operationsRevision,
]),
input.filterKey,
]),
)
.digest('base64url');
if (input.cursor && input.cursor.binding !== binding) {
throw new BadRequestException({ code: OperationErrorCode.InvalidOperationsCursor });
}
const scope = {
userId: input.userId,
revision: input.revision,
accountId: { in: accounts.map((account) => account.accountId) },
};
const coverage = await tx.tbankOperationCoverage.findMany({
where: scope,
});
const work = await tx.tbankSyncWork.findMany({
where: {
userId: input.userId,
revision: input.revision,
scopeKey: { startsWith: 'operations:' },
state: { in: ['running', 'failed'] },
},
select: {
id: true,
state: true,
errorCode: true,
intent: true,
priority: true,
},
});
const membershipWork = await tx.tbankSyncWork.findUnique({
where: {
userId_revision_scopeKey: {
userId: input.userId,
revision: input.revision,
scopeKey: 'membership',
},
},
select: { id: true, state: true, errorCode: true },
});
const after = input.cursor;
const rows = await tx.tbankOperation.findMany({
where: {
...scope,
...(periods
? {
OR: periods.map((period) => ({
occurredAt: { gte: period.from, lt: period.to },
})),
}
: { occurredAt: { gte: input.from, lt: input.to } }),
...(input.instrumentUid
? { instrumentUid: input.instrumentUid }
: {}),
...(input.categories.length
? { category: { in: input.categories } }
: {}),
...(after
? {
OR: [
{ occurredAt: { lt: new Date(after.at) } },
{
occurredAt: new Date(after.at),
accountId: { gt: after.accountId },
},
{
occurredAt: new Date(after.at),
accountId: after.accountId,
brokerOperationId: { gt: after.id },
},
],
}
: {}),
},
orderBy: [
{ occurredAt: 'desc' },
{ accountId: 'asc' },
{ brokerOperationId: 'asc' },
],
...(input.limit === undefined ? {} : { take: input.limit + CURSOR_LOOKAHEAD_ROWS }),
});
return {
connection,
periods,
membershipWork,
binding,
rows,
coverage: coverage.map(({ instrumentPredicate, ...row }) => ({
...row,
instrumentUid: instrumentPredicate || undefined,
})),
work: work.map(({ intent, ...row }) => ({
...row,
intervals: (intent as { intervals: string[] }).intervals.map(
decodeInterval,
),
})),
};
});
}
async coverage(userId: string, revision: string, accountIds: string[]) {
const rows = await this.prisma.tbankOperationCoverage.findMany({
where: {
@@ -91,10 +268,16 @@ export class BrokerageOperationsRepository {
.update(JSON.stringify([...new Set(intervals.map(intervalKey))].sort()))
.digest('hex');
return this.prisma.$transaction(async (tx) => {
const locked = await lockConnectionGeneration(tx, { userId, revision }, {
membershipAt: { not: null },
const locked = await tx.tbankConnection.updateMany({
where: {
userId,
revision,
invalidToken: false,
membershipAt: { not: null },
},
data: { membershipRevision: { increment: 0 } },
});
if (!locked) return null;
if (!locked.count) return null;
const accounts = await tx.tbankAccount.findMany({
where: { userId, revision },
select: { accountId: true, openedOn: true },
@@ -196,7 +379,9 @@ export class BrokerageOperationsRepository {
publicationAtomic && previousIntent && !previousIntent.atomic;
if (
touching.length <= SINGLE_WORK_GROUP &&
isJoinableRunningAttempt(previous, processRunId, runningAttempts) &&
previous?.state === 'running' &&
previous.processRunId === processRunId &&
runningAttempts.has(previous.attemptId) &&
!upgradeGroup
) {
const pending = previousIntent?.intervals.map(decodeInterval) ?? [];
@@ -471,7 +656,9 @@ export class BrokerageOperationsRepository {
) {
continue;
}
const payload = toJson({ ...operation, cursor: undefined });
const payload = JSON.parse(
JSON.stringify({ ...operation, cursor: undefined }),
) as Prisma.InputJsonObject;
// Provider pagination position is not part of a financial row.
const identity = { ...stage, itemKey: operation.id };
const previous = await tx.tbankSyncStage.findUnique({
@@ -695,10 +882,74 @@ export class BrokerageOperationsRepository {
}
}
function extendRunningIntent(input: {
additions: OperationInterval[];
intervals: OperationInterval[];
pending: OperationInterval[];
previous: OperationsIntent | undefined;
previousPriority: number;
priority: number;
publicationAtomic: boolean;
}): OperationsIntent {
const { previous, pending, additions, intervals, priority, previousPriority, publicationAtomic } = input;
const overlapsRequested = (item: OperationInterval) =>
intervals.some((target) => operationIntervalsOverlap(item, target));
const retainedScreen = previous?.screenIntervals ??
(previousPriority === operationsSyncPriority.screen ? (previous?.intervals ?? []) : []);
const addedScreen = priority === operationsSyncPriority.screen
? [...pending, ...additions].filter(overlapsRequested).map(intervalKey)
: [];
const ordered = priority < previousPriority
? [
...pending.filter(overlapsRequested),
...additions,
...pending.filter((item) => !overlapsRequested(item)),
]
: [...pending, ...additions];
return {
atomic: previous?.atomic ?? publicationAtomic,
atomicIntervals: previous?.atomic
? [...new Set([...(previous.atomicIntervals ?? previous.intervals), ...additions.map(intervalKey)])]
: [],
screenIntervals: [...new Set([...retainedScreen, ...addedScreen])],
intervals: ordered.map(intervalKey),
};
}
function intervalKey(interval: OperationInterval): string {
// eslint-disable-next-line sonarjs/no-inverted-boolean-check -- Negation also rejects Invalid Date; >= would silently accept NaN.
if (!(interval.from < interval.to)) {
throw new Error('Invalid operations interval');
}
return JSON.stringify([
interval.accountId,
interval.from.toISOString(),
interval.to.toISOString(),
interval.instrumentUid ?? '',
]);
}
async function claim(
tx: Prisma.TransactionClient,
attempt: OperationAttempt,
): Promise<boolean> {
const count = await claimSyncWork(tx, attempt, { updatedAt: new Date() });
return count === EXPECTED_UPDATED_WORK_ITEMS;
const result = await tx.tbankSyncWork.updateMany({
where: {
...attempt,
state: 'running',
connection: { invalidToken: false },
},
data: { updatedAt: new Date() },
});
return result.count === EXPECTED_UPDATED_WORK_ITEMS;
}
function decodeInterval(key: string): OperationInterval {
const [accountId, from, to, instrumentUid] = JSON.parse(key) as string[];
return {
accountId,
from: new Date(from),
to: new Date(to),
...(instrumentUid ? { instrumentUid } : {}),
};
}
src/modules/investments/operations/operations.module.ts
+1 -6
View File
@@ -1,13 +1,10 @@
import { Module } from '@nestjs/common';
import { TbankModule } from '#src/integrations/tbank/tbank.module';
import { TbankModule } from '../../../integrations/tbank/tbank.module';
import { AuthModule } from '../../auth/auth.module';
import { TbankSyncRepositoryModule } from '../tbank-sync/tbank-sync-repository.module';
import { BrokerageOperationsSyncService } from './application/brokerage-operations-sync.service';
import { BrokerageOperationsService } from './application/brokerage-operations.service';
import { LocalOperationsCursorCodec } from './application/local-operations-cursor.codec';
import { BrokerageOperationsReadRepository } from './infrastructure/brokerage-operations-read.repository';
import { BrokerageOperationsRepository } from './infrastructure/brokerage-operations.repository';
import { BrokerageOperationsController } from './presentation/brokerage-operations.controller';
@@ -17,8 +14,6 @@ import { BrokerageOperationsController } from './presentation/brokerage-operatio
providers: [
BrokerageOperationsService,
BrokerageOperationsRepository,
BrokerageOperationsReadRepository,
LocalOperationsCursorCodec,
BrokerageOperationsSyncService,
],
exports: [BrokerageOperationsService, BrokerageOperationsSyncService],
src/modules/investments/operations/presentation/brokerage-operation.dto.ts
+1 -2
View File
@@ -13,8 +13,7 @@ import {
Min,
} from 'class-validator';
import { MoneyDto } from '#src/common/money.dto';
import { MoneyDto } from '../../../../common/money.dto';
import { AccountReferenceDto } from '../../account-reference.dto';
import { InvestmentResourceMetaDto } from '../../investment-resource.dto';
import { operationCategories, type OperationCategory } from '../../operation-category';
src/modules/investments/operations/presentation/brokerage-operations.controller.spec.ts
+1 -1
View File
@@ -1,4 +1,4 @@
jest.mock('#src/prisma/prisma.service', () => ({
jest.mock('../../../../prisma/prisma.service', () => ({
PrismaService: class PrismaService {},
}));
src/modules/investments/operations/presentation/brokerage-operations.controller.ts
+2 -3
View File
@@ -3,9 +3,8 @@ import type { Request } from 'express';
import { Controller, Get, Param, Query, Req, UseGuards } from '@nestjs/common';
import { ApiBearerAuth, ApiOkResponse, ApiTags } from '@nestjs/swagger';
import { ApiProblemResponses } from '#src/common/decorators/api-safe-error-response.decorator';
import { AccessPayload, JwtAuthGuard } from '#src/modules/auth/auth.api';
import { ApiProblemResponses } from '../../../../common/decorators/api-safe-error-response.decorator';
import { AccessPayload, JwtAuthGuard } from '../../../auth/auth.api';
import { BrokerageOperationsService } from '../application/brokerage-operations.service';
import {
BrokerageOperationsQueryDto,
src/modules/investments/portfolio/application/forecast.service.ts
+3 -7
View File
@@ -1,9 +1,8 @@
import { Injectable } from '@nestjs/common';
import { add, decimalFromString, formatDecimal } from '#src/common/decimal';
import type { InvestmentResourceMetaDto } from '../../investment-resource.dto';
import { add, decimalFromString, formatDecimal } from '../../../../common/decimal';
import { investmentResourceMeta } from '../../investment-resource.mapper';
import {
ForecastRepository,
@@ -21,7 +20,6 @@ export class ForecastService {
lastAttempt?: InvestmentResourceMetaDto['lastAttempt'];
membershipRevision: number;
portfolio: InvestmentResourceMetaDto;
replacesLatest?: boolean;
revision: string;
scopeKey: string;
sources: {
@@ -76,7 +74,7 @@ export class ForecastService {
.map((dependency) => dependency.sync)
.find((sync) => sync.state === 'failed');
return {
data: stored ? filterEvents(stored.payload as T, input.scopeKey, stored.scopeKey) : null,
data: stored ? filterEvents(stored.payload as T, input.scopeKey) : null,
meta: investmentResourceMeta({
resourceKey: input.scopeKey,
dataRevision: String(stored?.dataRevision ?? MISSING_DATA_REVISION),
@@ -97,7 +95,7 @@ export class ForecastService {
}
}
function filterEvents<T extends object>(payload: T, scopeKey: string, savedScopeKey: string): T {
function filterEvents<T extends object>(payload: T, scopeKey: string): T {
if (!scopeKey.startsWith('events/')) return payload;
try {
const [, from, to] = JSON.parse(scopeKey.slice('events/'.length)) as [string, string, string];
@@ -113,10 +111,8 @@ function filterEvents<T extends object>(payload: T, scopeKey: string, savedScope
const current = totals.get(event.projectedAmount.currency) ?? { value: 0n, scale: 0 };
totals.set(event.projectedAmount.currency, add(current, decimalFromString(event.projectedAmount.value)));
}
const [, savedFrom, savedTo] = JSON.parse(savedScopeKey.slice('events/'.length)) as [string, string, string];
return {
...value,
window: { from: savedFrom, to: savedTo },
events,
incomeTotalsByCurrency: [...totals]
.sort(([left], [right]) => left.localeCompare(right))
src/modules/investments/portfolio/application/portfolio.service.spec.ts
+2 -48
View File
@@ -1,15 +1,14 @@
import assert from 'node:assert/strict';
jest.mock('#src/prisma/prisma.service', () => ({
jest.mock('../../../../prisma/prisma.service', () => ({
PrismaService: class {},
}));
import { PortfolioDto } from '../presentation/portfolio.dto';
import { PortfolioService } from './portfolio.service';
describe('persistent portfolio projection', () => {
const access = { local: jest.fn(), tokenForAttempt: jest.fn(), rejectMembershipToken: jest.fn() };
const access = { local: jest.fn(), tokenForAttempt: jest.fn() };
const tbank = { getPortfolio: jest.fn(), getPositions: jest.fn() };
const metadata = { savedMany: jest.fn(), request: jest.fn() };
const classification = { refresh: jest.fn() };
const repository = {
read: jest.fn(),
reserve: jest.fn(),
@@ -24,7 +23,6 @@ describe('persistent portfolio projection', () => {
access as never,
tbank as never,
metadata as never,
classification as never,
repository as never,
{ request: jest.fn().mockResolvedValue(null) } as never,
{ event: jest.fn() } as never,
@@ -36,7 +34,6 @@ describe('persistent portfolio projection', () => {
accounts: [{ accountId: 'a' }, { accountId: 'b' }],
});
access.tokenForAttempt.mockResolvedValue('synthetic');
access.rejectMembershipToken.mockResolvedValue(undefined);
repository.reserve.mockResolvedValue(null);
repository.read.mockResolvedValue({
membershipAt,
@@ -47,37 +44,6 @@ describe('persistent portfolio projection', () => {
repository.publish.mockResolvedValue(true);
metadata.savedMany.mockResolvedValue(new Map());
metadata.request.mockResolvedValue(null);
classification.refresh.mockResolvedValue(new Map());
});
it('refreshes classification before publishing and passes the hourly walk time', async () => {
const walkStartedAt = new Date('2026-10-31T12:00:00Z');
const position = { instrumentType: 'share', instrumentUid: 'uid', figi: 'figi', quantity: { units: '1' } };
repository.reserve.mockResolvedValue({ launch: true, work: { id: 'work', attemptId: 'attempt' } });
tbank.getPortfolio.mockResolvedValue({ positions: [position] });
tbank.getPositions.mockResolvedValue({ money: [] });
classification.refresh.mockResolvedValue(new Map([[JSON.stringify(['uid', 'figi']), {
sector: 'Energy', issuer: { id: 'issuer', name: 'Issuer' },
}]]));
const handle = await service.request('user', 'private', 'a', true, walkStartedAt);
assert(handle);
await handle.done;
expect(classification.refresh).toHaveBeenCalledWith('synthetic', [position], walkStartedAt);
expect(classification.refresh.mock.invocationCallOrder[0]).toBeLessThan(repository.publish.mock.invocationCallOrder[0]);
const snapshot = (repository.publish.mock.calls as [unknown, string, PortfolioDto][])[0][2];
expect(snapshot.positions[0]).toEqual(expect.objectContaining({
sector: 'Energy', issuer: { id: 'issuer', name: 'Issuer' },
}));
});
it('rejects an invalid classification token without publishing the snapshot', async () => {
repository.reserve.mockResolvedValue({ launch: true, work: { id: 'work', attemptId: 'attempt' } });
tbank.getPortfolio.mockResolvedValue({ positions: [] });
tbank.getPositions.mockResolvedValue({ money: [] });
classification.refresh.mockRejectedValue(new Error('INVALID_TBANK_TOKEN'));
const handle = await service.request('user', 'private', 'a');
assert(handle);
await handle.done;
expect(repository.publish).not.toHaveBeenCalled();
expect(access.rejectMembershipToken).toHaveBeenCalled();
});
it('normalizes exact signed money, order, UID metadata and unknown types without metadata RPC', async () => {
repository.reserve.mockResolvedValueOnce({
@@ -218,18 +184,6 @@ describe('persistent portfolio projection', () => {
expect(snapshot.structure.currencies[0].totalValue).toBe('121.49');
});
// Test intent: a corrupted Json payload must fail loudly instead of being spread into the API response.
it('rejects a stored snapshot payload without the persisted shape', async () => {
repository.read.mockResolvedValue({
membershipAt,
membershipRevision: 1,
accounts: [{ accountId: 'a', name: 'A', type: 'BROKERAGE', openedOn: null,
portfolio: { payload: { positions: 'broken' }, fetchedAt: membershipAt, dataRevision: 1 } }],
work: [],
});
await expect(service.read('user', 'all')).rejects.toThrow('Corrupted portfolio snapshot payload');
});
it('does not turn a missing account snapshot into aggregate zero; summaries stay independent', async () => {
const snapshot: PortfolioDto = {
lastSuccessfulAt: membershipAt.toISOString(),
src/modules/investments/portfolio/application/portfolio.service.ts
+13 -31
View File
@@ -4,10 +4,8 @@ import {
} from '@nestjs/common';
import { randomUUID } from 'node:crypto';
import type { Prisma } from '#generated/prisma/client';
import { StructuredLogger } from '#src/common/logging/structured-logger.service';
import { isTbankErrorCode, TbankErrorCode } from '#src/integrations/tbank/tbank-error-code';
import { StructuredLogger } from '../../../../common/logging/structured-logger.service';
import { isTbankErrorCode, TbankErrorCode } from '../../../../integrations/tbank/tbank-error-code';
import {
InstrumentMetadataService,
metadataKey,
@@ -17,8 +15,7 @@ import {
type TbankMoney,
type TbankPortfolio,
tbankSourceTtlMs,
} from '#src/integrations/tbank/tbank.api';
} from '../../../../integrations/tbank/tbank.api';
import { investmentResourceMeta } from '../../investment-resource.mapper';
import {
hourlyAttempt,
@@ -29,12 +26,10 @@ import { sumMoneyByCurrency } from '../domain/portfolio-totals';
import {
portfolioFreshForMs,
PortfolioRepository,
portfolioSnapshot,
portfolioWorkKey,
} from '../infrastructure/portfolio.repository';
import { mapPortfolio } from '../infrastructure/tbank-portfolio.mapper';
import { PortfolioDto } from '../presentation/portfolio.dto';
import { type Classification, PositionClassificationService } from './position-classification.service';
const MISSING_DATA_REVISION = 0;
const NO_ACCOUNTS = 0;
@@ -51,7 +46,6 @@ export class PortfolioService {
private readonly access: TbankAccessService,
private readonly tbank: TbankClient,
private readonly metadata: InstrumentMetadataService,
private readonly classification: PositionClassificationService,
private readonly repository: PortfolioRepository,
private readonly membership: TbankMembershipService,
private readonly logger: StructuredLogger,
@@ -92,7 +86,13 @@ export class PortfolioService {
type: account.type,
openedOn: account.openedOn,
snapshot: account.portfolio
? savedSnapshot(account.portfolio)
? {
...(account.portfolio.payload as unknown as PortfolioDto),
lastSuccessfulAt: account.portfolio.fetchedAt.toISOString(),
isStale:
Date.now() - account.portfolio.fetchedAt.valueOf() >=
portfolioFreshForMs,
}
: null,
meta: investmentResourceMeta({
resourceKey: `portfolio/${encodeURIComponent(account.accountId)}`,
@@ -231,8 +231,8 @@ export class PortfolioService {
};
}
request(userId: string, revision: string, accountId: string, force = false, walkStartedAt?: Date) {
return this.queueSnapshot(userId, revision, accountId, force, walkStartedAt);
request(userId: string, revision: string, accountId: string, force = false) {
return this.queueSnapshot(userId, revision, accountId, force);
}
private queueSnapshot(
@@ -240,7 +240,6 @@ export class PortfolioService {
revision: string,
accountId: string,
force = false,
walkStartedAt = new Date(),
) {
const reserved = this.reservations.then(async () => {
const requested = await this.repository.reserve(
@@ -269,11 +268,9 @@ export class PortfolioService {
this.tbank.getPortfolio(token, accountId),
this.tbank.getPositions(token, accountId),
]);
const classifications = await this.classification.refresh(token, portfolio.positions ?? [], walkStartedAt);
const snapshot = await this.normalize(
portfolio.positions ?? [],
positions.money ?? [],
classifications,
);
const published = await this.repository.publish(
attempt,
@@ -312,24 +309,9 @@ export class PortfolioService {
private async normalize(
upstream: NonNullable<TbankPortfolio['positions']>,
money: TbankMoney[],
classifications: ReadonlyMap<string, Classification>,
): Promise<PortfolioDto> {
const lastSuccessfulAt = new Date().toISOString().replace(/\.\d{3}Z$/, 'Z');
const savedMetadata = await this.metadata.savedMany(upstream);
return mapPortfolio(upstream, money, savedMetadata, lastSuccessfulAt, classifications);
return mapPortfolio(upstream, money, savedMetadata, lastSuccessfulAt);
}
}
function savedSnapshot(saved: { fetchedAt: Date; payload: Prisma.JsonValue }): PortfolioDto {
const snapshot = portfolioSnapshot(saved.payload);
return {
...snapshot,
positions: snapshot.positions.map((position) => ({
...position,
sector: position.sector ?? null,
issuer: position.issuer ?? null,
})),
lastSuccessfulAt: saved.fetchedAt.toISOString(),
isStale: Date.now() - saved.fetchedAt.valueOf() >= portfolioFreshForMs,
};
}
src/modules/investments/portfolio/application/position-classification.service.spec.ts
-173
View File
@@ -1,173 +0,0 @@
import { NotFoundException } from '@nestjs/common';
jest.mock('#src/prisma/prisma.service', () => ({ PrismaService: class {} }));
import { TbankErrorCode } from '#src/integrations/tbank/tbank-error-code';
import { InstrumentIdType } from '#src/integrations/tbank/tbank-protocol';
import { PositionClassificationService } from './position-classification.service';
describe('PositionClassificationService', () => {
const position = { instrumentType: 'share', instrumentUid: 'uid', figi: 'figi', quantity: { units: 1 } };
const saved = { sector: 'Old', sectorFetchedAt: new Date('2026-10-30T12:00:00Z'), assetUid: 'asset', brandUid: 'brand', brandName: 'Old brand', brandFetchedAt: new Date('2026-10-30T12:00:00Z') };
const tbank = { getShare: jest.fn(), getAssetBrand: jest.fn(), getBond: jest.fn(), getEtf: jest.fn() };
const repository = { read: jest.fn(), save: jest.fn() };
const logger = { event: jest.fn() };
const service = new PositionClassificationService(tbank as never, repository as never, logger as never);
beforeEach(() => {
jest.resetAllMocks();
repository.read.mockResolvedValue(saved);
repository.save.mockImplementation((_key: string, update: Record<string, unknown>) => Promise.resolve({ ...saved, ...update }));
tbank.getAssetBrand.mockResolvedValue({ assetUid: 'asset', brand: { uid: 'new-brand', name: 'New brand' } });
});
it('does not fetch a value at 23:59, and refreshes it at 24:00', async () => {
await service.refresh('token', [position], new Date('2026-10-31T11:59:00Z'));
expect(tbank.getShare).not.toHaveBeenCalled();
tbank.getShare.mockResolvedValue({ uid: 'uid', figi: 'figi', sector: ' Tech ', assetUid: 'asset' });
const result = await service.refresh('token', [position], new Date('2026-10-31T12:00:00Z'));
expect(result.values().next().value).toEqual({ sector: 'Tech', issuer: { id: 'new-brand', name: 'New brand' } });
expect(repository.save).toHaveBeenCalledWith(expect.any(String), {
sector: 'Tech', sectorFetchedAt: new Date('2026-10-31T12:00:00Z'),
brandUid: 'new-brand', brandName: 'New brand', brandFetchedAt: new Date('2026-10-31T12:00:00Z'),
});
});
it('accepts a matching FIGI after UID NOT_FOUND', async () => {
tbank.getShare.mockRejectedValueOnce(new NotFoundException()).mockResolvedValueOnce({ uid: 'different', figi: 'figi', sector: 'Energy', assetUid: 'asset' });
const result = await service.refresh('token', [position], new Date('2026-10-31T12:00:00Z'));
expect(tbank.getShare).toHaveBeenNthCalledWith(2, 'token', 'figi', InstrumentIdType.Figi, true);
expect(result.values().next().value?.sector).toBe('Energy');
});
it('preserves saved values on mismatched instrument and returns refreshed values on database failure', async () => {
tbank.getShare.mockResolvedValue({ uid: 'wrong', sector: 'Energy' });
const result = await service.refresh('token', [position], new Date('2026-10-31T12:00:00Z'));
expect(result.values().next().value?.sector).toBe('Old');
repository.save.mockRejectedValue(new Error('db unavailable'));
tbank.getShare.mockResolvedValue({ uid: 'uid', sector: 'Energy', assetUid: 'asset' });
const fallback = await service.refresh('token', [position], new Date('2026-10-31T12:00:00Z'));
expect(fallback.values().next().value?.sector).toBe('Energy');
expect(logger.event).toHaveBeenCalled();
});
it('does not retain an issuer from a previous asset when the asset changes', async () => {
repository.read.mockResolvedValue({ ...saved, brandFetchedAt: new Date('2026-10-31T12:00:00Z') });
tbank.getShare.mockResolvedValue({ uid: 'uid', sector: 'Energy', assetUid: 'other' });
tbank.getAssetBrand.mockResolvedValue({ assetUid: 'other', brand: { uid: 'other-brand', name: 'Other brand' } });
const result = await service.refresh('token', [position], new Date('2026-10-31T12:00:00Z'));
expect(tbank.getAssetBrand).toHaveBeenCalledWith('token', 'other');
expect(result.values().next().value?.issuer).toEqual({ id: 'other-brand', name: 'Other brand' });
});
it('does not restart the brand clock when the brand fetch fails after an asset change', async () => {
repository.read.mockResolvedValue({ ...saved, brandFetchedAt: new Date('2026-10-31T12:00:00Z') });
tbank.getShare.mockResolvedValue({ uid: 'uid', sector: 'Energy', assetUid: 'other' });
tbank.getAssetBrand.mockRejectedValue(new Error('upstream unavailable'));
const result = await service.refresh('token', [position], new Date('2026-10-31T12:00:00Z'));
expect(result.values().next().value?.issuer).toBeNull();
expect(repository.save).toHaveBeenCalledWith(expect.any(String), expect.objectContaining({
assetUid: 'other', brandUid: null, brandName: null, brandFetchedAt: null,
}));
});
it('does not return the previous asset brand when saving a changed asset fails', async () => {
repository.save.mockRejectedValue(new Error('db unavailable'));
tbank.getShare.mockResolvedValue({ uid: 'uid', sector: 'Energy', assetUid: 'other' });
tbank.getAssetBrand.mockRejectedValue(new Error('upstream unavailable'));
const result = await service.refresh('token', [position], new Date('2026-10-31T12:00:00Z'));
expect(result.values().next().value).toEqual({ sector: 'Energy', issuer: null });
expect(repository.save).toHaveBeenCalledWith(expect.any(String), expect.objectContaining({
assetUid: 'other', brandUid: null, brandName: null, brandFetchedAt: null,
}));
expect(logger.event).toHaveBeenCalled();
});
it('records a fetched brand as null when a fresh instrument has no asset_uid', async () => {
repository.read.mockResolvedValue(null);
tbank.getShare.mockResolvedValue({ uid: 'uid', sector: 'Energy' });
await service.refresh('token', [position], new Date('2026-10-31T12:00:00Z'));
expect(repository.save).toHaveBeenCalledWith(expect.any(String), expect.objectContaining({
brandUid: null, brandName: null, brandFetchedAt: new Date('2026-10-31T12:00:00Z'),
}));
});
it('treats a NOT_FOUND answer as fetched and does not refetch it an hour later', async () => {
tbank.getShare.mockRejectedValue(new NotFoundException());
await service.refresh('token', [position], new Date('2026-10-31T12:00:00Z'));
expect(repository.save).toHaveBeenCalledWith(expect.any(String), expect.objectContaining({
sector: null, sectorFetchedAt: new Date('2026-10-31T12:00:00Z'),
}));
repository.read.mockResolvedValue({ ...saved, sector: null, sectorFetchedAt: new Date('2026-10-31T12:00:00Z'), assetUid: null, brandUid: null, brandName: null, brandFetchedAt: new Date('2026-10-31T12:00:00Z') });
tbank.getShare.mockClear();
await service.refresh('token', [position], new Date('2026-10-31T13:00:00Z'));
expect(tbank.getShare).not.toHaveBeenCalled();
});
it('records a missing brand and restarts its clock when NOT_FOUND has no saved asset UID', async () => {
repository.read.mockResolvedValue(null);
tbank.getShare.mockRejectedValue(new NotFoundException());
const startedAt = new Date('2026-10-31T12:00:00Z');
const result = await service.refresh('token', [position], startedAt);
expect(result.values().next().value).toEqual({ sector: null, issuer: null });
expect(repository.save).toHaveBeenCalledWith(expect.any(String), expect.objectContaining({
brandUid: null, brandName: null, brandFetchedAt: startedAt,
}));
expect(tbank.getAssetBrand).not.toHaveBeenCalled();
});
it('does not leak one refresh call\'s invalid token into another call', async () => {
tbank.getShare.mockRejectedValueOnce(new Error(TbankErrorCode.InvalidToken))
.mockResolvedValueOnce({ uid: 'uid', figi: 'figi', sector: 'Energy', assetUid: 'asset' });
await expect(service.refresh('first', [position], new Date('2026-10-31T12:00:00Z'))).rejects.toThrow();
const result = await service.refresh('second', [position], new Date('2026-10-31T12:00:00Z'));
expect(result.values().next().value?.sector).toBe('Energy');
});
it('propagates an invalid token before publishing a classification', async () => {
tbank.getShare.mockRejectedValue(new Error(TbankErrorCode.InvalidToken));
const result = service.refresh('token', [position], new Date('2026-10-31T12:00:00Z'));
await expect(result).rejects.toThrow(TbankErrorCode.InvalidToken);
expect(repository.save).not.toHaveBeenCalled();
});
it('leaves a fresh brand untouched when the sector refresh finds the same asset', async () => {
repository.read.mockResolvedValue({ ...saved, brandFetchedAt: new Date('2026-10-31T12:00:00Z') });
tbank.getShare.mockResolvedValue({ uid: 'uid', sector: 'Energy', assetUid: 'asset' });
await service.refresh('token', [position], new Date('2026-10-31T12:00:00Z'));
expect(tbank.getAssetBrand).not.toHaveBeenCalled();
});
it('skips unsupported types, zero-quantity positions, and shares a brand lookup across instruments', async () => {
repository.read.mockResolvedValue(null);
tbank.getShare.mockResolvedValue({ uid: 'uid', sector: 'Energy', assetUid: 'asset' });
tbank.getBond.mockResolvedValue({ uid: 'bond', sector: 'Energy', assetUid: 'asset' });
const result = await service.refresh('token', [
{ instrumentType: 'currency', instrumentUid: 'cash', figi: 'cash', quantity: { units: 1 } },
{ instrumentType: 'share', instrumentUid: 'empty', figi: 'empty', quantity: {} },
{ instrumentType: 'Share', instrumentUid: 'upper', figi: 'upper', quantity: { units: 1 } },
position,
{ instrumentType: 'bond', instrumentUid: 'bond', figi: 'bond-figi', quantity: { units: 1 } },
], new Date('2026-10-31T12:00:00Z'));
expect(result.size).toBe(3);
expect(tbank.getAssetBrand).toHaveBeenCalledTimes(1);
expect(tbank.getEtf).not.toHaveBeenCalled();
});
it('skips duplicate instrument keys and retries a failed asset lookup for another instrument in the same walk', async () => {
repository.read.mockResolvedValue(null);
tbank.getShare.mockResolvedValue({ uid: 'uid', sector: 'Energy', assetUid: 'asset' });
tbank.getBond.mockResolvedValue({ uid: 'bond', sector: 'Energy', assetUid: 'asset' });
tbank.getAssetBrand.mockRejectedValueOnce(new Error('upstream unavailable'))
.mockResolvedValueOnce({ assetUid: 'asset', brand: { uid: 'new-brand', name: 'New brand' } });
const result = await service.refresh('token', [position, position,
{ instrumentType: 'bond', instrumentUid: 'bond', figi: 'bond-figi', quantity: { units: 1 } },
], new Date('2026-10-31T12:00:00Z'));
expect(result.size).toBe(2);
expect(tbank.getShare).toHaveBeenCalledTimes(1);
expect(tbank.getAssetBrand).toHaveBeenCalledTimes(2);
expect([...result.values()].map(({ issuer }) => issuer)).toEqual([
null, { id: 'new-brand', name: 'New brand' },
]);
});
});

Some files were not shown because too many files have changed in this diff Show More