From 212aa6a63b8fecb4aa93788032ef7948dfe1a9d2 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 20 Apr 2024 09:51:12 +0200
Subject: [PATCH] Feature/add date range support to portfolio holdings page
 (#3303)

* Add date range support

* Update changelog
---
 CHANGELOG.md                                       |  4 ++++
 apps/api/src/app/portfolio/portfolio.controller.ts |  2 ++
 .../portfolio/holdings/holdings-page.component.ts  |  3 ++-
 apps/client/src/app/services/data.service.ts       | 14 +++++++++++---
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81a6da6d..c88ee481 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Added the date range support to the portfolio holdings page
+
 ### Changed
 
 - Removed the date range support in the activities table on the portfolio activities page (experimental)
diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts
index 56c0a231..81d0c3df 100644
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@@ -290,6 +290,7 @@ export class PortfolioController {
     @Query('assetClasses') filterByAssetClasses?: string,
     @Query('holdingType') filterByHoldingType?: string,
     @Query('query') filterBySearchQuery?: string,
+    @Query('range') dateRange: DateRange = 'max',
     @Query('tags') filterByTags?: string
   ): Promise<PortfolioHoldingsResponse> {
     const filters = this.apiService.buildFiltersFromQueryParams({
@@ -301,6 +302,7 @@ export class PortfolioController {
     });
 
     const { holdings } = await this.portfolioService.getDetails({
+      dateRange,
       filters,
       impersonationId,
       userId: this.request.user.id
diff --git a/apps/client/src/app/pages/portfolio/holdings/holdings-page.component.ts b/apps/client/src/app/pages/portfolio/holdings/holdings-page.component.ts
index 8834593e..107e8f30 100644
--- a/apps/client/src/app/pages/portfolio/holdings/holdings-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/holdings/holdings-page.component.ts
@@ -123,7 +123,8 @@ export class HoldingsPageComponent implements OnDestroy, OnInit {
     }
 
     return this.dataService.fetchPortfolioHoldings({
-      filters
+      filters,
+      range: this.user?.settings?.dateRange
     });
   }
 
diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts
index 8a3f7d29..a1d94c64 100644
--- a/apps/client/src/app/services/data.service.ts
+++ b/apps/client/src/app/services/data.service.ts
@@ -464,13 +464,21 @@ export class DataService {
   }
 
   public fetchPortfolioHoldings({
-    filters
+    filters,
+    range
   }: {
     filters?: Filter[];
-  } = {}) {
+    range?: DateRange;
+  }) {
+    let params = this.buildFiltersAsQueryParams({ filters });
+
+    if (range) {
+      params = params.append('range', range);
+    }
+
     return this.http
       .get<PortfolioHoldingsResponse>('/api/v1/portfolio/holdings', {
-        params: this.buildFiltersAsQueryParams({ filters })
+        params
       })
       .pipe(
         map((response) => {