Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/stock splits setup (part 2) (#7523)

Thomas Kaul75e3d032abd5
diff --git a/apps/api/src/app/endpoints/asset-profiles/asset-profiles.controller.ts b/apps/api/src/app/endpoints/asset-profiles/asset-profiles.controller.ts
index 6521665e1b..5ffb756a0d 100644
--- a/apps/api/src/app/endpoints/asset-profiles/asset-profiles.controller.ts
+++ b/apps/api/src/app/endpoints/asset-profiles/asset-profiles.controller.ts
@@ -142,6 +142,8 @@ export class AssetProfilesController {
});
return this.assetProfilesService.createSplit({
+ dataSource,
+ symbol,
symbolProfileId,
date: parseISO(data.date),
denominator: data.denominator,
diff --git a/apps/api/src/app/endpoints/asset-profiles/asset-profiles.module.ts b/apps/api/src/app/endpoints/asset-profiles/asset-profiles.module.ts
index e3906be9ff..9df342f5f6 100644
--- a/apps/api/src/app/endpoints/asset-profiles/asset-profiles.module.ts
+++ b/apps/api/src/app/endpoints/asset-profiles/asset-profiles.module.ts
@@ -8,6 +8,7 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-
import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.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';
import { Module } from '@nestjs/common';
@@ -23,6 +24,7 @@ import { AssetProfilesService } from './asset-profiles.service';
ApiModule,
AssetProfileSplitModule,
BenchmarkModule,
+ DataGatheringQueueModule,
DataProviderModule,
ExchangeRateDataModule,
MarketDataModule,
diff --git a/apps/api/src/app/endpoints/asset-profiles/asset-profiles.service.ts b/apps/api/src/app/endpoints/asset-profiles/asset-profiles.service.ts
index 7d75fc40bb..0d50e22233 100644
--- a/apps/api/src/app/endpoints/asset-profiles/asset-profiles.service.ts
+++ b/apps/api/src/app/endpoints/asset-profiles/asset-profiles.service.ts
@@ -5,6 +5,7 @@ import { DataProviderService } from '@ghostfolio/api/services/data-provider/data
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';
import { UpdateAssetProfileDataDto } from '@ghostfolio/common/dtos';
import {
@@ -33,6 +34,7 @@ export class AssetProfilesService {
private readonly activitiesService: ActivitiesService,
private readonly assetProfileSplitService: AssetProfileSplitService,
private readonly benchmarkService: BenchmarkService,
+ private readonly dataGatheringService: DataGatheringService,
private readonly dataProviderService: DataProviderService,
private readonly exchangeRateDataService: ExchangeRateDataService,
private readonly marketDataService: MarketDataService,
@@ -41,22 +43,28 @@ export class AssetProfilesService {
) {}
public async createSplit({
+ dataSource,
date,
denominator,
numerator,
+ symbol,
symbolProfileId
}: {
date: Date;
denominator: number;
numerator: number;
symbolProfileId: string;
- }) {
- return this.assetProfileSplitService.upsert({
+ } & AssetProfileIdentifier) {
+ const assetProfileSplit = await this.assetProfileSplitService.upsert({
date,
denominator,
numerator,
symbolProfileId
});
+
+ await this.dataGatheringService.gatherSymbol({ dataSource, symbol });
+
+ return assetProfileSplit;
}
public async deleteSplit({
diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
index f5df34ab47..f80cec842a 100644
--- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
@@ -514,10 +514,6 @@
<div class="container mt-3 p-0">
<div class="no-gutters row w-100">
<div class="col-12">
- <p class="text-muted" i18n>
- Splits are stored for this asset profile, but are not applied
- to the portfolio calculation yet.
- </p>
@if (splits.length > 0) {
<table class="gf-table mb-3 w-100">
<thead>
@@ -580,38 +576,33 @@
</mat-datepicker-toggle>
<mat-datepicker #dateOfSplit />
</mat-form-field>
- <mat-form-field appearance="outline" class="mb-3 w-100">
- <mat-label i18n>Shares After</mat-label>
- <input
- formControlName="numerator"
- matInput
- step="1"
- type="number"
- />
- <mat-hint
- ><ng-container i18n>Numerator</ng-container>,
- <ng-container i18n
- >e.g. 4 for a 4:1 split or 1 for a 1:10 reverse
- split</ng-container
- ></mat-hint
+ <div class="align-items-center d-flex mb-3">
+ <mat-form-field
+ appearance="outline"
+ class="w-100 without-hint"
>
- </mat-form-field>
- <mat-form-field appearance="outline" class="mb-3 w-100">
- <mat-label i18n>Shares Before</mat-label>
- <input
- formControlName="denominator"
- matInput
- step="1"
- type="number"
- />
- <mat-hint
- ><ng-container i18n>Denominator</ng-container>,
- <ng-container i18n
- >e.g. 1 for a 4:1 split or 10 for a 1:10 reverse
- split</ng-container
- ></mat-hint
+ <mat-label i18n>Shares After</mat-label>
+ <input
+ formControlName="numerator"
+ matInput
+ step="1"
+ type="number"
+ />
+ </mat-form-field>
+ <div class="mx-2">:</div>
+ <mat-form-field
+ appearance="outline"
+ class="w-100 without-hint"
>
- </mat-form-field>
+ <mat-label i18n>Shares Before</mat-label>
+ <input
+ formControlName="denominator"
+ matInput
+ step="1"
+ type="number"
+ />
+ </mat-form-field>
+ </div>
<div class="text-right">
<button
color="primary"