Browse Source

chore: Use protected instead of private methods for logging

pull/5027/head
Dan 1 year ago
parent
commit
17078aeafd
  1. 24
      apps/api/src/app/portfolio/calculator/constantPortfolioReturn/portfolio-calculator.ts
  2. 7
      apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
  3. 14
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts

24
apps/api/src/app/portfolio/calculator/constantPortfolioReturn/portfolio-calculator.ts

@ -197,7 +197,7 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
}
@LogPerformance
private async getTimeWeightedChartData({
protected async getTimeWeightedChartData({
dates
}: {
dates?: Date[];
@ -301,7 +301,7 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
}
@LogPerformance
private async handleSingleHolding(
protected async handleSingleHolding(
previousDate: string,
holding: string,
date: string,
@ -387,12 +387,12 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
}
@LogPerformance
private getCurrency(symbol: string) {
protected getCurrency(symbol: string) {
return this.getCurrencyFromActivities(this.activities, symbol);
}
@LogPerformance
private getCurrencyFromActivities(
protected getCurrencyFromActivities(
activities: PortfolioOrder[],
symbol: string
) {
@ -406,7 +406,7 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
}
@LogPerformance
private async getHoldings(
protected async getHoldings(
activities: PortfolioOrder[],
start: Date,
end: Date
@ -428,7 +428,7 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
}
@LogPerformance
private async computeHoldings(
protected async computeHoldings(
activities: PortfolioOrder[],
start: Date,
end: Date
@ -473,7 +473,7 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
}
@LogPerformance
private calculateInitialHoldings(
protected calculateInitialHoldings(
investmentByDate: { [date: string]: PortfolioOrder[] },
start: Date,
currentHoldings: { [date: string]: { [symbol: string]: Big } }
@ -504,7 +504,7 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
}
@LogPerformance
private getInvestmentByDate(activities: PortfolioOrder[]): {
protected getInvestmentByDate(activities: PortfolioOrder[]): {
[date: string]: PortfolioOrder[];
} {
return activities.reduce((groupedByDate, order) => {
@ -519,7 +519,7 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
}
@LogPerformance
private mapToDataGatheringItems(
protected mapToDataGatheringItems(
orders: PortfolioOrder[]
): IDataGatheringItem[] {
return orders
@ -536,7 +536,7 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
}
@LogPerformance
private async computeMarketMap(dateQuery: DateQuery): Promise<{
protected async computeMarketMap(dateQuery: DateQuery): Promise<{
[date: string]: { [symbol: string]: Big };
}> {
const dataGatheringItems: IDataGatheringItem[] =
@ -568,7 +568,9 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
}
@LogPerformance
private activitiesToPortfolioOrder(activities: Activity[]): PortfolioOrder[] {
protected activitiesToPortfolioOrder(
activities: Activity[]
): PortfolioOrder[] {
return activities
.map(
({

7
apps/api/src/app/portfolio/calculator/portfolio-calculator.ts

@ -926,13 +926,15 @@ export abstract class PortfolioCalculator {
return this.transactionPoints;
}
@LogPerformance
public async getValuablesInBaseCurrency() {
await this.snapshotPromise;
return this.snapshot.totalValuablesWithCurrencyEffect;
}
private computeTransactionPoints() {
@LogPerformance
protected computeTransactionPoints() {
this.transactionPoints = [];
const symbols: { [symbol: string]: TransactionPointSymbol } = {};
@ -1070,7 +1072,8 @@ export abstract class PortfolioCalculator {
}
}
private async initialize() {
@LogPerformance
protected async initialize() {
if (this.useCache) {
const startTimeTotal = performance.now();

14
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts

@ -632,7 +632,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
}
@LogPerformance
private handleOrders(
protected handleOrders(
orders: PortfolioOrderItem[],
exchangeRates: { [dateString: string]: number },
totalDividend,
@ -986,7 +986,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
}
@LogPerformance
private calculateTimeWeightedInvestments(
protected calculateTimeWeightedInvestments(
valueOfInvestmentBeforeTransaction: any,
order: PortfolioOrderItem,
orders: PortfolioOrderItem[],
@ -1102,7 +1102,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
}
@LogPerformance
private calculatePerformances(
protected calculatePerformances(
order: PortfolioOrderItem,
lastAveragePrice: any,
lastAveragePriceWithCurrencyEffect: any,
@ -1187,7 +1187,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
}
@LogPerformance
private calculateInvestmentValues(
protected calculateInvestmentValues(
totalInvestment: any,
totalInvestmentWithCurrencyEffect: any,
transactionInvestment,
@ -1260,7 +1260,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
}
@LogPerformance
private handleBuyAndSellOrders(
protected handleBuyAndSellOrders(
order: PortfolioOrderItem,
transactionInvestment,
transactionInvestmentWithCurrencyEffect,
@ -1314,7 +1314,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
}
@LogPerformance
private handleOrderType(
protected handleOrderType(
order: PortfolioOrderItem,
totalDividend: any,
totalDividendInBaseCurrency: any,
@ -1368,7 +1368,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
}
@LogPerformance
private handleIsChartMode(
protected handleIsChartMode(
isChartMode: boolean,
orders: PortfolioOrderItem[],
day: Date,

Loading…
Cancel
Save