From 374a4455adaf8efdc698713cbfa1dc2fe9899f12 Mon Sep 17 00:00:00 2001
From: yksolanki9 <yashsolanki1709@gmail.com>
Date: Wed, 4 Jan 2023 17:51:45 +0530
Subject: [PATCH] Resolve comments

---
 apps/api/src/app/portfolio/portfolio.service.ts     | 13 ++++++++-----
 .../portfolio/analysis/analysis-page.component.ts   |  8 ++++----
 .../app/pages/portfolio/analysis/analysis-page.html |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 26c087d1d..e328e2302 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -236,7 +236,7 @@ export class PortfolioService {
     });
 
     if (groupBy) {
-      dividends = this.getDividendsByGroup(dividends, groupBy);
+      dividends = this.getDividendsByGroup({ aDividends: dividends, groupBy });
     }
 
     const startDate = this.getStartDate(
@@ -1269,10 +1269,13 @@ export class PortfolioService {
       );
   }
 
-  private getDividendsByGroup(
-    aDividends: InvestmentItem[],
-    groupBy: GroupBy
-  ): InvestmentItem[] {
+  private getDividendsByGroup({
+    aDividends,
+    groupBy
+  }: {
+    aDividends: InvestmentItem[];
+    groupBy: GroupBy;
+  }): InvestmentItem[] {
     if (aDividends.length === 0) {
       return [];
     }
diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
index 53b93246c..c1294bda7 100644
--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
@@ -39,14 +39,14 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
   public dateRangeOptions = ToggleComponent.DEFAULT_DATE_RANGE_OPTIONS;
   public daysInMarket: number;
   public deviceType: string;
-  public dividendsByMonth: InvestmentItem[];
+  public dividendsByGroup: InvestmentItem[];
   public dividendTimelineDataLabel = $localize`Dividend`;
   public filters$ = new Subject<Filter[]>();
   public firstOrderDate: Date;
   public hasImpersonationId: boolean;
   public investments: InvestmentItem[];
   public investmentTimelineDataLabel = $localize`Deposit`;
-  public investmentsByMonth: InvestmentItem[];
+  public investmentsByGroup: InvestmentItem[];
   public isLoadingBenchmarkComparator: boolean;
   public isLoadingInvestmentChart: boolean;
   public mode: GroupBy = 'month';
@@ -219,7 +219,7 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
       })
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(({ dividends }) => {
-        this.dividendsByMonth = dividends;
+        this.dividendsByGroup = dividends;
 
         this.changeDetectorRef.markForCheck();
       });
@@ -232,7 +232,7 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
       })
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(({ investments }) => {
-        this.investmentsByMonth = investments;
+        this.investmentsByGroup = investments;
 
         this.changeDetectorRef.markForCheck();
       });
diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
index 7c80842c6..b830727fa 100644
--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
@@ -181,7 +181,7 @@
         <gf-investment-chart
           class="h-100"
           groupBy="month"
-          [benchmarkDataItems]="investmentsByMonth"
+          [benchmarkDataItems]="investmentsByGroup"
           [benchmarkDataLabel]="investmentTimelineDataLabel"
           [currency]="user?.settings?.baseCurrency"
           [daysInMarket]="daysInMarket"
@@ -218,7 +218,7 @@
         <gf-investment-chart
           class="h-100"
           groupBy="month"
-          [benchmarkDataItems]="dividendsByMonth"
+          [benchmarkDataItems]="dividendsByGroup"
           [benchmarkDataLabel]="dividendTimelineDataLabel"
           [currency]="user?.settings?.baseCurrency"
           [daysInMarket]="daysInMarket"