portfolioCalculator performance calculation redundant async removed

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

@@ -711,7 +711,7 @@ export abstract class PortfolioCalculator {
     return this.snapshot.totalLiabilitiesWithCurrencyEffect;
   }
 
-  public async getPerformance({ data }: { data: HistoricalDataItem[] }) {
+  public getPerformance({ data }: { data: HistoricalDataItem[] }) {
     const chart: HistoricalDataItem[] = [];
 
     let netPerformanceAtStartDate: number;
@@ -771,7 +771,7 @@ export abstract class PortfolioCalculator {
     return { chart };
   }
 
-  public async getPerformanceByGroup({
+  public getPerformanceByGroup({
     data,
     groupBy
   }: {
@@ -784,7 +784,7 @@ export abstract class PortfolioCalculator {
       const dataByYear = ldGroupBy(data, (item) => item.date.slice(0, 4));
 
       for (const year of Object.keys(dataByYear)) {
-        const { chart: yearChart } = await this.getPerformance({
+        const { chart: yearChart } = this.getPerformance({
           data: Object.values(dataByYear[year])
         });
 

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts

@@ -138,12 +138,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
-        {
+        data: portfolioSnapshot.historicalData,
-          data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
-          groupBy: 'year'
+      });
-        }
-      );
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('595.6'),

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts

@@ -154,12 +154,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
-        {
+        data: portfolioSnapshot.historicalData,
-          data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
-          groupBy: 'year'
+      });
-        }
-      );
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('0'),

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts

@@ -138,12 +138,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
-        {
+        data: portfolioSnapshot.historicalData,
-          data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
-          groupBy: 'year'
+      });
-        }
-      );
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('0'),

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts

@@ -128,12 +128,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
-        {
+        data: portfolioSnapshot.historicalData,
-          data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
-          groupBy: 'year'
+      });
-        }
-      );
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('297.8'),

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts

@@ -137,12 +137,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
-        {
+        data: portfolioSnapshot.historicalData,
-          data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
-          groupBy: 'year'
+      });
-        }
-      );
 
       expect(portfolioSnapshot.historicalData[0]).toEqual({
         date: '2021-12-11',

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts

@@ -151,12 +151,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
-        {
+        data: portfolioSnapshot.historicalData,
-          data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
-          groupBy: 'year'
+      });
-        }
-      );
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('13298.425356'),

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts

@@ -137,12 +137,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
-        {
+        data: portfolioSnapshot.historicalData,
-          data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
-          groupBy: 'year'
+      });
-        }
-      );
 
       expect(portfolioSnapshot.historicalData[0]).toEqual({
         date: '2021-12-11',

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts

@@ -134,12 +134,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
-        {
+        data: portfolioSnapshot.historicalData,
-          data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
-          groupBy: 'year'
+      });
-        }
-      );
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('103.10483'),

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-jnug-buy-and-sell-and-buy-and-sell.spec.ts

@@ -134,12 +134,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
-        {
+        data: portfolioSnapshot.historicalData,
-          data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
-          groupBy: 'year'
+      });
-        }
-      );
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('0'),

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.ts

@@ -98,12 +98,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
-        {
+        data: portfolioSnapshot.historicalData,
-          data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
-          groupBy: 'year'
+      });
-        }
-      );
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big(0),

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts

@@ -134,12 +134,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
-        {
+        data: portfolioSnapshot.historicalData,
-          data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
-          groupBy: 'year'
+      });
-        }
-      );
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('87.8'),

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

@@ -1055,18 +1055,19 @@ export class PortfolioService {
       return !isBefore(date, startDate) && !isAfter(date, endDate);
     });
 
-    const { chart: intervalChart } = await portfolioCalculator.getPerformance({
+    const { chart: intervalChart } = portfolioCalculator.getPerformance({
       data: items
     });
 
     let chart = intervalChart;
 
     if (groupBy) {
-      const { chart: groupedChart } =
+      const { chart: groupedChart } = portfolioCalculator.getPerformanceByGroup(
-        await portfolioCalculator.getPerformanceByGroup({
+        {
           data: items,
           groupBy
-        });
+        }
+      );
 
       chart = groupedChart;
     }