From 5870da32e1d3b39740a64e0868d4cdd996edbc30 Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Tue, 1 Aug 2023 08:56:59 +0200 Subject: [PATCH] Refactoring --- apps/api/src/app/import/import.service.ts | 63 ++++++++++++++--------- 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/apps/api/src/app/import/import.service.ts b/apps/api/src/app/import/import.service.ts index b3456c115..3d9c2999d 100644 --- a/apps/api/src/app/import/import.service.ts +++ b/apps/api/src/app/import/import.service.ts @@ -269,6 +269,23 @@ export class ImportService { dataSource: SymbolProfile.dataSource, symbol: SymbolProfile.symbol }; + const { + assetClass, + assetSubClass, + countries, + createdAt, + currency, + dataSource, + id, + isin, + name, + scraperConfiguration, + sectors, + symbol, + symbolMapping, + url, + updatedAt + } = assetProfile; const validatedAccount = accounts.find(({ id }) => { return id === accountId; }); @@ -294,22 +311,22 @@ export class ImportService { id: uuidv4(), isDraft: isAfter(date, endOfToday()), SymbolProfile: { - assetClass: assetProfile.assetClass, - assetSubClass: assetProfile.assetSubClass, - comment: assetProfile.comment, - countries: assetProfile.countries, - createdAt: assetProfile.createdAt, - currency: assetProfile.currency, - dataSource: assetProfile.dataSource, - id: assetProfile.id, - isin: assetProfile.isin, - name: assetProfile.name, - scraperConfiguration: assetProfile.scraperConfiguration, - sectors: assetProfile.sectors, - symbol: assetProfile.symbol, - symbolMapping: assetProfile.symbolMapping, - updatedAt: assetProfile.updatedAt, - url: assetProfile.url + assetClass, + assetSubClass, + countries, + createdAt, + currency, + dataSource, + id, + isin, + name, + scraperConfiguration, + sectors, + symbol, + symbolMapping, + updatedAt, + url, + comment: assetProfile.comment }, Account: validatedAccount, symbolProfileId: undefined, @@ -332,14 +349,14 @@ export class ImportService { SymbolProfile: { connectOrCreate: { create: { - currency: assetProfile.currency, - dataSource: assetProfile.dataSource, - symbol: assetProfile.symbol + currency, + dataSource, + symbol }, where: { dataSource_symbol: { - dataSource: assetProfile.dataSource, - symbol: assetProfile.symbol + dataSource, + symbol } } } @@ -357,14 +374,14 @@ export class ImportService { value, feeInBaseCurrency: this.exchangeRateDataService.toCurrency( fee, - assetProfile.currency, + currency, userCurrency ), //@ts-ignore SymbolProfile: assetProfile, valueInBaseCurrency: this.exchangeRateDataService.toCurrency( value, - assetProfile.currency, + currency, userCurrency ) });