From 8e4ee7feea02a0ef528b76767ec86ac931645484 Mon Sep 17 00:00:00 2001
From: Valentin Zickner <valentin.zickner@flowable.com>
Date: Sun, 11 Jul 2021 20:59:23 +0200
Subject: [PATCH] optimize order loading

---
 .../src/app/portfolio/portfolio.controller.ts |  1 +
 .../src/app/portfolio/portfolio.service.ts    | 66 +++++++------------
 2 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts
index 96ac407fc..c70befe45 100644
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@@ -90,6 +90,7 @@ export class PortfolioController {
     @Query('range') range,
     @Res() res: Response
   ): Promise<HistoricalDataItem[]> {
+    console.log(`------- ${range} ------`);
     console.time('get-chart-request');
     console.time('portfolio-service-get-chart');
     let chartData = await this.portfolioService.getChart(
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index fcabfa326..82a6208df 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -51,6 +51,7 @@ import {
   HistoricalDataItem,
   PortfolioPositionDetail
 } from './interfaces/portfolio-position-detail.interface';
+import { OrderType } from '@ghostfolio/api/models/order-type';
 
 @Injectable()
 export class PortfolioService {
@@ -91,14 +92,7 @@ export class PortfolioService {
       ).createFromData({ orders, portfolioItems, user });
     } else {
       // Get portfolio from database
-      const orders = await this.orderService.orders({
-        include: {
-          Account: true,
-          SymbolProfile: true
-        },
-        orderBy: { date: 'asc' },
-        where: { userId: aUserId }
-      });
+      const orders = await this.getOrders(aUserId);
 
       portfolio = new Portfolio(
         this.accountService,
@@ -160,50 +154,27 @@ export class PortfolioService {
     console.timeEnd('impersonation-service');
 
     console.time('create-portfolio');
-    const portfolio = await this.createPortfolio(
-      impersonationUserId || this.request.user.id
-    );
+    const userId = impersonationUserId || this.request.user.id;
+    const orders = await this.getOrders(userId);
     console.timeEnd('create-portfolio');
 
-    const orders = portfolio.getOrders();
     if (orders.length <= 0) {
       return [];
     }
 
-    const dateRangeDate = this.convertDateRangeToDate(
-      aDateRange,
-      portfolio.getMinDate()
-    );
-
     const portfolioCalculator = new PortfolioCalculator(
       this.currentRateService,
       this.request.user.Settings.currency
     );
 
-    const portfolioOrders: PortfolioOrder[] = orders
-      .filter((portfolioItem) => {
-        if (isAfter(parseISO(portfolioItem.getDate()), endOfToday())) {
-          // Filter out future dates
-          return false;
-        }
-
-        if (dateRangeDate === undefined) {
-          return true;
-        }
-
-        return (
-          isSameDay(parseISO(portfolioItem.getDate()), dateRangeDate) ||
-          isAfter(parseISO(portfolioItem.getDate()), dateRangeDate)
-        );
-      })
-      .map((order) => ({
-        date: order.getDate().substr(0, 10),
-        quantity: new Big(order.getQuantity()),
-        symbol: order.getSymbol(),
-        type: order.getType(),
-        unitPrice: new Big(order.getUnitPrice()),
-        currency: order.getCurrency()
-      }));
+    const portfolioOrders: PortfolioOrder[] = orders.map((order) => ({
+      date: format(order.date, 'yyyy-MM-dd'),
+      quantity: new Big(order.quantity),
+      symbol: order.symbol,
+      type: <OrderType>order.type,
+      unitPrice: new Big(order.unitPrice),
+      currency: order.currency
+    }));
     portfolioCalculator.computeTransactionPoints(portfolioOrders);
     const transactionPoints = portfolioCalculator.getTransactionPoints();
     if (transactionPoints.length === 0) {
@@ -505,4 +476,17 @@ export class PortfolioService {
         return undefined;
     }
   }
+
+  private getOrders(aUserId: string) {
+    return this.orderService.orders({
+      include: {
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        Account: true,
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        SymbolProfile: true
+      },
+      orderBy: { date: 'asc' },
+      where: { userId: aUserId }
+    });
+  }
 }