From e617df09c4991a9ed34c7194dd80665a1898a220 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Wed, 3 Apr 2024 17:49:18 +0200 Subject: [PATCH] Refactoring --- .../interfaces/portfolio-position-detail.interface.ts | 2 +- apps/api/src/app/portfolio/portfolio.service.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts b/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts index f557e191c..bdfc8c3df 100644 --- a/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts +++ b/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts @@ -12,7 +12,7 @@ export interface PortfolioPositionDetail { averagePrice: number; dataProviderInfo: DataProviderInfo; dividendInBaseCurrency: number; - dividendYieldInPercent: number; + dividendYieldPercent: number; feeInBaseCurrency: number; firstBuyDate: string; grossPerformance: number; diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index a8b18bb3d..1512ed3b6 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -710,7 +710,7 @@ export class PortfolioService { averagePrice: undefined, dataProviderInfo: undefined, dividendInBaseCurrency: undefined, - dividendYieldInPercent: undefined, + dividendYieldPercent: undefined, feeInBaseCurrency: undefined, firstBuyDate: undefined, grossPerformance: undefined, @@ -782,7 +782,7 @@ export class PortfolioService { return Account; }); - const dividendYieldInPercent = dividendInBaseCurrency + const dividendYieldPercent = dividendInBaseCurrency .mul(100) .div(marketPrice); @@ -859,7 +859,7 @@ export class PortfolioService { averagePrice: averagePrice.toNumber(), dataProviderInfo: portfolioCalculator.getDataProviderInfos()?.[0], dividendInBaseCurrency: dividendInBaseCurrency.toNumber(), - dividendYieldInPercent: dividendYieldInPercent.toNumber(), + dividendYieldPercent: dividendYieldPercent.toNumber(), feeInBaseCurrency: this.exchangeRateDataService.toCurrency( fee.toNumber(), SymbolProfile.currency, @@ -936,7 +936,7 @@ export class PortfolioService { averagePrice: 0, dataProviderInfo: undefined, dividendInBaseCurrency: 0, - dividendYieldInPercent: 0, + dividendYieldPercent: 0, feeInBaseCurrency: 0, firstBuyDate: undefined, grossPerformance: undefined,