topaLE
/
ghostfolio
mirror of https://github.com/ghostfolio/ghostfolio
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Clean up logs

pull/3393/head
Thomas Kaul 1 year ago
parent
175261720a
commit
2d8b1b11ca
4 changed files with 0 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      apps/api/src/app/order/order.service.ts
  2. 16
      apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
  3. 12
      apps/api/src/app/portfolio/portfolio.controller.ts
  4. 57
      apps/api/src/app/portfolio/portfolio.service.ts

3
apps/api/src/app/order/order.service.ts
View File

@ -323,7 +323,6 @@ export class OrderService {
userId: string; userId: string;
withExcludedAccounts?: boolean; withExcludedAccounts?: boolean;
}): Promise<Activities> { }): Promise<Activities> {
console.time('------ OrderService.getOrders');
let orderBy: Prisma.Enumerable<Prisma.OrderOrderByWithRelationInput> = [ let orderBy: Prisma.Enumerable<Prisma.OrderOrderByWithRelationInput> = [
{ date: 'asc' }, { date: 'asc' },
{ id: 'asc' } { id: 'asc' }
@ -513,8 +512,6 @@ export class OrderService {
}; };
}); });
console.timeEnd('------ OrderService.getOrders');
return { activities, count }; return { activities, count };
} }

16
apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
View File

@ -88,8 +88,6 @@ export abstract class PortfolioCalculator {
useCache: boolean; useCache: boolean;
userId: string; userId: string;
}) { }) {
console.time('--- PortfolioCalculator.constructor - 1');
this.accountBalanceItems = accountBalanceItems; this.accountBalanceItems = accountBalanceItems;
this.configurationService = configurationService; this.configurationService = configurationService;
this.currency = currency; this.currency = currency;
@ -147,16 +145,9 @@ export abstract class PortfolioCalculator {
this.endDate = endDate; this.endDate = endDate;
this.startDate = startDate; this.startDate = startDate;
console.timeEnd('--- PortfolioCalculator.constructor - 1');
console.time('--- PortfolioCalculator.constructor - 2');
this.computeTransactionPoints(); this.computeTransactionPoints();
console.timeEnd('--- PortfolioCalculator.constructor - 2');
console.time('--- PortfolioCalculator.constructor - 3');
this.snapshotPromise = this.initialize(); this.snapshotPromise = this.initialize();
console.timeEnd('--- PortfolioCalculator.constructor - 3');
} }
protected abstract calculateOverallPerformance( protected abstract calculateOverallPerformance(
@ -662,8 +653,6 @@ export abstract class PortfolioCalculator {
dateRange?: DateRange; dateRange?: DateRange;
withDataDecimation?: boolean; withDataDecimation?: boolean;
}): Promise<HistoricalDataItem[]> { }): Promise<HistoricalDataItem[]> {
console.time('-------- PortfolioCalculator.getChart');
if (this.getTransactionPoints().length === 0) { if (this.getTransactionPoints().length === 0) {
return []; return [];
} }
@ -684,8 +673,6 @@ export abstract class PortfolioCalculator {
start: startDate start: startDate
}); });
console.timeEnd('-------- PortfolioCalculator.getChart');
return chartData; return chartData;
} }
@ -1098,11 +1085,8 @@ export abstract class PortfolioCalculator {
} }
public async getSnapshot() { public async getSnapshot() {
console.time('getSnapshot');
await this.snapshotPromise; await this.snapshotPromise;
console.timeEnd('getSnapshot');
return this.snapshot; return this.snapshot;
} }

12
apps/api/src/app/portfolio/portfolio.controller.ts
View File

@ -89,8 +89,6 @@ export class PortfolioController {
@Query('tags') filterByTags?: string, @Query('tags') filterByTags?: string,
@Query('withMarkets') withMarketsParam = 'false' @Query('withMarkets') withMarketsParam = 'false'
): Promise<PortfolioDetails & { hasError: boolean }> { ): Promise<PortfolioDetails & { hasError: boolean }> {
console.time('TOTAL');
const withMarkets = withMarketsParam === 'true'; const withMarkets = withMarketsParam === 'true';
let hasDetails = true; let hasDetails = true;
@ -106,8 +104,6 @@ export class PortfolioController {
filterByTags filterByTags
}); });
console.time('- PortfolioController.getDetails - 1');
const { accounts, hasErrors, holdings, platforms, summary } = const { accounts, hasErrors, holdings, platforms, summary } =
await this.portfolioService.getDetails({ await this.portfolioService.getDetails({
dateRange, dateRange,
@ -118,10 +114,6 @@ export class PortfolioController {
withSummary: true withSummary: true
}); });
console.timeEnd('- PortfolioController.getDetails - 1');
console.time('- PortfolioController.getDetails - 2');
if (hasErrors || hasNotDefinedValuesInObject(holdings)) { if (hasErrors || hasNotDefinedValuesInObject(holdings)) {
hasError = true; hasError = true;
} }
@ -226,10 +218,6 @@ export class PortfolioController {
}; };
} }
console.timeEnd('- PortfolioController.getDetails - 2');
console.timeEnd('TOTAL');
return { return {
accounts, accounts,
hasError, hasError,

57
apps/api/src/app/portfolio/portfolio.service.ts
View File

@ -323,8 +323,6 @@ export class PortfolioService {
withMarkets?: boolean; withMarkets?: boolean;
withSummary?: boolean; withSummary?: boolean;
}): Promise<PortfolioDetails & { hasErrors: boolean }> { }): Promise<PortfolioDetails & { hasErrors: boolean }> {
console.time('-- PortfolioService.getDetails - 1');
userId = await this.getUserId(impersonationId, userId); userId = await this.getUserId(impersonationId, userId);
const user = await this.userService.user({ id: userId }); const user = await this.userService.user({ id: userId });
const userCurrency = this.getUserCurrency(user); const userCurrency = this.getUserCurrency(user);
@ -351,16 +349,9 @@ export class PortfolioService {
this.request.user?.Settings.settings.isExperimentalFeatures this.request.user?.Settings.settings.isExperimentalFeatures
}); });
console.timeEnd('-- PortfolioService.getDetails - 1');
console.time('-- PortfolioService.getDetails - 2');
const { currentValueInBaseCurrency, hasErrors, positions } = const { currentValueInBaseCurrency, hasErrors, positions } =
await portfolioCalculator.getSnapshot(); await portfolioCalculator.getSnapshot();
console.timeEnd('-- PortfolioService.getDetails - 2');
console.time('-- PortfolioService.getDetails - 3');
const cashDetails = await this.accountService.getCashDetails({ const cashDetails = await this.accountService.getCashDetails({
filters, filters,
userId, userId,
@ -409,9 +400,6 @@ export class PortfolioService {
}; };
}); });
console.timeEnd('-- PortfolioService.getDetails - 3');
console.time('-- PortfolioService.getDetails - 4');
const symbolProfiles = const symbolProfiles =
await this.symbolProfileService.getSymbolProfiles(dataGatheringItems); await this.symbolProfileService.getSymbolProfiles(dataGatheringItems);
@ -425,9 +413,6 @@ export class PortfolioService {
portfolioItemsNow[position.symbol] = position; portfolioItemsNow[position.symbol] = position;
} }
console.timeEnd('-- PortfolioService.getDetails - 4');
console.time('-- PortfolioService.getDetails - 5');
for (const { for (const {
currency, currency,
dividend, dividend,
@ -581,10 +566,6 @@ export class PortfolioService {
}; };
} }
console.timeEnd('-- PortfolioService.getDetails - 5');
console.time('-- PortfolioService.getDetails - 6');
let summary: PortfolioSummary; let summary: PortfolioSummary;
if (withSummary) { if (withSummary) {
@ -603,8 +584,6 @@ export class PortfolioService {
}); });
} }
console.timeEnd('-- PortfolioService.getDetails - 6');
return { return {
accounts, accounts,
hasErrors, hasErrors,
@ -1078,9 +1057,6 @@ export class PortfolioService {
userId: string; userId: string;
withExcludedAccounts?: boolean; withExcludedAccounts?: boolean;
}): Promise<PortfolioPerformanceResponse> { }): Promise<PortfolioPerformanceResponse> {
// OPTIMIZE (1.34s)
console.time('------ PortfolioService.getPerformance');
userId = await this.getUserId(impersonationId, userId); userId = await this.getUserId(impersonationId, userId);
const user = await this.userService.user({ id: userId }); const user = await this.userService.user({ id: userId });
const userCurrency = this.getUserCurrency(user); const userCurrency = this.getUserCurrency(user);
@ -1117,8 +1093,6 @@ export class PortfolioService {
const { endDate, startDate } = getIntervalFromDateRange(dateRange); const { endDate, startDate } = getIntervalFromDateRange(dateRange);
console.time('------- PortfolioService.getPerformance - 2');
const { activities } = await this.orderService.getOrders({ const { activities } = await this.orderService.getOrders({
endDate, endDate,
filters, filters,
@ -1127,9 +1101,6 @@ export class PortfolioService {
withExcludedAccounts withExcludedAccounts
}); });
console.timeEnd('------- PortfolioService.getPerformance - 2');
console.time('------- PortfolioService.getPerformance - 3');
if (accountBalanceItems?.length <= 0 && activities?.length <= 0) { if (accountBalanceItems?.length <= 0 && activities?.length <= 0) {
return { return {
chart: [], chart: [],
@ -1168,16 +1139,6 @@ export class PortfolioService {
const { errors, hasErrors, historicalData } = const { errors, hasErrors, historicalData } =
await portfolioCalculator.getSnapshot(); 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({ const { chart } = await portfolioCalculator.getPerformance({
end: endDate, end: endDate,
start: startDate start: startDate
@ -1624,23 +1585,15 @@ export class PortfolioService {
userCurrency: string; userCurrency: string;
userId: string; userId: string;
}): Promise<PortfolioSummary> { }): Promise<PortfolioSummary> {
// OPTIMIZE (1.1 s)
console.time('---- PortfolioService.getSummary');
userId = await this.getUserId(impersonationId, userId); userId = await this.getUserId(impersonationId, userId);
const user = await this.userService.user({ id: userId }); const user = await this.userService.user({ id: userId });
console.time('----- PortfolioService.getSummary - 1');
const { activities } = await this.orderService.getOrders({ const { activities } = await this.orderService.getOrders({
userCurrency, userCurrency,
userId, userId,
withExcludedAccounts: true withExcludedAccounts: true
}); });
console.timeEnd('----- PortfolioService.getSummary - 1');
console.time('----- PortfolioService.getSummary - 2');
const excludedActivities: Activity[] = []; const excludedActivities: Activity[] = [];
const nonExcludedActivities: Activity[] = []; const nonExcludedActivities: Activity[] = [];
@ -1681,9 +1634,6 @@ export class PortfolioService {
const interest = await portfolioCalculator.getInterestInBaseCurrency(); const interest = await portfolioCalculator.getInterestInBaseCurrency();
console.timeEnd('----- PortfolioService.getSummary - 2');
console.time('----- PortfolioService.getSummary - 3');
const liabilities = const liabilities =
await portfolioCalculator.getLiabilitiesInBaseCurrency(); await portfolioCalculator.getLiabilitiesInBaseCurrency();
@ -1720,9 +1670,6 @@ export class PortfolioService {
}) })
); );
console.timeEnd('----- PortfolioService.getSummary - 3');
console.time('----- PortfolioService.getSummary - 4');
const cashDetailsWithExcludedAccounts = const cashDetailsWithExcludedAccounts =
await this.accountService.getCashDetails({ await this.accountService.getCashDetails({
userId, userId,
@ -1760,10 +1707,6 @@ export class PortfolioService {
) )
})?.toNumber(); })?.toNumber();
console.timeEnd('----- PortfolioService.getSummary - 4');
console.timeEnd('---- PortfolioService.getSummary');
return { return {
annualizedPerformancePercent, annualizedPerformancePercent,
annualizedPerformancePercentWithCurrencyEffect, annualizedPerformancePercentWithCurrencyEffect,

Write Preview
Loading…
Cancel
Save