Browse Source
Task/refactor interest to interestInBaseCurrency in portfolio summary interface (#5763)
* Refactor interest to interestInBaseCurrency
pull/5761/head^2
Dibyendu Sahoo
22 hours ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with
6 additions and
6 deletions
-
apps/api/src/app/portfolio/portfolio.controller.ts
-
apps/api/src/app/portfolio/portfolio.service.ts
-
apps/api/src/helper/object.helper.spec.ts
-
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
-
libs/common/src/lib/interfaces/portfolio-summary.interface.ts
|
|
@ -197,7 +197,7 @@ export class PortfolioController { |
|
|
|
'filteredValueInBaseCurrency', |
|
|
|
'grossPerformance', |
|
|
|
'grossPerformanceWithCurrencyEffect', |
|
|
|
'interest', |
|
|
|
'interestInBaseCurrency', |
|
|
|
'items', |
|
|
|
'liabilities', |
|
|
|
'netPerformance', |
|
|
|
|
|
@ -2105,7 +2105,7 @@ export class PortfolioService { |
|
|
|
) |
|
|
|
.plus(fees) |
|
|
|
.toNumber(), |
|
|
|
interest: interest.toNumber(), |
|
|
|
interestInBaseCurrency: interest.toNumber(), |
|
|
|
liabilitiesInBaseCurrency: liabilities.toNumber(), |
|
|
|
totalInvestment: totalInvestment.toNumber(), |
|
|
|
totalValueInBaseCurrency: netWorth |
|
|
|
|
|
@ -1536,7 +1536,7 @@ describe('redactAttributes', () => { |
|
|
|
fireWealth: null, |
|
|
|
grossPerformance: null, |
|
|
|
grossPerformanceWithCurrencyEffect: null, |
|
|
|
interest: null, |
|
|
|
interestInBaseCurrency: null, |
|
|
|
items: null, |
|
|
|
liabilities: null, |
|
|
|
totalInvestment: null, |
|
|
@ -3039,7 +3039,7 @@ describe('redactAttributes', () => { |
|
|
|
fireWealth: null, |
|
|
|
grossPerformance: null, |
|
|
|
grossPerformanceWithCurrencyEffect: null, |
|
|
|
interest: null, |
|
|
|
interestInBaseCurrency: null, |
|
|
|
items: null, |
|
|
|
liabilities: null, |
|
|
|
totalInvestment: null, |
|
|
|
|
|
@ -302,7 +302,7 @@ |
|
|
|
[isCurrency]="true" |
|
|
|
[locale]="locale" |
|
|
|
[unit]="baseCurrency" |
|
|
|
[value]="isLoading ? undefined : summary?.interest" |
|
|
|
[value]="isLoading ? undefined : summary?.interestInBaseCurrency" |
|
|
|
/> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
@ -20,7 +20,7 @@ export interface PortfolioSummary extends PortfolioPerformance { |
|
|
|
fireWealth: FireWealth; |
|
|
|
grossPerformance: number; |
|
|
|
grossPerformanceWithCurrencyEffect: number; |
|
|
|
interest: number; |
|
|
|
interestInBaseCurrency: number; |
|
|
|
liabilitiesInBaseCurrency: number; |
|
|
|
totalBuy: number; |
|
|
|
totalSell: number; |
|
|
|