Compare commits
12
Commits
v2.3.1
...
e7827dcac6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e7827dcac6 | ||
|
|
99b137ed0b | ||
|
|
5cf914752d | ||
|
|
d37fa2c903 | ||
|
|
5295945ab2 | ||
|
|
22668da3fa | ||
|
|
2325b63883 | ||
|
|
f2843e30bd | ||
|
|
97fc41fa29 | ||
|
|
3dcd1a69a6 | ||
|
|
0dff4b4377 | ||
|
|
a250142a86 |
@@ -56,6 +56,7 @@ export default defineConfig(
|
||||
'after',
|
||||
{ overrides: { '?': 'before', ':': 'before' } },
|
||||
],
|
||||
'import-x/no-cycle': 'error',
|
||||
'import-x/no-duplicates': ['error', { 'prefer-inline': true }],
|
||||
},
|
||||
},
|
||||
@@ -211,4 +212,24 @@ export default defineConfig(
|
||||
'@typescript-eslint/no-unsafe-enum-comparison': 'error',
|
||||
},
|
||||
},
|
||||
{
|
||||
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: [{
|
||||
target: './src',
|
||||
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.',
|
||||
}],
|
||||
}],
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
-- Points written before WealthLedger/backend#140 counted cash twice (cash balance
|
||||
-- plus the mirroring CURRENCY position). Historical compositions and FX rates are
|
||||
-- not stored, so the points cannot be recomputed exactly; history restarts here.
|
||||
DELETE FROM "TbankPortfolioValuePoint";
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Injectable, ServiceUnavailableException } from '@nestjs/common';
|
||||
import { constants as httpStatus } from 'node:http2';
|
||||
|
||||
enum MoexErrorCode { Unavailable = 'MOEX_UNAVAILABLE' }
|
||||
export enum MoexErrorCode { Unavailable = 'MOEX_UNAVAILABLE' }
|
||||
|
||||
const MIN_PRICE_PERCENT_EXCLUSIVE = 0;
|
||||
const FIRST_PAGE_OFFSET = 0;
|
||||
|
||||
@@ -4,7 +4,7 @@ import { LRUCache } from 'lru-cache';
|
||||
|
||||
import { ISO_DATE_LENGTH, ISO_DATE_START } from '../../common/time';
|
||||
|
||||
enum NcrErrorCode { Unavailable = 'NCR_UNAVAILABLE' }
|
||||
export enum NcrErrorCode { Unavailable = 'NCR_UNAVAILABLE' }
|
||||
|
||||
const EXPECTED_REGISTRY_TABLES = 1;
|
||||
const RATING_COLUMN = 2;
|
||||
|
||||
@@ -2,12 +2,39 @@ import { ApiProperty } from '@nestjs/swagger';
|
||||
|
||||
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';
|
||||
|
||||
export class UnrealizedReturnDto {
|
||||
@ApiProperty()
|
||||
declare currency: string;
|
||||
|
||||
@ApiProperty({ example: '12.345678901' })
|
||||
declare absolute: string;
|
||||
|
||||
@ApiProperty({ example: '100.00' })
|
||||
declare costBasis: string;
|
||||
|
||||
@ApiProperty({ type: String, nullable: true, example: '12.34' })
|
||||
declare percent: null | string;
|
||||
|
||||
@ApiProperty()
|
||||
declare partial: boolean;
|
||||
}
|
||||
|
||||
export class PortfolioSummaryDto {
|
||||
@ApiProperty({ type: MoneyDto, isArray: true })
|
||||
declare totalsByCurrency: MoneyDto[];
|
||||
|
||||
@ApiProperty({ type: MoneyDto, isArray: true })
|
||||
declare cashBalances: MoneyDto[];
|
||||
|
||||
@ApiProperty({ type: PortfolioStructureDto })
|
||||
declare structure: PortfolioStructureDto;
|
||||
|
||||
@ApiProperty({ type: UnrealizedReturnDto, isArray: true })
|
||||
declare unrealizedReturnByCurrency: UnrealizedReturnDto[];
|
||||
|
||||
@ApiProperty({
|
||||
type: 'integer',
|
||||
minimum: 0,
|
||||
@@ -21,6 +48,20 @@ export class PortfolioSummaryDto {
|
||||
description: 'Number of non-zero bond positions, not the number of units.',
|
||||
})
|
||||
declare bondPositionCount: number;
|
||||
|
||||
@ApiProperty({
|
||||
type: 'integer',
|
||||
minimum: 0,
|
||||
description: 'Number of non-zero fund positions, not the number of units.',
|
||||
})
|
||||
declare fundPositionCount: number;
|
||||
|
||||
@ApiProperty({
|
||||
type: 'integer',
|
||||
minimum: 0,
|
||||
description: 'Number of all non-zero positions, not the number of units.',
|
||||
})
|
||||
declare totalPositionCount: number;
|
||||
}
|
||||
|
||||
export class BrokerageAccountDto {
|
||||
|
||||
@@ -33,6 +33,7 @@ describe('saved brokerage account projection', () => {
|
||||
});
|
||||
|
||||
it('keeps exact saved totals and independent missing summaries', async () => {
|
||||
const structure = { currencies: [], unvaluedCategories: [] };
|
||||
portfolio.saved.mockResolvedValue({
|
||||
membership: meta,
|
||||
accounts: [
|
||||
@@ -43,10 +44,12 @@ describe('saved brokerage account projection', () => {
|
||||
openedOn: null,
|
||||
meta,
|
||||
snapshot: {
|
||||
cashBalances: [{ currency: 'RUB', value: '10.000000001' }],
|
||||
structure,
|
||||
totalsByCurrency: [
|
||||
{ currency: 'RUB', value: '100000000.000000001' },
|
||||
],
|
||||
positions: [{ type: 'STOCK' }, { type: 'BOND' }],
|
||||
positions: [{ type: 'STOCK', quantity: '1' }, { type: 'BOND', quantity: '2' }],
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -61,15 +64,91 @@ describe('saved brokerage account projection', () => {
|
||||
});
|
||||
const response = await service.list('owner');
|
||||
expect(response.data?.[0].portfolioSummary).toEqual({
|
||||
cashBalances: [{ currency: 'RUB', value: '10.000000001' }],
|
||||
structure,
|
||||
totalsByCurrency: [{ currency: 'RUB', value: '100000000.000000001' }],
|
||||
stockPositionCount: 1,
|
||||
bondPositionCount: 1,
|
||||
fundPositionCount: 0,
|
||||
totalPositionCount: 2,
|
||||
unrealizedReturnByCurrency: [],
|
||||
});
|
||||
expect(response.data?.[1].portfolioSummary).toBeNull();
|
||||
expect(response.meta.availability).toBe('available');
|
||||
expect(response.meta.completeness).toBe('complete');
|
||||
});
|
||||
|
||||
it('returns an empty summary from an empty saved portfolio', async () => {
|
||||
const structure = { currencies: [], unvaluedPositions: [], unknownValues: [] };
|
||||
portfolio.saved.mockResolvedValueOnce({
|
||||
membership: meta,
|
||||
accounts: [{
|
||||
id: 'empty', name: 'Empty', type: 'BROKERAGE', openedOn: null, meta,
|
||||
snapshot: { cashBalances: [], structure, totalsByCurrency: [], positions: [] },
|
||||
}],
|
||||
});
|
||||
|
||||
expect((await service.list('owner')).data?.[0].portfolioSummary).toEqual({
|
||||
cashBalances: [], structure, totalsByCurrency: [],
|
||||
stockPositionCount: 0, bondPositionCount: 0,
|
||||
fundPositionCount: 0, totalPositionCount: 0,
|
||||
unrealizedReturnByCurrency: [],
|
||||
});
|
||||
});
|
||||
|
||||
it('calculates exact returns by currency, partial data, and zero cost basis', async () => {
|
||||
portfolio.saved.mockResolvedValueOnce({
|
||||
membership: meta,
|
||||
accounts: [{
|
||||
id: 'a', name: 'A', type: 'BROKERAGE', openedOn: null, meta,
|
||||
snapshot: {
|
||||
cashBalances: [], structure: {}, totalsByCurrency: [
|
||||
{ currency: 'RUB', value: '100' }, { currency: 'USD', value: '20' },
|
||||
],
|
||||
positions: [
|
||||
{ type: 'STOCK', quantity: '2', averagePurchasePrice: { currency: 'RUB', value: '10.000000001' }, absoluteReturn: { currency: 'RUB', value: '0.000000003' } },
|
||||
{ type: 'BOND', quantity: '0.5', averagePurchasePrice: { currency: 'RUB', value: '20' }, absoluteReturn: { currency: 'RUB', value: '1.25' } },
|
||||
{ type: 'FUND', quantity: '3', averagePurchasePrice: { currency: 'USD', value: '2.5' }, absoluteReturn: null },
|
||||
{ type: 'STOCK', quantity: '4', averagePurchasePrice: { currency: 'USD', value: '0' }, absoluteReturn: { currency: 'USD', value: '2.5' } },
|
||||
{ type: 'CURRENCY', quantity: '100', averagePurchasePrice: { currency: 'EUR', value: '1' }, absoluteReturn: { currency: 'EUR', value: '5' } },
|
||||
{ type: 'BOND', quantity: '1', currentValue: { currency: 'CNY', value: '7' }, averagePurchasePrice: null, absoluteReturn: null },
|
||||
],
|
||||
},
|
||||
}],
|
||||
});
|
||||
|
||||
expect((await service.list('owner')).data?.[0].portfolioSummary).toMatchObject({
|
||||
stockPositionCount: 2, bondPositionCount: 2,
|
||||
fundPositionCount: 1, totalPositionCount: 6,
|
||||
unrealizedReturnByCurrency: [
|
||||
{ currency: 'CNY', absolute: '0', costBasis: '0', percent: null, partial: true },
|
||||
{ currency: 'RUB', absolute: '1.250000003', costBasis: '30.000000002', percent: '4.17', partial: false },
|
||||
{ currency: 'USD', absolute: '2.5', costBasis: '0', percent: null, partial: true },
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
it('omits return percent for a currency with short positions', async () => {
|
||||
portfolio.saved.mockResolvedValueOnce({
|
||||
membership: meta,
|
||||
accounts: [{
|
||||
id: 'a', name: 'A', type: 'BROKERAGE', openedOn: null, meta,
|
||||
snapshot: {
|
||||
cashBalances: [], structure: {}, totalsByCurrency: [],
|
||||
positions: [
|
||||
{ type: 'STOCK', quantity: '-2', averagePurchasePrice: { currency: 'RUB', value: '100' }, absoluteReturn: { currency: 'RUB', value: '-20' } },
|
||||
{ type: 'STOCK', quantity: '1', averagePurchasePrice: { currency: 'USD', value: '10' }, absoluteReturn: { currency: 'USD', value: '1' } },
|
||||
],
|
||||
},
|
||||
}],
|
||||
});
|
||||
|
||||
expect((await service.list('owner')).data?.[0]?.portfolioSummary?.unrealizedReturnByCurrency).toEqual([
|
||||
{ currency: 'RUB', absolute: '-20', costBasis: '-200', percent: null, partial: false },
|
||||
{ currency: 'USD', absolute: '1', costBasis: '10', percent: '10', partial: false },
|
||||
]);
|
||||
});
|
||||
|
||||
it('observes the latest hourly walk without starting another one', async () => {
|
||||
portfolio.saved.mockResolvedValue({ membership: meta, accounts: [] });
|
||||
sync.hourly.mockResolvedValue({
|
||||
|
||||
@@ -1,10 +1,82 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { createHash } from 'node:crypto';
|
||||
|
||||
import {
|
||||
decimalFromString,
|
||||
divide,
|
||||
formatDecimal,
|
||||
isZero,
|
||||
multiply,
|
||||
} from '../../../common/decimal';
|
||||
import { investmentResourceMeta } from '../investment-resource.mapper';
|
||||
import { PortfolioService } from '../portfolio/portfolio.api';
|
||||
import { hourlyAttempt, TbankSyncRepository } from '../tbank-sync/tbank-sync.repository';
|
||||
import { BrokerageAccountDto, BrokerageAccountsResourceDto } from './brokerage-account.dto';
|
||||
import { sumMoneyByCurrency } from '../portfolio/domain/portfolio-totals';
|
||||
import { PortfolioPositionDto, PortfolioService } from '../portfolio/portfolio.api';
|
||||
import { hourlyAttempt, TbankSyncRepository } from '../tbank-sync/tbank-sync.api';
|
||||
import {
|
||||
BrokerageAccountDto,
|
||||
BrokerageAccountsResourceDto,
|
||||
UnrealizedReturnDto,
|
||||
} from './brokerage-account.dto';
|
||||
|
||||
const PERCENT_DECIMAL_PLACES = 2;
|
||||
const ZERO_QUANTITY = 0n;
|
||||
|
||||
function unrealizedReturns(positions: PortfolioPositionDto[]): UnrealizedReturnDto[] {
|
||||
// Cash-like CURRENCY positions must not duplicate the separately returned cash balances.
|
||||
const investments = positions.filter((position) => position.type !== 'CURRENCY');
|
||||
const absolute = sumMoneyByCurrency(
|
||||
investments.flatMap((position) => position.absoluteReturn ? [position.absoluteReturn] : []),
|
||||
);
|
||||
const costs = sumMoneyByCurrency(
|
||||
investments.flatMap((position) =>
|
||||
position.absoluteReturn && position.averagePurchasePrice
|
||||
? [{
|
||||
currency: position.absoluteReturn.currency,
|
||||
value: formatDecimal(multiply(
|
||||
decimalFromString(position.averagePurchasePrice.value),
|
||||
decimalFromString(position.quantity),
|
||||
)),
|
||||
}]
|
||||
: [],
|
||||
),
|
||||
);
|
||||
const partial = new Set(
|
||||
investments.flatMap((position) => {
|
||||
const money = position.absoluteReturn
|
||||
? null
|
||||
: position.averagePurchasePrice ?? position.currentValue;
|
||||
return money ? [money.currency] : [];
|
||||
}),
|
||||
);
|
||||
// A short position has negative cost basis, so a percent would flip sign or net out.
|
||||
const withShorts = new Set(
|
||||
investments.flatMap((position) => {
|
||||
const money = position.absoluteReturn ?? position.averagePurchasePrice ?? position.currentValue;
|
||||
return money && decimalFromString(position.quantity).value < ZERO_QUANTITY ? [money.currency] : [];
|
||||
}),
|
||||
);
|
||||
const currencies = new Set([...absolute, ...costs].map((money) => money.currency));
|
||||
return [...new Set([...currencies, ...partial])]
|
||||
.sort((left, right) => left.localeCompare(right))
|
||||
.map((currency) => {
|
||||
const absoluteReturn = absolute.find((money) => money.currency === currency)?.value ?? '0';
|
||||
const costBasis = costs.find((money) => money.currency === currency)?.value ?? '0';
|
||||
const cost = decimalFromString(costBasis);
|
||||
return {
|
||||
currency,
|
||||
absolute: absoluteReturn,
|
||||
costBasis,
|
||||
percent: isZero(cost) || withShorts.has(currency)
|
||||
? null
|
||||
: formatDecimal(divide(
|
||||
multiply(decimalFromString(absoluteReturn), decimalFromString('100')),
|
||||
cost,
|
||||
PERCENT_DECIMAL_PLACES,
|
||||
)),
|
||||
partial: partial.has(currency),
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class BrokerageAccountsService {
|
||||
@@ -26,12 +98,20 @@ export class BrokerageAccountsService {
|
||||
portfolioSummary: account.snapshot
|
||||
? {
|
||||
totalsByCurrency: account.snapshot.totalsByCurrency,
|
||||
cashBalances: account.snapshot.cashBalances,
|
||||
structure: account.snapshot.structure,
|
||||
unrealizedReturnByCurrency: unrealizedReturns(account.snapshot.positions),
|
||||
stockPositionCount: account.snapshot.positions.filter(
|
||||
(position) => position.type === 'STOCK',
|
||||
).length,
|
||||
bondPositionCount: account.snapshot.positions.filter(
|
||||
(position) => position.type === 'BOND',
|
||||
).length,
|
||||
fundPositionCount: account.snapshot.positions.filter(
|
||||
(position) => position.type === 'FUND',
|
||||
).length,
|
||||
// The snapshot mapper already drops zero-quantity positions.
|
||||
totalPositionCount: account.snapshot.positions.length,
|
||||
}
|
||||
: null,
|
||||
}));
|
||||
|
||||
@@ -8,7 +8,7 @@ import {
|
||||
utcDate,
|
||||
} from '../investment-calendar';
|
||||
|
||||
enum IncomeErrorCode { InvalidPeriod = 'INVALID_INCOME_PERIOD' }
|
||||
export enum IncomeErrorCode { InvalidPeriod = 'INVALID_INCOME_PERIOD' }
|
||||
|
||||
const MONDAY_WEEKDAY_INDEX = 1;
|
||||
const INCLUSIVE_DAY_OFFSET = 1;
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
export const operationCategories = [
|
||||
'trade',
|
||||
'income',
|
||||
'tax',
|
||||
'fee',
|
||||
'transfer',
|
||||
'other',
|
||||
] as const;
|
||||
|
||||
export type OperationCategory = (typeof operationCategories)[number];
|
||||
@@ -20,7 +20,7 @@ import {
|
||||
import {
|
||||
hourlyAttempt,
|
||||
TbankSyncRepository,
|
||||
} from '../../tbank-sync/tbank-sync.repository';
|
||||
} from '../../tbank-sync/tbank-sync.api';
|
||||
import { OperationErrorCode } from '../domain/operation-error-code';
|
||||
import {
|
||||
confirmedOperationRanges,
|
||||
|
||||
@@ -3,10 +3,8 @@ 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 {
|
||||
BrokerageOperationDto,
|
||||
OperationCategory,
|
||||
} from '../presentation/brokerage-operation.dto';
|
||||
import { type OperationCategory } from '../../operation-category';
|
||||
import { BrokerageOperationDto } from '../presentation/brokerage-operation.dto';
|
||||
|
||||
const MISSING_TIMESTAMP_COMPONENT = 0;
|
||||
|
||||
|
||||
@@ -5,4 +5,3 @@ export type { OperationInterval } from './domain/operations-sync-plan';
|
||||
|
||||
// Public cross-module surface. Nest providers are exported by the matching module.
|
||||
export { BrokerageOperationDto } from './presentation/brokerage-operation.dto';
|
||||
export { operationCategories } from './presentation/brokerage-operation.dto';
|
||||
|
||||
@@ -16,6 +16,7 @@ import {
|
||||
import { MoneyDto } from '../../../../common/money.dto';
|
||||
import { AccountReferenceDto } from '../../account-reference.dto';
|
||||
import { InvestmentResourceMetaDto } from '../../investment-resource.dto';
|
||||
import { operationCategories, type OperationCategory } from '../../operation-category';
|
||||
|
||||
const MIN_OPERATIONS_PAGE_SIZE = 1;
|
||||
|
||||
@@ -23,16 +24,6 @@ const MAX_CURSOR_LENGTH = 4096;
|
||||
const MAX_OPERATIONS_PAGE_SIZE = 1000;
|
||||
export const DEFAULT_OPERATIONS_PAGE_SIZE = 100;
|
||||
|
||||
export const operationCategories = [
|
||||
'trade',
|
||||
'income',
|
||||
'tax',
|
||||
'fee',
|
||||
'transfer',
|
||||
'other',
|
||||
] as const;
|
||||
export type OperationCategory = (typeof operationCategories)[number];
|
||||
|
||||
export class BrokerageOperationsQueryDto {
|
||||
@ApiPropertyOptional({
|
||||
format: 'uuid',
|
||||
|
||||
@@ -159,6 +159,31 @@ describe('persistent portfolio projection', () => {
|
||||
expect(snapshot.positions[1].averagePurchasePrice).toEqual({ currency: 'RUB', value: '2' });
|
||||
});
|
||||
|
||||
it('counts cash once when T-Bank also returns it as a CURRENCY position', async () => {
|
||||
repository.reserve.mockResolvedValueOnce({
|
||||
launch: true,
|
||||
work: { id: 'work', attemptId: 'attempt' },
|
||||
});
|
||||
tbank.getPortfolio.mockResolvedValue({ positions: [
|
||||
{ figi: 'FUND', instrumentType: 'etf', quantity: { units: '1' }, currentPrice: { currency: 'RUB', units: '120', nano: 240000000 } },
|
||||
{ figi: 'RUB000UTSTOM', instrumentType: 'currency', quantity: { units: '1', nano: 250000000 }, currentPrice: { currency: 'RUB', units: '1' } },
|
||||
] });
|
||||
tbank.getPositions.mockResolvedValue({ money: [{ currency: 'RUB', units: '1', nano: 250000000 }] });
|
||||
repository.read.mockResolvedValue({
|
||||
membershipAt,
|
||||
membershipRevision: 1,
|
||||
accounts: [{ accountId: 'a', name: 'A', type: 'BROKERAGE', openedOn: null, portfolio: null }],
|
||||
work: [],
|
||||
});
|
||||
const handle = await service.request('user', 'private', 'a');
|
||||
assert(handle);
|
||||
await handle.done;
|
||||
const snapshot = (repository.publish.mock.calls as [unknown, string, PortfolioDto][])[0][2];
|
||||
expect(snapshot.totalsByCurrency).toEqual([{ currency: 'RUB', value: '121.49' }]);
|
||||
expect(snapshot.positions.map((position) => position.type)).toEqual(['FUND', 'CURRENCY']);
|
||||
expect(snapshot.structure.currencies[0].totalValue).toBe('121.49');
|
||||
});
|
||||
|
||||
it('does not turn a missing account snapshot into aggregate zero; summaries stay independent', async () => {
|
||||
const snapshot: PortfolioDto = {
|
||||
lastSuccessfulAt: membershipAt.toISOString(),
|
||||
|
||||
@@ -20,7 +20,7 @@ import { investmentResourceMeta } from '../../investment-resource.mapper';
|
||||
import {
|
||||
hourlyAttempt,
|
||||
TbankSyncRepository,
|
||||
} from '../../tbank-sync/tbank-sync.repository';
|
||||
} from '../../tbank-sync/tbank-sync.api';
|
||||
import { portfolioStructure } from '../domain/portfolio-structure';
|
||||
import { sumMoneyByCurrency } from '../domain/portfolio-totals';
|
||||
import {
|
||||
|
||||
@@ -19,7 +19,7 @@ const position = (
|
||||
});
|
||||
|
||||
describe('portfolio structure', () => {
|
||||
it('includes cash once and keeps currency instruments among other assets', () => {
|
||||
it('counts cash once and skips CURRENCY positions that mirror it', () => {
|
||||
const result = portfolioStructure(
|
||||
[
|
||||
position('STOCK', '60'),
|
||||
@@ -30,13 +30,13 @@ describe('portfolio structure', () => {
|
||||
);
|
||||
expect(result.currencies[0]).toEqual({
|
||||
currency: 'RUB',
|
||||
totalValue: '100',
|
||||
totalValue: '90',
|
||||
hasNegativeValues: false,
|
||||
categories: [
|
||||
{ type: 'STOCK', value: '60', sharePercent: '60' },
|
||||
{ type: 'BOND', value: '20', sharePercent: '20' },
|
||||
{ type: 'OTHER', value: '10', sharePercent: '10' },
|
||||
{ type: 'CASH', value: '10', sharePercent: '10' },
|
||||
{ type: 'STOCK', value: '60', sharePercent: '66.666667' },
|
||||
{ type: 'BOND', value: '20', sharePercent: '22.222222' },
|
||||
{ type: 'OTHER', value: '0', sharePercent: '0' },
|
||||
{ type: 'CASH', value: '10', sharePercent: '11.111111' },
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
@@ -43,6 +43,8 @@ export function portfolioStructure(
|
||||
currencies.set(money.currency, group);
|
||||
};
|
||||
for (const position of positions) {
|
||||
// CURRENCY positions mirror cash, which is counted once as CASH below.
|
||||
if (position.type === 'CURRENCY') continue;
|
||||
const type = ['BOND', 'STOCK'].includes(position.type)
|
||||
? position.type
|
||||
: 'OTHER';
|
||||
|
||||
@@ -126,7 +126,8 @@ function totalsByCurrency(
|
||||
for (const value of money) addTotal(value.currency, decimal(value));
|
||||
for (const position of positions) {
|
||||
const price = position.currentPrice;
|
||||
if (!price) continue;
|
||||
// CURRENCY positions mirror the cash balances already added above.
|
||||
if (!price || types[position.instrumentType?.toLowerCase() ?? ''] === 'CURRENCY') continue;
|
||||
addTotal(
|
||||
price.currency,
|
||||
multiply(decimal(position.quantity ?? {}), decimal(price)),
|
||||
|
||||
@@ -5,4 +5,5 @@ export { PortfolioService } from './application/portfolio.service';
|
||||
export {
|
||||
PortfolioDto,
|
||||
PortfolioPositionDto,
|
||||
PortfolioStructureDto,
|
||||
} from './presentation/portfolio.dto';
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
export { hourlyAttempt, TbankSyncRepository } from './tbank-sync.repository';
|
||||
@@ -23,7 +23,7 @@ import {
|
||||
|
||||
import { MAX_INSTRUMENT_QUERY_LENGTH, MIN_INSTRUMENT_QUERY_LENGTH } from '../instrument-query';
|
||||
import { InvestmentAttemptProblemDto } from '../investment-resource.dto';
|
||||
import { operationCategories } from '../operations/operations.api';
|
||||
import { operationCategories } from '../operation-category';
|
||||
|
||||
const MIN_ACCOUNT_ID_LENGTH = 1;
|
||||
const MIN_SYNC_PAGE_SIZE = 1;
|
||||
|
||||
@@ -24,7 +24,7 @@ import {
|
||||
import {
|
||||
hourlyAttempt,
|
||||
TbankSyncRepository,
|
||||
} from '../tbank-sync/tbank-sync.repository';
|
||||
} from '../tbank-sync/tbank-sync.api';
|
||||
import { bondEvent, dividendEvent } from './upcoming-event.mapper';
|
||||
import {
|
||||
UpcomingEventDto,
|
||||
@@ -32,7 +32,7 @@ import {
|
||||
UpcomingEventsQueryDto,
|
||||
} from './upcoming-events.dto';
|
||||
|
||||
enum EventsErrorCode { InvalidPeriod = 'INVALID_EVENTS_PERIOD' }
|
||||
export enum EventsErrorCode { InvalidPeriod = 'INVALID_EVENTS_PERIOD' }
|
||||
|
||||
const FIRST_BATCH_OFFSET = 0;
|
||||
|
||||
|
||||
@@ -1,12 +1,38 @@
|
||||
import { INestApplication } from '@nestjs/common';
|
||||
import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
|
||||
|
||||
import { HttpErrorCode } from './common/error-code';
|
||||
import { MoexErrorCode } from './integrations/moex/moex.client';
|
||||
import { NcrErrorCode } from './integrations/ncr/ncr-ratings.client';
|
||||
import { TbankErrorCode } from './integrations/tbank/tbank-error-code';
|
||||
import { AuthErrorCode } from './modules/auth/application/auth-error-code';
|
||||
import { BankErrorCode } from './modules/banking/bank-cards/application/bank-card-input';
|
||||
import { IncomeErrorCode } from './modules/investments/income/income-period';
|
||||
import { InstrumentErrorCode } from './modules/investments/instruments/domain/instrument-error-code';
|
||||
import { OperationErrorCode } from './modules/investments/operations/domain/operation-error-code';
|
||||
import { EventsErrorCode } from './modules/investments/upcoming-events/upcoming-events.service';
|
||||
|
||||
export const API_PREFIX = 'api/v1';
|
||||
|
||||
// Nest Swagger cannot express additionalProperties on a class, so closed request
|
||||
// bodies are restored here after generation; the runtime allowlist stays in the controller.
|
||||
const CLOSED_SCHEMAS = ['StockScreenerCriteriaDto'];
|
||||
|
||||
// Every code HttpExceptionFilter can emit. Assembled at the composition root so
|
||||
// common/ProblemDetailsDto does not depend on modules.
|
||||
export const PROBLEM_CODES = [
|
||||
...Object.values(HttpErrorCode),
|
||||
...Object.values(AuthErrorCode),
|
||||
...Object.values(OperationErrorCode),
|
||||
...Object.values(InstrumentErrorCode),
|
||||
...Object.values(TbankErrorCode),
|
||||
...Object.values(BankErrorCode),
|
||||
...Object.values(MoexErrorCode),
|
||||
...Object.values(NcrErrorCode),
|
||||
...Object.values(EventsErrorCode),
|
||||
...Object.values(IncomeErrorCode),
|
||||
];
|
||||
|
||||
export function createOpenApiDocument(app: INestApplication) {
|
||||
const document = SwaggerModule.createDocument(
|
||||
app,
|
||||
@@ -18,5 +44,8 @@ export function createOpenApiDocument(app: INestApplication) {
|
||||
schema.additionalProperties = false;
|
||||
}
|
||||
}
|
||||
const problem = schemas.ProblemDetailsDto;
|
||||
const problemCode = problem && 'properties' in problem ? problem.properties?.code : undefined;
|
||||
if (problemCode && !('$ref' in problemCode)) problemCode.enum = PROBLEM_CODES;
|
||||
return document;
|
||||
}
|
||||
|
||||
@@ -121,6 +121,55 @@ describe('OpenAPI contract (integration)', () => {
|
||||
expect(analytics.properties).not.toHaveProperty('yearComparison');
|
||||
});
|
||||
|
||||
it('publishes every emitted problem detail code as a named enum', () => {
|
||||
const schemas = createOpenApiDocument(app).components?.schemas;
|
||||
const expectedCodes = [
|
||||
'BAD_REQUEST',
|
||||
'INTERNAL_SERVER_ERROR',
|
||||
'NOT_FOUND',
|
||||
'UNAUTHORIZED',
|
||||
'UNSUPPORTED_MEDIA_TYPE',
|
||||
'VALIDATION_ERROR',
|
||||
'EMAIL_ALREADY_REGISTERED',
|
||||
'INVALID_CREDENTIALS',
|
||||
'INVALID_OPERATIONS_CURSOR',
|
||||
'BOND_HISTORY_START_UNAVAILABLE',
|
||||
'BOND_TICKER_AMBIGUOUS',
|
||||
'STOCK_HISTORY_START_UNAVAILABLE',
|
||||
'STOCK_TICKER_AMBIGUOUS',
|
||||
'INVALID_TBANK_TOKEN',
|
||||
'TBANK_NOT_CONNECTED',
|
||||
'TBANK_UNAVAILABLE',
|
||||
'BANK_CARD_ARCHIVED',
|
||||
'BANK_DEPENDENT_REFUNDS',
|
||||
'BANK_DUPLICATE_CATEGORY',
|
||||
'BANK_IMMUTABLE_OPERATION',
|
||||
'BANK_INTENT_CONFLICT',
|
||||
'BANK_INVALID_DATE',
|
||||
'BANK_INVALID_INPUT',
|
||||
'BANK_INVALID_MONEY',
|
||||
'BANK_INVALID_REFUND',
|
||||
'BANK_NOT_FOUND',
|
||||
'BANK_OPENING_DATE_CONFLICT',
|
||||
'BANK_OPERATION_DELETED',
|
||||
'BANK_REFUND_LIMIT',
|
||||
'BANK_VERSION_CONFLICT',
|
||||
'BANK_WRITE_CONFLICT',
|
||||
'MOEX_UNAVAILABLE',
|
||||
'NCR_UNAVAILABLE',
|
||||
'INVALID_EVENTS_PERIOD',
|
||||
'INVALID_INCOME_PERIOD',
|
||||
];
|
||||
|
||||
const problem = schemas?.ProblemDetailsDto;
|
||||
assert(problem && !('$ref' in problem));
|
||||
const codeSchema = problem.properties?.code;
|
||||
assert(codeSchema && !('$ref' in codeSchema));
|
||||
expect(codeSchema.type).toBe('string');
|
||||
expect(codeSchema.enum).toEqual(expect.arrayContaining(expectedCodes));
|
||||
expect(codeSchema.enum).toHaveLength(expectedCodes.length);
|
||||
});
|
||||
|
||||
it('generates the runtime contract without server startup or deployment configuration', async () => {
|
||||
const schemas = createOpenApiDocument(app).components?.schemas;
|
||||
expect(schemas?.StockScreenerCriteriaDto).toMatchObject({
|
||||
|
||||
@@ -216,7 +216,27 @@ describe('local accounts and portfolio HTTP (SQLite)', () => {
|
||||
).toEqual({
|
||||
stockPositionCount: 1,
|
||||
bondPositionCount: 0,
|
||||
fundPositionCount: 0,
|
||||
totalPositionCount: 1,
|
||||
totalsByCurrency: [{ currency: 'RUB', value: '21.100000002' }],
|
||||
cashBalances: [{ currency: 'RUB', value: '1.1' }],
|
||||
structure: {
|
||||
currencies: [{
|
||||
currency: 'RUB',
|
||||
totalValue: '21.100000002',
|
||||
hasNegativeValues: false,
|
||||
categories: [
|
||||
{ type: 'STOCK', value: '20.000000002', sharePercent: '94.78673' },
|
||||
{ type: 'BOND', value: '0', sharePercent: '0' },
|
||||
{ type: 'OTHER', value: '0', sharePercent: '0' },
|
||||
{ type: 'CASH', value: '1.1', sharePercent: '5.21327' },
|
||||
],
|
||||
}],
|
||||
unvaluedCategories: [],
|
||||
},
|
||||
unrealizedReturnByCurrency: [
|
||||
{ currency: 'RUB', absolute: '0', costBasis: '0', percent: null, partial: true },
|
||||
],
|
||||
});
|
||||
const portfolio = await get('brokerage-accounts/account/portfolio').expect(
|
||||
200,
|
||||
@@ -492,9 +512,18 @@ describe('local accounts and portfolio HTTP (SQLite)', () => {
|
||||
}
|
||||
const summaries = (await get('brokerage-accounts?sync=observe').expect(200))
|
||||
.body as BrokerageAccountsResourceDto;
|
||||
expect(summaries.data?.[0].portfolioSummary?.totalsByCurrency).toEqual([
|
||||
{ currency: 'RUB', value: '21.1' },
|
||||
]);
|
||||
expect(summaries.data?.[0].portfolioSummary).toMatchObject({
|
||||
totalsByCurrency: [{ currency: 'RUB', value: '21.1' }],
|
||||
cashBalances: [{ currency: 'RUB', value: '1.1' }],
|
||||
structure: { currencies: [{ currency: 'RUB' }] },
|
||||
unrealizedReturnByCurrency: [
|
||||
{ currency: 'RUB', absolute: '0', costBasis: '0', percent: null, partial: true },
|
||||
],
|
||||
stockPositionCount: 1,
|
||||
bondPositionCount: 0,
|
||||
fundPositionCount: 0,
|
||||
totalPositionCount: 1,
|
||||
});
|
||||
expect(summaries.data?.[1].portfolioSummary).toBeNull();
|
||||
expect(summaries.meta.availability).toBe('available');
|
||||
expect(summaries.meta.completeness).toBe('complete');
|
||||
|
||||
@@ -76,7 +76,7 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
where: { id },
|
||||
});
|
||||
if (work.state === expected) return work;
|
||||
await delay(2);
|
||||
await delay(2); // Backoff between exact DB-state polls; not a timing barrier.
|
||||
}
|
||||
throw new Error(`Sync did not reach ${expected}`);
|
||||
}
|
||||
@@ -113,6 +113,7 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
});
|
||||
service = createService();
|
||||
});
|
||||
afterEach(() => jest.restoreAllMocks());
|
||||
afterAll(async () => prisma.$disconnect());
|
||||
|
||||
it.each([[false, 1], [true, 1], [false, 2], [true, 2]] as const)(
|
||||
@@ -186,13 +187,17 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
|
||||
it('publishes the forced visible period before unrelated pending history and retains it if history fails', async () => {
|
||||
const gate = deferred<TbankOperationsByCursorResponse>();
|
||||
const started = deferred<void>();
|
||||
const march = {
|
||||
...january,
|
||||
from: new Date('2026-03-01Z'),
|
||||
to: new Date('2026-04-01Z'),
|
||||
};
|
||||
upstream.getOperationsByCursor
|
||||
.mockReturnValueOnce(gate.promise)
|
||||
.mockImplementationOnce(() => {
|
||||
started.resolve();
|
||||
return gate.promise;
|
||||
})
|
||||
.mockImplementation((_token, request) => {
|
||||
if (Number(request.from?.seconds) + 1 === march.from.valueOf() / 1000) {
|
||||
return Promise.resolve({
|
||||
@@ -205,7 +210,9 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
const history = requiredHandle(
|
||||
await service.request('owner', [february, march], false, 'history'),
|
||||
);
|
||||
await delay(5);
|
||||
// RPC starts after reserve/claim commits and pending reads the history plan.
|
||||
// Waiting for state=running alone would not ensure that pending was read.
|
||||
await started.promise;
|
||||
const screen = requiredHandle(
|
||||
await service.request('owner', [march], true),
|
||||
);
|
||||
@@ -225,8 +232,12 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
|
||||
it('moves a newly visible interval ahead of pending backfill and records an unknown requested floor', async () => {
|
||||
const gate = deferred<TbankOperationsByCursorResponse>();
|
||||
const started = deferred<void>();
|
||||
upstream.getOperationsByCursor
|
||||
.mockReturnValueOnce(gate.promise)
|
||||
.mockImplementationOnce(() => {
|
||||
started.resolve();
|
||||
return gate.promise;
|
||||
})
|
||||
.mockResolvedValue({ hasNext: false, items: [] });
|
||||
const march = {
|
||||
...january,
|
||||
@@ -241,7 +252,7 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
'history',
|
||||
),
|
||||
);
|
||||
await delay(5);
|
||||
await started.promise;
|
||||
await service.request('owner', [march], false);
|
||||
gate.resolve({ hasNext: false, items: [] });
|
||||
await state(history, 'complete');
|
||||
@@ -471,7 +482,7 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
expect(saved.state).toBe(
|
||||
checkpoint === 'after-publish' ? 'complete' : 'running',
|
||||
);
|
||||
await delay(10);
|
||||
await delay(10); // Bounded pause; absence of a recovery RPC cannot be awaited.
|
||||
expect(upstream.getOperationsByCursor).not.toHaveBeenCalled();
|
||||
if (checkpoint === 'after-publish') {
|
||||
// eslint-disable-next-line jest/no-conditional-expect -- The parameterized fixture chooses the scenario; each branch asserts its outcome and the test also asserts common invariants.
|
||||
@@ -504,13 +515,17 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
|
||||
it('joins a request bridging active groups and keeps both original handles observable', async () => {
|
||||
const blocked = deferred<typeof complete>();
|
||||
const started = deferred<void>();
|
||||
upstream.getOperationsByCursor
|
||||
.mockReturnValueOnce(blocked.promise)
|
||||
.mockImplementationOnce(() => {
|
||||
started.resolve();
|
||||
return blocked.promise;
|
||||
})
|
||||
.mockResolvedValue({ hasNext: false, items: [] });
|
||||
const early = { ...january, to: new Date('2026-01-10Z') };
|
||||
const late = { ...january, from: new Date('2026-01-20Z') };
|
||||
const first = requiredHandle(await service.request('owner', [early], true));
|
||||
await delay(5);
|
||||
await started.promise;
|
||||
const second = requiredHandle(await service.request('owner', [late], true));
|
||||
const merged = requiredHandle(
|
||||
await service.request('owner', [january], true),
|
||||
@@ -526,25 +541,28 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
|
||||
it('extends an overlapping atomic group without rereading its intersection or publishing a partial result', async () => {
|
||||
const first = deferred<typeof complete>();
|
||||
const started = deferred<void>();
|
||||
const remainder = deferred<typeof complete>();
|
||||
const remainderStarted = deferred<void>();
|
||||
const early = { ...january, to: new Date('2026-01-20Z') };
|
||||
const late = { ...january, from: new Date('2026-01-10Z') };
|
||||
upstream.getOperationsByCursor
|
||||
.mockReturnValueOnce(first.promise)
|
||||
.mockReturnValueOnce(remainder.promise);
|
||||
.mockImplementationOnce(() => {
|
||||
started.resolve();
|
||||
return first.promise;
|
||||
})
|
||||
.mockImplementationOnce(() => {
|
||||
remainderStarted.resolve();
|
||||
return remainder.promise;
|
||||
});
|
||||
const handle = requiredHandle(
|
||||
await service.request('owner', [early], true),
|
||||
);
|
||||
await delay(5);
|
||||
await started.promise;
|
||||
expect(upstream.getOperationsByCursor).toHaveBeenCalledTimes(1);
|
||||
expect(await service.request('owner', [late], true)).toBe(handle);
|
||||
first.resolve({ hasNext: false, items: [] });
|
||||
for (
|
||||
let index = 0;
|
||||
index < 500 && upstream.getOperationsByCursor.mock.calls.length < 2;
|
||||
index += 1
|
||||
) {
|
||||
await delay(2);
|
||||
}
|
||||
await remainderStarted.promise;
|
||||
expect(upstream.getOperationsByCursor).toHaveBeenCalledTimes(2);
|
||||
expect(upstream.getOperationsByCursor.mock.calls[1][1].from).toEqual({
|
||||
seconds: String(early.to.valueOf() / 1000 - 1),
|
||||
@@ -561,13 +579,17 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
items: never[];
|
||||
nextCursor: string;
|
||||
}>();
|
||||
const started = deferred<void>();
|
||||
upstream.getOperationsByCursor
|
||||
.mockReturnValueOnce(first.promise)
|
||||
.mockImplementationOnce(() => {
|
||||
started.resolve();
|
||||
return first.promise;
|
||||
})
|
||||
.mockResolvedValue({ hasNext: false, items: [] });
|
||||
const history = requiredHandle(
|
||||
await service.request('owner', [january], false, 'history'),
|
||||
);
|
||||
await delay(5);
|
||||
await started.promise;
|
||||
const screen = requiredHandle(
|
||||
await service.request('owner', [february], true),
|
||||
);
|
||||
@@ -583,19 +605,17 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
|
||||
it('keeps published initial windows on recovery and restarts only the unfinished month', async () => {
|
||||
const blocked = deferred<typeof complete>();
|
||||
const blockedStarted = deferred<void>();
|
||||
upstream.getOperationsByCursor
|
||||
.mockResolvedValueOnce(complete)
|
||||
.mockReturnValueOnce(blocked.promise);
|
||||
.mockImplementationOnce(() => {
|
||||
blockedStarted.resolve();
|
||||
return blocked.promise;
|
||||
});
|
||||
const handle = requiredHandle(
|
||||
await service.request('owner', [january, february], false),
|
||||
);
|
||||
for (
|
||||
let index = 0;
|
||||
index < 500 && upstream.getOperationsByCursor.mock.calls.length < 2;
|
||||
index += 1
|
||||
) {
|
||||
await delay(2);
|
||||
}
|
||||
await blockedStarted.promise;
|
||||
expect(await prisma.tbankOperation.count()).toBe(1);
|
||||
const before = await prisma.tbankOperationCoverage.findMany();
|
||||
expect(before).toHaveLength(1);
|
||||
@@ -616,8 +636,15 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
})
|
||||
).fetchedAt,
|
||||
).toEqual(before[0].fetchedAt);
|
||||
const stalePage = deferred<Promise<boolean>>();
|
||||
const stagePage = repository.stagePage.bind(repository);
|
||||
jest.spyOn(repository, 'stagePage').mockImplementation((...args) => {
|
||||
const result = stagePage(...args);
|
||||
stalePage.resolve(result);
|
||||
return result;
|
||||
});
|
||||
blocked.resolve(complete);
|
||||
await delay(10);
|
||||
expect(await stalePage.promise).toBe(false);
|
||||
expect(await prisma.tbankOperation.count()).toBe(1);
|
||||
expect(await prisma.tbankOperationCoverage.count()).toBe(2);
|
||||
});
|
||||
@@ -651,7 +678,11 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
|
||||
it('coalesces twenty requests, observes without RPC and completes only after the last page', async () => {
|
||||
const blocked = deferred<typeof complete>();
|
||||
upstream.getOperationsByCursor.mockReturnValueOnce(blocked.promise);
|
||||
const started = deferred<void>();
|
||||
upstream.getOperationsByCursor.mockImplementationOnce(() => {
|
||||
started.resolve();
|
||||
return blocked.promise;
|
||||
});
|
||||
const handles = await Promise.all(
|
||||
Array.from({ length: 20 }, () =>
|
||||
service.request('owner', [january], true),
|
||||
@@ -659,7 +690,7 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
);
|
||||
expect(new Set(handles).size).toBe(1);
|
||||
const handle = requiredHandle(handles[0]);
|
||||
await delay(5);
|
||||
await started.promise;
|
||||
expect(upstream.getOperationsByCursor).toHaveBeenCalledTimes(1);
|
||||
expect((await service.observe('owner', handle)).state).toBe('running');
|
||||
expect(await prisma.tbankOperation.count()).toBe(0);
|
||||
@@ -699,6 +730,7 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
expect(await prisma.tbankOperationCoverage.findMany()).toEqual(oldCoverage);
|
||||
const calls = upstream.getOperationsByCursor.mock.calls.length;
|
||||
await service.observe('owner', handle);
|
||||
// Bounded pause; absence of a background retry cannot be awaited.
|
||||
await delay(10);
|
||||
expect(upstream.getOperationsByCursor).toHaveBeenCalledTimes(calls);
|
||||
upstream.getOperationsByCursor
|
||||
@@ -713,29 +745,29 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
|
||||
it('starts an unfinished interval from page one after a new run request and ignores late old pages', async () => {
|
||||
const blocked = deferred<typeof complete>();
|
||||
const blockedStarted = deferred<void>();
|
||||
upstream.getOperationsByCursor
|
||||
.mockResolvedValueOnce({
|
||||
hasNext: true,
|
||||
nextCursor: 'provider-cursor',
|
||||
items: [operation()],
|
||||
})
|
||||
.mockReturnValueOnce(blocked.promise);
|
||||
.mockImplementationOnce(() => {
|
||||
blockedStarted.resolve();
|
||||
return blocked.promise;
|
||||
});
|
||||
const handle = requiredHandle(
|
||||
await service.request('owner', [january], true),
|
||||
);
|
||||
for (
|
||||
let index = 0;
|
||||
index < 500 && upstream.getOperationsByCursor.mock.calls.length < 2;
|
||||
index += 1
|
||||
) {
|
||||
await delay(2);
|
||||
}
|
||||
expect(upstream.getOperationsByCursor).toHaveBeenCalledTimes(2);
|
||||
await blockedStarted.promise;
|
||||
const before = await prisma.tbankSyncWork.findUniqueOrThrow({
|
||||
where: { id: handle },
|
||||
});
|
||||
expect(await prisma.tbankSyncStage.count()).toBeGreaterThan(0);
|
||||
|
||||
service = createService();
|
||||
await service.observe('owner', handle);
|
||||
// Bounded pause; absence of work adoption by observe cannot be awaited.
|
||||
await delay(5);
|
||||
expect(upstream.getOperationsByCursor).toHaveBeenCalledTimes(2);
|
||||
upstream.getOperationsByCursor.mockResolvedValueOnce({
|
||||
@@ -752,8 +784,15 @@ describe('Request-driven operations synchronization (SQLite)', () => {
|
||||
expect(
|
||||
upstream.getOperationsByCursor.mock.calls[2][1].cursor,
|
||||
).toBeUndefined();
|
||||
const stalePage = deferred<Promise<boolean>>();
|
||||
const stagePage = repository.stagePage.bind(repository);
|
||||
jest.spyOn(repository, 'stagePage').mockImplementation((...args) => {
|
||||
const result = stagePage(...args);
|
||||
stalePage.resolve(result);
|
||||
return result;
|
||||
});
|
||||
blocked.resolve(complete);
|
||||
await delay(10);
|
||||
expect(await stalePage.promise).toBe(false);
|
||||
expect((await prisma.tbankOperation.findFirstOrThrow()).payload).toEqual(
|
||||
operation('30'),
|
||||
);
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import assert from 'node:assert/strict';
|
||||
|
||||
import type { Prisma } from '../generated/prisma/client';
|
||||
import type { PortfolioDto } from '../src/modules/investments/portfolio/presentation/portfolio.dto';
|
||||
|
||||
import { PortfolioRepository } from '../src/modules/investments/portfolio/infrastructure/portfolio.repository';
|
||||
import { PrismaService } from '../src/prisma/prisma.service';
|
||||
|
||||
@@ -16,9 +19,41 @@ describe('portfolio publication (SQLite)', () => {
|
||||
totalsByCurrency: [],
|
||||
positions: [],
|
||||
cashBalances: [],
|
||||
structure: {},
|
||||
} as never;
|
||||
structure: { currencies: [], unvaluedCategories: [] },
|
||||
} satisfies PortfolioDto;
|
||||
const accountId = 'account';
|
||||
const valuedSnapshot = {
|
||||
...snapshot,
|
||||
totalsByCurrency: [
|
||||
{ currency: 'RUB', value: '200' },
|
||||
{ currency: 'USD', value: '10' },
|
||||
],
|
||||
} satisfies PortfolioDto;
|
||||
const createRunningAttempt = () =>
|
||||
prisma.tbankSyncWork.create({
|
||||
data: {
|
||||
id: 'live',
|
||||
userId: 'owner',
|
||||
revision: 'current',
|
||||
scopeKey: `portfolio:${accountId}`,
|
||||
intent: {},
|
||||
state: 'running',
|
||||
attemptId: 'live-attempt',
|
||||
processRunId: 'run',
|
||||
priority: 1,
|
||||
progress: {},
|
||||
},
|
||||
});
|
||||
const interceptTransaction = (intercept: (tx: Prisma.TransactionClient) => void) => {
|
||||
const transaction = prisma.$transaction.bind(prisma);
|
||||
jest.spyOn(prisma, '$transaction').mockImplementation(
|
||||
(callback: (tx: Prisma.TransactionClient) => Promise<unknown>) =>
|
||||
transaction((tx) => {
|
||||
intercept(tx);
|
||||
return callback(tx);
|
||||
}),
|
||||
);
|
||||
};
|
||||
|
||||
beforeAll(async () => {
|
||||
await prisma.$connect();
|
||||
@@ -27,7 +62,9 @@ describe('portfolio publication (SQLite)', () => {
|
||||
});
|
||||
});
|
||||
afterAll(async () => prisma.$disconnect());
|
||||
afterEach(() => jest.restoreAllMocks());
|
||||
beforeEach(async () => {
|
||||
await prisma.tbankPortfolioValueHistory.deleteMany();
|
||||
await prisma.tbankConnection.deleteMany();
|
||||
await prisma.tbankConnection.create({
|
||||
data: {
|
||||
@@ -48,20 +85,7 @@ describe('portfolio publication (SQLite)', () => {
|
||||
});
|
||||
|
||||
it('publishes the same snapshot for the running attempt of the current revision', async () => {
|
||||
await prisma.tbankSyncWork.create({
|
||||
data: {
|
||||
id: 'live',
|
||||
userId: 'owner',
|
||||
revision: 'current',
|
||||
scopeKey: `portfolio:${accountId}`,
|
||||
intent: {},
|
||||
state: 'running',
|
||||
attemptId: 'live-attempt',
|
||||
processRunId: 'run',
|
||||
priority: 1,
|
||||
progress: {},
|
||||
},
|
||||
});
|
||||
await createRunningAttempt();
|
||||
const published = await repository.publish(
|
||||
{ id: 'live', attemptId: 'live-attempt', userId: 'owner', revision: 'current' },
|
||||
accountId,
|
||||
@@ -70,4 +94,99 @@ describe('portfolio publication (SQLite)', () => {
|
||||
assert.equal(published, true);
|
||||
expect(await prisma.tbankPortfolio.count()).toBe(1);
|
||||
});
|
||||
|
||||
it('rolls back the snapshot, first value point and claim when the second point fails', async () => {
|
||||
const previousFetchedAt = new Date('2025-12-31T00:00:00.000Z');
|
||||
const previousCapturedAt = new Date('2025-12-31T01:00:00.000Z');
|
||||
await prisma.tbankPortfolio.create({
|
||||
data: {
|
||||
userId: 'owner',
|
||||
revision: 'current',
|
||||
accountId,
|
||||
payload: snapshot,
|
||||
fetchedAt: previousFetchedAt,
|
||||
},
|
||||
});
|
||||
await prisma.tbankPortfolioValueHistory.create({
|
||||
data: {
|
||||
userId: 'owner',
|
||||
accountId,
|
||||
points: {
|
||||
create: {
|
||||
attemptId: 'previous-attempt',
|
||||
currency: 'RUB',
|
||||
value: '100',
|
||||
capturedAt: previousCapturedAt,
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
await createRunningAttempt();
|
||||
interceptTransaction((tx) => {
|
||||
const upsert = tx.tbankPortfolioValuePoint.upsert.bind(tx.tbankPortfolioValuePoint);
|
||||
jest
|
||||
.spyOn(tx.tbankPortfolioValuePoint, 'upsert')
|
||||
.mockImplementationOnce((args) => upsert(args))
|
||||
.mockRejectedValueOnce(new Error('injected second point failure'));
|
||||
});
|
||||
|
||||
await expect(
|
||||
repository.publish(
|
||||
{ id: 'live', attemptId: 'live-attempt', userId: 'owner', revision: 'current' },
|
||||
accountId,
|
||||
valuedSnapshot,
|
||||
),
|
||||
).rejects.toThrow('injected second point failure');
|
||||
|
||||
expect(
|
||||
await prisma.tbankPortfolio.findUnique({
|
||||
where: { userId_revision_accountId: { userId: 'owner', revision: 'current', accountId } },
|
||||
}),
|
||||
).toMatchObject({ payload: snapshot, fetchedAt: previousFetchedAt, dataRevision: 1 });
|
||||
expect(
|
||||
await prisma.tbankPortfolioValuePoint.findMany({
|
||||
select: { attemptId: true, value: true, capturedAt: true },
|
||||
}),
|
||||
).toEqual([
|
||||
{ attemptId: 'previous-attempt', value: '100', capturedAt: previousCapturedAt },
|
||||
]);
|
||||
expect(await prisma.tbankSyncWork.findUniqueOrThrow({ where: { id: 'live' } }))
|
||||
.toMatchObject({ state: 'running', attemptId: 'live-attempt' });
|
||||
});
|
||||
|
||||
it.each(['stale attempt', 'complete work', 'invalid token'] as const)(
|
||||
'does not publish for %s',
|
||||
async (scenario) => {
|
||||
await createRunningAttempt();
|
||||
if (scenario === 'complete work') {
|
||||
await prisma.tbankSyncWork.update({
|
||||
where: { id: 'live' },
|
||||
data: { state: 'complete' },
|
||||
});
|
||||
}
|
||||
if (scenario === 'invalid token') {
|
||||
await prisma.tbankConnection.update({
|
||||
where: { userId: 'owner' },
|
||||
data: { invalidToken: true },
|
||||
});
|
||||
}
|
||||
|
||||
await expect(
|
||||
repository.publish(
|
||||
{
|
||||
id: 'live',
|
||||
attemptId: scenario === 'stale attempt' ? 'stale-attempt' : 'live-attempt',
|
||||
userId: 'owner',
|
||||
revision: 'current',
|
||||
},
|
||||
accountId,
|
||||
valuedSnapshot,
|
||||
),
|
||||
).resolves.toBe(false);
|
||||
|
||||
expect(await prisma.tbankPortfolio.count()).toBe(0);
|
||||
expect(await prisma.tbankPortfolioValueHistory.count()).toBe(0);
|
||||
expect(await prisma.tbankPortfolioValuePoint.count()).toBe(0);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user