From e17b217032cf07938d14306854c32abe22fa748f Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 17 Aug 2021 21:31:32 +0200
Subject: [PATCH] Bugfix/fix issue on buy date in position detail dialog (#297)

* Fix issue on buy date

* Update changelog
---
 CHANGELOG.md                                    | 1 +
 apps/api/src/app/portfolio/portfolio.service.ts | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b372d3c7..4fb619d47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed the node engine version mismatch in `package.json`
+- Fixed an issue on the buy date in the position detail dialog
 
 ## 1.39.0 - 16.08.2021
 
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,