Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/harmonize max activities to import in import controller (#6732)
Thomas Kaul8b77dd368a7a
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 2f70d91505..ef65db2b63 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -6044,10 +6044,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0- Removed the alias from the user interface as a preparation to remove it from the `User` database schema- Removed the activities import limit for users with a subscription-### Todo--- Rename the environment variable from `MAX_ORDERS_TO_IMPORT` to `MAX_ACTIVITIES_TO_IMPORT`-## 1.169.0 - 14.07.2022### Addeddiff --git a/apps/api/src/app/import/import.controller.ts b/apps/api/src/app/import/import.controller.tsindex d5724bef28..521be56f74 100644--- a/apps/api/src/app/import/import.controller.ts+++ b/apps/api/src/app/import/import.controller.ts@@ -3,6 +3,7 @@ import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard'import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor';import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';+import { SubscriptionType } from '@ghostfolio/common/enums';import { ImportResponse } from '@ghostfolio/common/interfaces';import { hasPermission, permissions } from '@ghostfolio/common/permissions';import type { RequestWithUser } from '@ghostfolio/common/types';@@ -62,7 +63,7 @@ export class ImportController {if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&- this.request.user.subscription.type === 'Premium'+ this.request.user.subscription.type === SubscriptionType.Premium) {maxActivitiesToImport = Number.MAX_SAFE_INTEGER;}@@ -100,6 +101,17 @@ export class ImportController {@Param('dataSource') dataSource: DataSource,@Param('symbol') symbol: string): Promise<ImportResponse> {+ let maxActivitiesToImport = this.configurationService.get(+ 'MAX_ACTIVITIES_TO_IMPORT'+ );++ if (+ this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&+ this.request.user.subscription.type === SubscriptionType.Premium+ ) {+ maxActivitiesToImport = Number.MAX_SAFE_INTEGER;+ }+const activities = await this.importService.getDividends({dataSource,symbol,@@ -107,6 +119,6 @@ export class ImportController {userId: this.request.user.id});- return { activities };+ return { activities: activities.slice(0, maxActivitiesToImport) };}}