Refactoring

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

@@ -1099,10 +1099,10 @@ export abstract class PortfolioCalculator {
 
     const newChartData: HistoricalDataItem[] = [];
 
-    let netPerformanceAtStartDate;
+    let netPerformanceAtStartDate: number;
-    let netPerformanceWithCurrencyEffectAtStartDate;
+    let netPerformanceWithCurrencyEffectAtStartDate: number;
-    let netPerformanceInPercentageWithCurrencyEffectAtStartDate;
+    let netPerformanceInPercentageWithCurrencyEffectAtStartDate: number;
-    let totalInvestmentValuesWithCurrencyEffect = [];
+    let totalInvestmentValuesWithCurrencyEffect: number[] = [];
 
     for (let historicalDataItem of chartData) {
       if (
@@ -1158,7 +1158,7 @@ export abstract class PortfolioCalculator {
       }
     }
 
-    return newChartData;
+    return { chart: newChartData };
   }
 
   public getStartDate() {

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

@@ -70,7 +70,7 @@ import {
   parseISO,
   set
 } from 'date-fns';
-import { isEmpty, isNumber, last, uniq, uniqBy } from 'lodash';
+import { isEmpty, isNumber, uniq, uniqBy } from 'lodash';
 
 import { PortfolioCalculator } from './calculator/portfolio-calculator';
 import {
@@ -1230,15 +1230,15 @@ export class PortfolioService {
 
     console.timeEnd('------ PortfolioService.getPerformance');
 
-    const newChartData = await portfolioCalculator.getPerformance({
+    const { chart } = await portfolioCalculator.getPerformance({
       end: endDate,
       start: startDate
     });
 
     return {
+      chart,
       errors,
       hasErrors,
-      chart: newChartData,
       firstOrderDate: parseDate(chartData[0]?.date),
       performance: {
         currentNetWorth,