From d4199f99286e1c89a4125676131d47059f9ef5f8 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Mon, 16 Aug 2021 22:14:00 +0200
Subject: [PATCH] Fix issue on buy date

---
 apps/api/src/app/portfolio/portfolio.service.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index b21b1112a..f5d904e38 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -337,10 +337,10 @@ export class PortfolioService {
       );
 
       const historicalDataArray: HistoricalDataItem[] = [];
-      let maxPrice = orders[0].unitPrice;
-      let minPrice = orders[0].unitPrice;
+      let maxPrice = Math.max(orders[0].unitPrice, marketPrice);
+      let minPrice = Math.min(orders[0].unitPrice, marketPrice);
 
-      if (!historicalData[aSymbol][firstBuyDate]) {
+      if (!historicalData?.[aSymbol]?.[firstBuyDate]) {
         // Add historical entry for buy date, if no historical data available
         historicalDataArray.push({
           averagePrice: orders[0].unitPrice,