Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/prevent deletion of asset profiles in use (#6942)
Thomas Kaul3da6380618c7
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex b9b9f118d9..897d56d29f 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0- Centralized the asset profile override logic for manual adjustments- Improved the styling in the user detail dialog of the admin control panel’s users section+- Prevented the deletion of asset profiles that are currently in use+- Ensured market data is correctly removed when an asset profile with no remaining activities is deleted- Refactored the backend logging to use the instance-based `Logger`- Improved the language localization for Ukrainian (`uk`)diff --git a/apps/api/src/app/activities/activities.module.ts b/apps/api/src/app/activities/activities.module.tsindex f4e592c3fc..661163ff17 100644--- a/apps/api/src/app/activities/activities.module.ts+++ b/apps/api/src/app/activities/activities.module.ts@@ -6,9 +6,11 @@ import { RedactValuesInResponseModule } from '@ghostfolio/api/interceptors/redacimport { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module';import { TransformDataSourceInResponseModule } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.module';import { ApiModule } from '@ghostfolio/api/services/api/api.module';+import { BenchmarkModule } from '@ghostfolio/api/services/benchmark/benchmark.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module';+import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { DataGatheringQueueModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module';import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';@@ -23,11 +25,13 @@ import { ActivitiesService } from './activities.service';exports: [ActivitiesService],imports: [ApiModule,+ BenchmarkModule,CacheModule,DataGatheringQueueModule,DataProviderModule,ExchangeRateDataModule,ImpersonationModule,+ MarketDataModule,PrismaModule,RedactValuesInResponseModule,RedisCacheModule,diff --git a/apps/api/src/app/activities/activities.service.ts b/apps/api/src/app/activities/activities.service.tsindex 821185e117..f57507e3d3 100644--- a/apps/api/src/app/activities/activities.service.ts+++ b/apps/api/src/app/activities/activities.service.ts@@ -4,8 +4,10 @@ import { CashDetails } from '@ghostfolio/api/app/account/interfaces/cash-detailsimport { AssetProfileChangedEvent } from '@ghostfolio/api/events/asset-profile-changed.event';import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';import { LogPerformance } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor';+import { BenchmarkService } from '@ghostfolio/api/services/benchmark/benchmark.service';import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';+import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { DataGatheringService } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.service';import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';@@ -16,7 +18,10 @@ import {ghostfolioPrefix,TAG_ID_EXCLUDE_FROM_ANALYSIS} from '@ghostfolio/common/config';-import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';+import {+ canDeleteAssetProfile,+ getAssetProfileIdentifier+} from '@ghostfolio/common/helper';import {ActivitiesResponse,Activity,@@ -48,10 +53,12 @@ export class ActivitiesService {public constructor(private readonly accountBalanceService: AccountBalanceService,private readonly accountService: AccountService,+ private readonly benchmarkService: BenchmarkService,private readonly dataGatheringService: DataGatheringService,private readonly dataProviderService: DataProviderService,private readonly eventEmitter: EventEmitter2,private readonly exchangeRateDataService: ExchangeRateDataService,+ private readonly marketDataService: MarketDataService,private readonly prismaService: PrismaService,private readonly symbolProfileService: SymbolProfileService) {}@@ -262,7 +269,26 @@ export class ActivitiesService {activity.symbolProfileId]);- if (symbolProfile.activitiesCount === 0) {+ const benchmarkAssetProfiles =+ await this.benchmarkService.getBenchmarkAssetProfiles();++ const isBenchmark = benchmarkAssetProfiles.some(({ id }) => {+ return id === symbolProfile.id;+ });++ if (+ canDeleteAssetProfile({+ isBenchmark,+ activitiesCount: symbolProfile.activitiesCount,+ symbol: symbolProfile.symbol,+ watchedByCount: symbolProfile.watchedByCount+ })+ ) {+ await this.marketDataService.deleteMany({+ dataSource: symbolProfile.dataSource,+ symbol: symbolProfile.symbol+ });+await this.symbolProfileService.deleteById(activity.symbolProfileId);}@@ -308,8 +334,31 @@ export class ActivitiesService {}));- for (const { activitiesCount, id } of symbolProfiles) {- if (activitiesCount === 0) {+ const benchmarkAssetProfiles =+ await this.benchmarkService.getBenchmarkAssetProfiles();++ for (const {+ activitiesCount,+ dataSource,+ id,+ symbol,+ watchedByCount+ } of symbolProfiles) {+ const isBenchmark = benchmarkAssetProfiles.some(+ (benchmarkAssetProfile) => {+ return benchmarkAssetProfile.id === id;+ }+ );++ if (+ canDeleteAssetProfile({+ activitiesCount,+ isBenchmark,+ symbol,+ watchedByCount+ })+ ) {+ await this.marketDataService.deleteMany({ dataSource, symbol });await this.symbolProfileService.deleteById(id);}}diff --git a/apps/api/src/app/admin/admin.controller.ts b/apps/api/src/app/admin/admin.controller.tsindex 97642feb5a..1a2c58d1c7 100644--- a/apps/api/src/app/admin/admin.controller.ts+++ b/apps/api/src/app/admin/admin.controller.ts@@ -2,9 +2,11 @@ import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decoratimport { 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 { ApiService } from '@ghostfolio/api/services/api/api.service';+import { BenchmarkService } from '@ghostfolio/api/services/benchmark/benchmark.service';import { ManualService } from '@ghostfolio/api/services/data-provider/manual/manual.service';import { DemoService } from '@ghostfolio/api/services/demo/demo.service';import { DataGatheringService } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.service';+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper';import {DATA_GATHERING_QUEUE_PRIORITY_HIGH,@@ -16,7 +18,10 @@ import {UpdateAssetProfileDto,UpdatePropertyDto} from '@ghostfolio/common/dtos';-import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';+import {+ canDeleteAssetProfile,+ getAssetProfileIdentifier+} from '@ghostfolio/common/helper';import {AdminData,AdminMarketData,@@ -63,10 +68,12 @@ export class AdminController {public constructor(private readonly adminService: AdminService,private readonly apiService: ApiService,+ private readonly benchmarkService: BenchmarkService,private readonly dataGatheringService: DataGatheringService,private readonly demoService: DemoService,private readonly manualService: ManualService,- @Inject(REQUEST) private readonly request: RequestWithUser+ @Inject(REQUEST) private readonly request: RequestWithUser,+ private readonly symbolProfileService: SymbolProfileService) {}@Get()@@ -290,6 +297,33 @@ export class AdminController {@Param('dataSource') dataSource: DataSource,@Param('symbol') symbol: string): Promise<void> {+ const [assetProfile] = await this.symbolProfileService.getSymbolProfiles([+ { dataSource, symbol }+ ]);++ if (assetProfile) {+ const benchmarkAssetProfiles =+ await this.benchmarkService.getBenchmarkAssetProfiles();++ const isBenchmark = benchmarkAssetProfiles.some(({ id }) => {+ return id === assetProfile.id;+ });++ if (+ !canDeleteAssetProfile({+ isBenchmark,+ activitiesCount: assetProfile.activitiesCount,+ symbol: assetProfile.symbol,+ watchedByCount: assetProfile.watchedByCount+ })+ ) {+ throw new HttpException(+ getReasonPhrase(StatusCodes.FORBIDDEN),+ StatusCodes.FORBIDDEN+ );+ }+ }+return this.adminService.deleteProfileData({ dataSource, symbol });}diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.tsindex 217a67c49a..2d85330a3c 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts@@ -116,10 +116,12 @@ describe('PortfolioCalculator', () => {accountBalanceService,accountService,null,+ null,dataProviderService,null,exchangeRateDataService,null,+ null,null);diff --git a/apps/api/src/app/portfolio/portfolio.service.spec.ts b/apps/api/src/app/portfolio/portfolio.service.spec.tsindex da846c45d9..2d73bce3df 100644--- a/apps/api/src/app/portfolio/portfolio.service.spec.ts+++ b/apps/api/src/app/portfolio/portfolio.service.spec.ts@@ -59,10 +59,12 @@ describe('PortfolioService', () => {null,accountService,null,+ null,dataProviderService,null,exchangeRateDataService,null,+ null,null);