Browse Source

Refactoring

pull/2636/head
Thomas Kaul 1 year ago
parent
commit
e617df09c4
  1. 2
      apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts
  2. 8
      apps/api/src/app/portfolio/portfolio.service.ts

2
apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts

@ -12,7 +12,7 @@ export interface PortfolioPositionDetail {
averagePrice: number; averagePrice: number;
dataProviderInfo: DataProviderInfo; dataProviderInfo: DataProviderInfo;
dividendInBaseCurrency: number; dividendInBaseCurrency: number;
dividendYieldInPercent: number; dividendYieldPercent: number;
feeInBaseCurrency: number; feeInBaseCurrency: number;
firstBuyDate: string; firstBuyDate: string;
grossPerformance: number; grossPerformance: number;

8
apps/api/src/app/portfolio/portfolio.service.ts

@ -710,7 +710,7 @@ export class PortfolioService {
averagePrice: undefined, averagePrice: undefined,
dataProviderInfo: undefined, dataProviderInfo: undefined,
dividendInBaseCurrency: undefined, dividendInBaseCurrency: undefined,
dividendYieldInPercent: undefined, dividendYieldPercent: undefined,
feeInBaseCurrency: undefined, feeInBaseCurrency: undefined,
firstBuyDate: undefined, firstBuyDate: undefined,
grossPerformance: undefined, grossPerformance: undefined,
@ -782,7 +782,7 @@ export class PortfolioService {
return Account; return Account;
}); });
const dividendYieldInPercent = dividendInBaseCurrency const dividendYieldPercent = dividendInBaseCurrency
.mul(100) .mul(100)
.div(marketPrice); .div(marketPrice);
@ -859,7 +859,7 @@ export class PortfolioService {
averagePrice: averagePrice.toNumber(), averagePrice: averagePrice.toNumber(),
dataProviderInfo: portfolioCalculator.getDataProviderInfos()?.[0], dataProviderInfo: portfolioCalculator.getDataProviderInfos()?.[0],
dividendInBaseCurrency: dividendInBaseCurrency.toNumber(), dividendInBaseCurrency: dividendInBaseCurrency.toNumber(),
dividendYieldInPercent: dividendYieldInPercent.toNumber(), dividendYieldPercent: dividendYieldPercent.toNumber(),
feeInBaseCurrency: this.exchangeRateDataService.toCurrency( feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
fee.toNumber(), fee.toNumber(),
SymbolProfile.currency, SymbolProfile.currency,
@ -936,7 +936,7 @@ export class PortfolioService {
averagePrice: 0, averagePrice: 0,
dataProviderInfo: undefined, dataProviderInfo: undefined,
dividendInBaseCurrency: 0, dividendInBaseCurrency: 0,
dividendYieldInPercent: 0, dividendYieldPercent: 0,
feeInBaseCurrency: 0, feeInBaseCurrency: 0,
firstBuyDate: undefined, firstBuyDate: undefined,
grossPerformance: undefined, grossPerformance: undefined,

Loading…
Cancel
Save