From 18cee1ca30c35d0fe56f7c3a0099470f51742298 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 27 Dec 2022 09:50:43 +0100
Subject: [PATCH] Refactoring

---
 .../src/app/portfolio/portfolio.controller.ts | 39 +++++--------------
 .../src/app/portfolio/portfolio.service.ts    | 12 +++---
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts
index 49ba3c845..52bea14f4 100644
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@@ -18,7 +18,6 @@ import {
   PortfolioPublicDetails,
   PortfolioReport
 } from '@ghostfolio/common/interfaces';
-import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
 import type {
   DateRange,
   GroupBy,
@@ -193,20 +192,11 @@ export class PortfolioController {
     @Query('range') dateRange: DateRange = 'max',
     @Query('groupBy') groupBy?: GroupBy
   ): Promise<PortfolioDividends> {
-    let dividends: InvestmentItem[];
-
-    if (groupBy === 'month') {
-      dividends = await this.portfolioService.getDividends({
-        dateRange,
-        groupBy,
-        impersonationId
-      });
-    } else {
-      dividends = await this.portfolioService.getDividends({
-        dateRange,
-        impersonationId
-      });
-    }
+    let dividends = await this.portfolioService.getDividends({
+      dateRange,
+      groupBy,
+      impersonationId
+    });
 
     if (
       impersonationId ||
@@ -242,20 +232,11 @@ export class PortfolioController {
     @Query('range') dateRange: DateRange = 'max',
     @Query('groupBy') groupBy?: GroupBy
   ): Promise<PortfolioInvestments> {
-    let investments: InvestmentItem[];
-
-    if (groupBy === 'month') {
-      investments = await this.portfolioService.getInvestments({
-        dateRange,
-        groupBy,
-        impersonationId
-      });
-    } else {
-      investments = await this.portfolioService.getInvestments({
-        dateRange,
-        impersonationId
-      });
-    }
+    let investments = await this.portfolioService.getInvestments({
+      dateRange,
+      groupBy,
+      impersonationId
+    });
 
     if (
       impersonationId ||
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index a8c26afa4..1a99c1b5b 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -210,12 +210,12 @@ export class PortfolioService {
 
   public async getDividends({
     dateRange,
-    impersonationId,
-    groupBy
+    groupBy,
+    impersonationId
   }: {
     dateRange: DateRange;
-    impersonationId: string;
     groupBy?: GroupBy;
+    impersonationId: string;
   }): Promise<InvestmentItem[]> {
     const userId = await this.getUserId(impersonationId, this.request.user.id);
 
@@ -248,12 +248,12 @@ export class PortfolioService {
 
   public async getInvestments({
     dateRange,
-    impersonationId,
-    groupBy
+    groupBy,
+    impersonationId
   }: {
     dateRange: DateRange;
-    impersonationId: string;
     groupBy?: GroupBy;
+    impersonationId: string;
   }): Promise<InvestmentItem[]> {
     const userId = await this.getUserId(impersonationId, this.request.user.id);