From 92ff18226b94871bf5127ece07ef3c959efcf51c Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Sat, 4 Sep 2021 18:58:55 +0200 Subject: [PATCH] Migrate performance chart to net performance --- .../app/portfolio/interfaces/timeline-period.interface.ts | 1 + apps/api/src/app/portfolio/portfolio-calculator.ts | 7 ++++--- apps/api/src/app/portfolio/portfolio.service.ts | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/api/src/app/portfolio/interfaces/timeline-period.interface.ts b/apps/api/src/app/portfolio/interfaces/timeline-period.interface.ts index a26bc0c15..0031d50d3 100644 --- a/apps/api/src/app/portfolio/interfaces/timeline-period.interface.ts +++ b/apps/api/src/app/portfolio/interfaces/timeline-period.interface.ts @@ -4,5 +4,6 @@ export interface TimelinePeriod { date: string; grossPerformance: Big; investment: Big; + netPerformance: Big; value: Big; } diff --git a/apps/api/src/app/portfolio/portfolio-calculator.ts b/apps/api/src/app/portfolio/portfolio-calculator.ts index 60facc686..52cd4e8e7 100644 --- a/apps/api/src/app/portfolio/portfolio-calculator.ts +++ b/apps/api/src/app/portfolio/portfolio-calculator.ts @@ -522,7 +522,7 @@ export class PortfolioCalculator { } } - const results = []; + const results: TimelinePeriod[] = []; for ( let currentDate = startDate; isBefore(currentDate, endDate); @@ -546,10 +546,11 @@ export class PortfolioCalculator { } if (!invalid) { const result = { + investment, + value, date: currentDateAsString, grossPerformance: value.minus(investment), - investment, - value + netPerformance: new Big(0) // TODO }; results.push(result); } diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index a3dba2524..3b9eee95c 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -148,7 +148,7 @@ export class PortfolioService { .map((timelineItem) => ({ date: timelineItem.date, marketPrice: timelineItem.value, - value: timelineItem.grossPerformance.toNumber() + value: timelineItem.netPerformance.toNumber() })); }