diff --git a/apps/api/src/app/import/import.controller.ts b/apps/api/src/app/import/import.controller.ts index ea191345f..d04607de4 100644 --- a/apps/api/src/app/import/import.controller.ts +++ b/apps/api/src/app/import/import.controller.ts @@ -64,13 +64,10 @@ export class ImportController { maxActivitiesToImport = Number.MAX_SAFE_INTEGER; } - const userCurrency = this.request.user.Settings.settings.baseCurrency; - try { const activities = await this.importService.import({ isDryRun, maxActivitiesToImport, - userCurrency, accountsDto: importData.accounts ?? [], activitiesDto: importData.activities, user: this.request.user diff --git a/apps/api/src/app/import/import.service.ts b/apps/api/src/app/import/import.service.ts index d9f9dc23a..5416bffbd 100644 --- a/apps/api/src/app/import/import.service.ts +++ b/apps/api/src/app/import/import.service.ts @@ -139,17 +139,16 @@ export class ImportService { activitiesDto, isDryRun = false, maxActivitiesToImport, - userCurrency, user }: { accountsDto: Partial[]; activitiesDto: Partial[]; isDryRun?: boolean; maxActivitiesToImport: number; - userCurrency: string; user: UserWithSettings; }): Promise { const accountIdMapping: { [oldAccountId: string]: string } = {}; + const userCurrency = user.Settings.settings.baseCurrency; if (!isDryRun && accountsDto?.length) { const [existingAccounts, existingPlatforms] = await Promise.all([ @@ -406,9 +405,9 @@ export class ImportService { } } }, - userId: user.id, updateAccountBalance: false, - User: { connect: { id: user.id } } + User: { connect: { id: user.id } }, + userId: user.id }); } diff --git a/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts b/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts index 4ce7da1b0..6ab790159 100644 --- a/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts +++ b/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts @@ -36,12 +36,6 @@ export class AlphaVantageService implements DataProviderInterface { return !!this.configurationService.get('ALPHA_VANTAGE_API_KEY'); } - public getDataProviderInfo(): DataProviderInfo { - return { - isPremium: false - }; - } - public async getAssetProfile( aSymbol: string ): Promise> { @@ -51,6 +45,12 @@ export class AlphaVantageService implements DataProviderInterface { }; } + public getDataProviderInfo(): DataProviderInfo { + return { + isPremium: false + }; + } + public async getDividends({}: GetDividendsParams) { return {}; } @@ -121,7 +121,7 @@ export class AlphaVantageService implements DataProviderInterface { return { items: result?.bestMatches?.map((bestMatch) => { - return { + return { assetClass: undefined, assetSubClass: undefined, currency: bestMatch['8. currency'],