From 228246d2fb03c93594b39ce775c53f8d2dff06f7 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Fri, 29 Mar 2024 20:06:23 +0100
Subject: [PATCH] Refactoring

---
 .../admin-market-data-detail.component.html   |  6 +---
 .../admin-market-data-detail.component.ts     | 30 ++++++++++++-------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.html b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.html
index f452dd1c9..00551bc99 100644
--- a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.html
+++ b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.html
@@ -9,11 +9,7 @@
     [showYAxis]="true"
     [symbol]="symbol"
   />
-  <div
-    *ngFor="let itemByMonth of marketDataByMonth | keyvalue"
-    class="d-flex"
-    [hidden]="!marketData.length > 0"
-  >
+  <div *ngFor="let itemByMonth of marketDataByMonth | keyvalue" class="d-flex">
     <div class="date px-1 text-nowrap">{{ itemByMonth.key }}</div>
     <div class="align-items-center d-flex flex-grow-1 px-1">
       <div
diff --git a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts
index 2b93eab70..03d2c858e 100644
--- a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts
+++ b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts
@@ -21,15 +21,15 @@ import {
   addDays,
   addMonths,
   format,
-  isAfter,
   isBefore,
   isSameDay,
   isToday,
   isValid,
+  min,
   parse,
   parseISO
 } from 'date-fns';
-import { last } from 'lodash';
+import { first, last } from 'lodash';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { Subject, takeUntil } from 'rxjs';
 
@@ -138,17 +138,25 @@ export class AdminMarketDataDetailComponent implements OnChanges, OnInit {
       };
     }
 
-    const dates = Object.keys(this.marketDataByMonth).sort();
-    const startDate = parseISO(dates[0]);
-    const endDate = parseISO(last(dates));
+    if (this.dateOfFirstActivity) {
+      // Fill up missing gaps
+      const dates = Object.keys(this.marketDataByMonth).sort();
+      const startDate = min([
+        parseISO(this.dateOfFirstActivity),
+        parseISO(first(dates))
+      ]);
+      const endDate = parseISO(last(dates));
+
+      let currentDate = startDate;
+
+      while (isBefore(currentDate, endDate)) {
+        const key = format(currentDate, 'yyyy-MM');
+        if (!this.marketDataByMonth[key]) {
+          this.marketDataByMonth[key] = {};
+        }
 
-    let currentDate = startDate;
-    while (!isAfter(currentDate, endDate)) {
-      const key = format(currentDate, 'yyyy-MM');
-      if (!this.marketDataByMonth[key]) {
-        this.marketDataByMonth[key] = {};
+        currentDate = addMonths(currentDate, 1);
       }
-      currentDate = addMonths(currentDate, 1);
     }
   }