diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts index 7bf07a415..3b95211f0 100644 --- a/apps/api/src/app/order/order.service.ts +++ b/apps/api/src/app/order/order.service.ts @@ -323,7 +323,6 @@ export class OrderService { userId: string; withExcludedAccounts?: boolean; }): Promise { - console.time('------ OrderService.getOrders'); let orderBy: Prisma.Enumerable = [ { date: 'asc' }, { id: 'asc' } @@ -513,8 +512,6 @@ export class OrderService { }; }); - console.timeEnd('------ OrderService.getOrders'); - return { activities, count }; } diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts index 15768b217..531932334 100644 --- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts +++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts @@ -88,8 +88,6 @@ export abstract class PortfolioCalculator { useCache: boolean; userId: string; }) { - console.time('--- PortfolioCalculator.constructor - 1'); - this.accountBalanceItems = accountBalanceItems; this.configurationService = configurationService; this.currency = currency; @@ -147,16 +145,9 @@ export abstract class PortfolioCalculator { this.endDate = endDate; this.startDate = startDate; - console.timeEnd('--- PortfolioCalculator.constructor - 1'); - console.time('--- PortfolioCalculator.constructor - 2'); - this.computeTransactionPoints(); - console.timeEnd('--- PortfolioCalculator.constructor - 2'); - - console.time('--- PortfolioCalculator.constructor - 3'); this.snapshotPromise = this.initialize(); - console.timeEnd('--- PortfolioCalculator.constructor - 3'); } protected abstract calculateOverallPerformance( @@ -662,8 +653,6 @@ export abstract class PortfolioCalculator { dateRange?: DateRange; withDataDecimation?: boolean; }): Promise { - console.time('-------- PortfolioCalculator.getChart'); - if (this.getTransactionPoints().length === 0) { return []; } @@ -684,8 +673,6 @@ export abstract class PortfolioCalculator { start: startDate }); - console.timeEnd('-------- PortfolioCalculator.getChart'); - return chartData; } @@ -1098,11 +1085,8 @@ export abstract class PortfolioCalculator { } public async getSnapshot() { - console.time('getSnapshot'); await this.snapshotPromise; - console.timeEnd('getSnapshot'); - return this.snapshot; } diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts index 2d7c49aff..7ce0b0847 100644 --- a/apps/api/src/app/portfolio/portfolio.controller.ts +++ b/apps/api/src/app/portfolio/portfolio.controller.ts @@ -89,8 +89,6 @@ export class PortfolioController { @Query('tags') filterByTags?: string, @Query('withMarkets') withMarketsParam = 'false' ): Promise { - console.time('TOTAL'); - const withMarkets = withMarketsParam === 'true'; let hasDetails = true; @@ -106,8 +104,6 @@ export class PortfolioController { filterByTags }); - console.time('- PortfolioController.getDetails - 1'); - const { accounts, hasErrors, holdings, platforms, summary } = await this.portfolioService.getDetails({ dateRange, @@ -118,10 +114,6 @@ export class PortfolioController { withSummary: true }); - console.timeEnd('- PortfolioController.getDetails - 1'); - - console.time('- PortfolioController.getDetails - 2'); - if (hasErrors || hasNotDefinedValuesInObject(holdings)) { hasError = true; } @@ -226,10 +218,6 @@ export class PortfolioController { }; } - console.timeEnd('- PortfolioController.getDetails - 2'); - - console.timeEnd('TOTAL'); - return { accounts, hasError, diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 6f8166a15..b71f7c921 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -323,8 +323,6 @@ export class PortfolioService { withMarkets?: boolean; withSummary?: boolean; }): Promise { - console.time('-- PortfolioService.getDetails - 1'); - userId = await this.getUserId(impersonationId, userId); const user = await this.userService.user({ id: userId }); const userCurrency = this.getUserCurrency(user); @@ -351,16 +349,9 @@ export class PortfolioService { this.request.user?.Settings.settings.isExperimentalFeatures }); - console.timeEnd('-- PortfolioService.getDetails - 1'); - - console.time('-- PortfolioService.getDetails - 2'); - const { currentValueInBaseCurrency, hasErrors, positions } = await portfolioCalculator.getSnapshot(); - console.timeEnd('-- PortfolioService.getDetails - 2'); - console.time('-- PortfolioService.getDetails - 3'); - const cashDetails = await this.accountService.getCashDetails({ filters, userId, @@ -409,9 +400,6 @@ export class PortfolioService { }; }); - console.timeEnd('-- PortfolioService.getDetails - 3'); - console.time('-- PortfolioService.getDetails - 4'); - const symbolProfiles = await this.symbolProfileService.getSymbolProfiles(dataGatheringItems); @@ -425,9 +413,6 @@ export class PortfolioService { portfolioItemsNow[position.symbol] = position; } - console.timeEnd('-- PortfolioService.getDetails - 4'); - console.time('-- PortfolioService.getDetails - 5'); - for (const { currency, dividend, @@ -581,10 +566,6 @@ export class PortfolioService { }; } - console.timeEnd('-- PortfolioService.getDetails - 5'); - - console.time('-- PortfolioService.getDetails - 6'); - let summary: PortfolioSummary; if (withSummary) { @@ -603,8 +584,6 @@ export class PortfolioService { }); } - console.timeEnd('-- PortfolioService.getDetails - 6'); - return { accounts, hasErrors, @@ -1078,9 +1057,6 @@ export class PortfolioService { userId: string; withExcludedAccounts?: boolean; }): Promise { - // OPTIMIZE (1.34s) - console.time('------ PortfolioService.getPerformance'); - userId = await this.getUserId(impersonationId, userId); const user = await this.userService.user({ id: userId }); const userCurrency = this.getUserCurrency(user); @@ -1117,8 +1093,6 @@ export class PortfolioService { const { endDate, startDate } = getIntervalFromDateRange(dateRange); - console.time('------- PortfolioService.getPerformance - 2'); - const { activities } = await this.orderService.getOrders({ endDate, filters, @@ -1127,9 +1101,6 @@ export class PortfolioService { withExcludedAccounts }); - console.timeEnd('------- PortfolioService.getPerformance - 2'); - console.time('------- PortfolioService.getPerformance - 3'); - if (accountBalanceItems?.length <= 0 && activities?.length <= 0) { return { chart: [], @@ -1168,16 +1139,6 @@ export class PortfolioService { const { errors, hasErrors, historicalData } = await portfolioCalculator.getSnapshot(); - console.timeEnd('------- PortfolioService.getPerformance - 3'); - console.time('------- PortfolioService.getPerformance - 4'); - - console.timeEnd('------- PortfolioService.getPerformance - 4'); - console.time('------- PortfolioService.getPerformance - 5'); - - console.timeEnd('------- PortfolioService.getPerformance - 5'); - - console.timeEnd('------ PortfolioService.getPerformance'); - const { chart } = await portfolioCalculator.getPerformance({ end: endDate, start: startDate @@ -1624,23 +1585,15 @@ export class PortfolioService { userCurrency: string; userId: string; }): Promise { - // OPTIMIZE (1.1 s) - console.time('---- PortfolioService.getSummary'); - userId = await this.getUserId(impersonationId, userId); const user = await this.userService.user({ id: userId }); - console.time('----- PortfolioService.getSummary - 1'); - const { activities } = await this.orderService.getOrders({ userCurrency, userId, withExcludedAccounts: true }); - console.timeEnd('----- PortfolioService.getSummary - 1'); - console.time('----- PortfolioService.getSummary - 2'); - const excludedActivities: Activity[] = []; const nonExcludedActivities: Activity[] = []; @@ -1681,9 +1634,6 @@ export class PortfolioService { const interest = await portfolioCalculator.getInterestInBaseCurrency(); - console.timeEnd('----- PortfolioService.getSummary - 2'); - console.time('----- PortfolioService.getSummary - 3'); - const liabilities = await portfolioCalculator.getLiabilitiesInBaseCurrency(); @@ -1720,9 +1670,6 @@ export class PortfolioService { }) ); - console.timeEnd('----- PortfolioService.getSummary - 3'); - console.time('----- PortfolioService.getSummary - 4'); - const cashDetailsWithExcludedAccounts = await this.accountService.getCashDetails({ userId, @@ -1760,10 +1707,6 @@ export class PortfolioService { ) })?.toNumber(); - console.timeEnd('----- PortfolioService.getSummary - 4'); - - console.timeEnd('---- PortfolioService.getSummary'); - return { annualizedPerformancePercent, annualizedPerformancePercentWithCurrencyEffect,