From d44de35923c68dc2d01b2acb75dd5be43ba16c75 Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Wed, 8 Mar 2023 20:12:59 +0100 Subject: [PATCH] Refactoring --- apps/api/src/app/exchange-rate/exchange-rate.controller.ts | 6 +++--- apps/api/src/app/exchange-rate/exchange-rate.service.ts | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/apps/api/src/app/exchange-rate/exchange-rate.controller.ts b/apps/api/src/app/exchange-rate/exchange-rate.controller.ts index e888f8cfb..ca9b67ced 100644 --- a/apps/api/src/app/exchange-rate/exchange-rate.controller.ts +++ b/apps/api/src/app/exchange-rate/exchange-rate.controller.ts @@ -25,13 +25,13 @@ export class ExchangeRateController { ): Promise { const date = new Date(dateString); - const { marketPrice } = await this.exchangeRateService.getExchangeRate({ + const exchangeRate = await this.exchangeRateService.getExchangeRate({ date, symbol }); - if (marketPrice) { - return { marketPrice }; + if (exchangeRate) { + return { marketPrice: exchangeRate }; } throw new HttpException( diff --git a/apps/api/src/app/exchange-rate/exchange-rate.service.ts b/apps/api/src/app/exchange-rate/exchange-rate.service.ts index be7f3d55f..d340bb5b3 100644 --- a/apps/api/src/app/exchange-rate/exchange-rate.service.ts +++ b/apps/api/src/app/exchange-rate/exchange-rate.service.ts @@ -1,5 +1,4 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; -import { IDataProviderHistoricalResponse } from '@ghostfolio/api/services/interfaces/interfaces'; import { Injectable } from '@nestjs/common'; @Injectable() @@ -14,16 +13,14 @@ export class ExchangeRateService { }: { date: Date; symbol: string; - }): Promise { + }): Promise { const [currency1, currency2] = symbol.split('-'); - const marketPrice = await this.exchangeRateDataService.toCurrencyAtDate( + return this.exchangeRateDataService.toCurrencyAtDate( 1, currency1, currency2, date ); - - return { marketPrice }; } }