From 5e9cecc6c14d6f137534935b45bd49e19b890888 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Wed, 28 Jul 2021 15:27:53 +0200
Subject: [PATCH] Refactoring

---
 apps/api/src/app/core/current-rate.service.ts | 20 +++++++++----------
 ...bject.ts => get-value-object.interface.ts} |  0
 ...arams.ts => get-value-params.interface.ts} |  0
 ...rams.ts => get-values-params.interface.ts} |  0
 .../src/app/core/portfolio-calculator.spec.ts |  8 +++-----
 apps/api/src/app/core/portfolio-calculator.ts |  2 +-
 6 files changed, 14 insertions(+), 16 deletions(-)
 rename apps/api/src/app/core/{get-value.object.ts => get-value-object.interface.ts} (100%)
 rename apps/api/src/app/core/{get-value.params.ts => get-value-params.interface.ts} (100%)
 rename apps/api/src/app/core/{get-values.params.ts => get-values-params.interface.ts} (100%)

diff --git a/apps/api/src/app/core/current-rate.service.ts b/apps/api/src/app/core/current-rate.service.ts
index 18e63305d..23996796e 100644
--- a/apps/api/src/app/core/current-rate.service.ts
+++ b/apps/api/src/app/core/current-rate.service.ts
@@ -1,6 +1,6 @@
-import { GetValueObject } from '@ghostfolio/api/app/core/get-value.object';
-import { GetValueParams } from '@ghostfolio/api/app/core/get-value.params';
-import { GetValuesParams } from '@ghostfolio/api/app/core/get-values.params';
+import { GetValueObject } from '@ghostfolio/api/app/core/get-value-object.interface';
+import { GetValueParams } from '@ghostfolio/api/app/core/get-value-params.interface';
+import { GetValuesParams } from '@ghostfolio/api/app/core/get-values-params.interface';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { resetHours } from '@ghostfolio/common/helper';
@@ -41,12 +41,12 @@ export class CurrentRateService {
     if (marketData) {
       return {
         date: marketData.date,
-        symbol: marketData.symbol,
         marketPrice: this.exchangeRateDataService.toCurrency(
           marketData.marketPrice,
           currency,
           userCurrency
-        )
+        ),
+        symbol: marketData.symbol
       };
     }
 
@@ -67,8 +67,8 @@ export class CurrentRateService {
     const promises: Promise<
       {
         date: Date;
-        symbol: string;
         marketPrice: number;
+        symbol: string;
       }[]
     >[] = [];
 
@@ -80,8 +80,8 @@ export class CurrentRateService {
           for (const symbol of symbols) {
             result.push({
               date: today,
-              symbol: symbol,
-              marketPrice: dataResultProvider?.[symbol]?.marketPrice ?? 0
+              marketPrice: dataResultProvider?.[symbol]?.marketPrice ?? 0,
+              symbol: symbol
             });
           }
           return result;
@@ -99,12 +99,12 @@ export class CurrentRateService {
           return data.map((marketDataItem) => {
             return {
               date: marketDataItem.date,
-              symbol: marketDataItem.symbol,
               marketPrice: this.exchangeRateDataService.toCurrency(
                 marketDataItem.marketPrice,
                 currencies[marketDataItem.symbol],
                 userCurrency
-              )
+              ),
+              symbol: marketDataItem.symbol
             };
           });
         })
diff --git a/apps/api/src/app/core/get-value.object.ts b/apps/api/src/app/core/get-value-object.interface.ts
similarity index 100%
rename from apps/api/src/app/core/get-value.object.ts
rename to apps/api/src/app/core/get-value-object.interface.ts
diff --git a/apps/api/src/app/core/get-value.params.ts b/apps/api/src/app/core/get-value-params.interface.ts
similarity index 100%
rename from apps/api/src/app/core/get-value.params.ts
rename to apps/api/src/app/core/get-value-params.interface.ts
diff --git a/apps/api/src/app/core/get-values.params.ts b/apps/api/src/app/core/get-values-params.interface.ts
similarity index 100%
rename from apps/api/src/app/core/get-values.params.ts
rename to apps/api/src/app/core/get-values-params.interface.ts
diff --git a/apps/api/src/app/core/portfolio-calculator.spec.ts b/apps/api/src/app/core/portfolio-calculator.spec.ts
index 21b772abb..9e0675fd9 100644
--- a/apps/api/src/app/core/portfolio-calculator.spec.ts
+++ b/apps/api/src/app/core/portfolio-calculator.spec.ts
@@ -1,8 +1,6 @@
-import {
-  CurrentRateService
-} from '@ghostfolio/api/app/core/current-rate.service';
-import { GetValueParams } from '@ghostfolio/api/app/core/get-value.params';
-import { GetValuesParams } from '@ghostfolio/api/app/core/get-values.params';
+import { CurrentRateService } from '@ghostfolio/api/app/core/current-rate.service';
+import { GetValueParams } from '@ghostfolio/api/app/core/get-value-params.interface';
+import { GetValuesParams } from '@ghostfolio/api/app/core/get-values-params.interface';
 import { PortfolioCalculator } from '@ghostfolio/api/app/core/portfolio-calculator';
 import { PortfolioOrder } from '@ghostfolio/api/app/core/portfolio-order';
 import { TimelinePeriod } from '@ghostfolio/api/app/core/timeline-period';
diff --git a/apps/api/src/app/core/portfolio-calculator.ts b/apps/api/src/app/core/portfolio-calculator.ts
index 48b11ccc8..d68bf4bfb 100644
--- a/apps/api/src/app/core/portfolio-calculator.ts
+++ b/apps/api/src/app/core/portfolio-calculator.ts
@@ -1,5 +1,5 @@
 import { CurrentRateService } from '@ghostfolio/api/app/core/current-rate.service';
-import { GetValueObject } from '@ghostfolio/api/app/core/get-value.object';
+import { GetValueObject } from '@ghostfolio/api/app/core/get-value-object.interface';
 import { PortfolioOrder } from '@ghostfolio/api/app/core/portfolio-order';
 import { TimelinePeriod } from '@ghostfolio/api/app/core/timeline-period';
 import {