Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/added ability to add asset profile in admin control panel (#2075)
Arghya Ghoshd0a4f5c0001e
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 92cd4366b6..7c2e2e7cfe 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Added- Added an icon to the external links in the footer navigation+- Added the ability to add an asset profile in the admin control panel### Changeddiff --git a/apps/api/src/app/admin/admin.controller.ts b/apps/api/src/app/admin/admin.controller.tsindex 3898a8876f..6512384ba5 100644--- a/apps/api/src/app/admin/admin.controller.ts+++ b/apps/api/src/app/admin/admin.controller.ts@@ -1,3 +1,4 @@+import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';import { PropertyDto } from '@ghostfolio/api/services/property/property.dto';@@ -26,11 +27,12 @@ import {Post,Put,Query,- UseGuards+ UseGuards,+ UseInterceptors} from '@nestjs/common';import { REQUEST } from '@nestjs/core';import { AuthGuard } from '@nestjs/passport';-import { DataSource, MarketData } from '@prisma/client';+import { DataSource, MarketData, SymbolProfile } from '@prisma/client';import { isDate } from 'date-fns';import { StatusCodes, getReasonPhrase } from 'http-status-codes';@@ -328,6 +330,28 @@ export class AdminController {});}+ @Post('profile-data/:dataSource/:symbol')+ @UseGuards(AuthGuard('jwt'))+ @UseInterceptors(TransformDataSourceInRequestInterceptor)+ public async addProfileData(+ @Param('dataSource') dataSource: DataSource,+ @Param('symbol') symbol: string+ ): Promise<SymbolProfile | never> {+ if (+ !hasPermission(+ this.request.user.permissions,+ permissions.accessAdminControl+ )+ ) {+ throw new HttpException(+ getReasonPhrase(StatusCodes.FORBIDDEN),+ StatusCodes.FORBIDDEN+ );+ }++ return this.adminService.addAssetProfile({ dataSource, symbol });+ }+@Delete('profile-data/:dataSource/:symbol')@UseGuards(AuthGuard('jwt'))public async deleteProfileData(diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.tsindex db334344d2..9a6f1bf173 100644--- a/apps/api/src/app/admin/admin.service.ts+++ b/apps/api/src/app/admin/admin.service.ts@@ -1,5 +1,6 @@import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.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';@@ -14,8 +15,8 @@ import {Filter,UniqueAsset} from '@ghostfolio/common/interfaces';-import { Injectable } from '@nestjs/common';-import { AssetSubClass, Prisma, Property } from '@prisma/client';+import { BadRequestException, Injectable } from '@nestjs/common';+import { AssetSubClass, Prisma, Property, SymbolProfile } from '@prisma/client';import { differenceInDays } from 'date-fns';import { groupBy } from 'lodash';@@ -25,6 +26,7 @@ export class AdminService {public constructor(private readonly configurationService: ConfigurationService,+ private readonly dataProviderService: DataProviderService,private readonly exchangeRateDataService: ExchangeRateDataService,private readonly marketDataService: MarketDataService,private readonly prismaService: PrismaService,@@ -35,6 +37,38 @@ export class AdminService {this.baseCurrency = this.configurationService.get('BASE_CURRENCY');}+ public async addAssetProfile({+ dataSource,+ symbol+ }: UniqueAsset): Promise<SymbolProfile | never> {+ try {+ const assetProfiles = await this.dataProviderService.getAssetProfiles([+ { dataSource, symbol }+ ]);++ if (!assetProfiles[symbol]?.currency) {+ throw new BadRequestException(+ `Asset profile not found for ${symbol} (${dataSource})`+ );+ }++ return await this.symbolProfileService.add(+ assetProfiles[symbol] as Prisma.SymbolProfileCreateInput+ );+ } catch (error) {+ if (+ error instanceof Prisma.PrismaClientKnownRequestError &&+ error.code === 'P2002'+ ) {+ throw new BadRequestException(+ `Asset profile of ${symbol} (${dataSource}) already exists`+ );+ }++ throw error;+ }+ }+public async deleteProfileData({ dataSource, symbol }: UniqueAsset) {await this.marketDataService.deleteMany({ dataSource, symbol });await this.symbolProfileService.delete({ dataSource, symbol });diff --git a/apps/api/src/services/symbol-profile/symbol-profile.service.ts b/apps/api/src/services/symbol-profile/symbol-profile.service.tsindex a27a0645d5..2f90771bd4 100644--- a/apps/api/src/services/symbol-profile/symbol-profile.service.ts+++ b/apps/api/src/services/symbol-profile/symbol-profile.service.ts@@ -15,6 +15,12 @@ import { continents, countries } from 'countries-list';export class SymbolProfileService {public constructor(private readonly prismaService: PrismaService) {}+ public async add(+ assetProfile: Prisma.SymbolProfileCreateInput+ ): Promise<SymbolProfile | never> {+ return this.prismaService.symbolProfile.create({ data: assetProfile });+ }+public async delete({ dataSource, symbol }: UniqueAsset) {return this.prismaService.symbolProfile.delete({where: { dataSource_symbol: { dataSource, symbol } }diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.component.tsindex a457035626..6ce2acd1f0 100644--- a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts@@ -24,6 +24,8 @@ import { distinctUntilChanged, switchMap, takeUntil } from 'rxjs/operators';import { AssetProfileDialog } from './asset-profile-dialog/asset-profile-dialog.component';import { AssetProfileDialogParams } from './asset-profile-dialog/interfaces/interfaces';+import { CreateAssetProfileDialog } from './create-asset-profile-dialog/create-asset-profile-dialog.component';+import { CreateAssetProfileDialogParams } from './create-asset-profile-dialog/interfaces/interfaces';@Component({changeDetection: ChangeDetectionStrategy.OnPush,@@ -99,6 +101,8 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {dataSource: params['dataSource'],symbol: params['symbol']});+ } else if (params['createAssetProfileDialog']) {+ this.openCreateAssetProfileDialog();}});@@ -241,4 +245,52 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {});});}++ private openCreateAssetProfileDialog() {+ this.userService+ .get()+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe((user) => {+ this.user = user;++ const dialogRef = this.dialog.open(CreateAssetProfileDialog, {+ autoFocus: false,+ data: <CreateAssetProfileDialogParams>{+ deviceType: this.deviceType,+ locale: this.user?.settings?.locale+ },+ width: this.deviceType === 'mobile' ? '100vw' : '50rem'+ });++ dialogRef+ .afterClosed()+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe(({ dataSource, symbol }) => {+ if (dataSource && symbol) {+ this.adminService+ .addAssetProfile({ dataSource, symbol })+ .pipe(+ switchMap(() => {+ this.isLoading = true;+ this.changeDetectorRef.markForCheck();++ return this.dataService.fetchAdminMarketData({+ filters: this.activeFilters+ });+ }),+ takeUntil(this.unsubscribeSubject)+ )+ .subscribe(({ marketData }) => {+ this.dataSource = new MatTableDataSource(marketData);+ this.dataSource.sort = this.sort;+ this.isLoading = false;++ this.changeDetectorRef.markForCheck();+ });+ }++ this.router.navigate(['.'], { relativeTo: this.route });+ });+ });+ }}diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.html b/apps/client/src/app/components/admin-market-data/admin-market-data.htmlindex ec13a8cf80..728d32e8c2 100644--- a/apps/client/src/app/components/admin-market-data/admin-market-data.html+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.html@@ -164,4 +164,16 @@</table></div></div>++ <div class="fab-container">+ <a+ class="align-items-center d-flex justify-content-center"+ color="primary"+ mat-fab+ [queryParams]="{ createAssetProfileDialog: true }"+ [routerLink]="[]"+ >+ <ion-icon name="add-outline" size="large"></ion-icon>+ </a>+ </div></div>diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.module.tsindex 6991a24552..ffb3d4ee26 100644--- a/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts@@ -4,10 +4,12 @@ import { MatButtonModule } from '@angular/material/button';import { MatMenuModule } from '@angular/material/menu';import { MatSortModule } from '@angular/material/sort';import { MatTableModule } from '@angular/material/table';+import { RouterModule } from '@angular/router';import { GfActivitiesFilterModule } from '@ghostfolio/ui/activities-filter/activities-filter.module';import { AdminMarketDataComponent } from './admin-market-data.component';import { GfAssetProfileDialogModule } from './asset-profile-dialog/asset-profile-dialog.module';+import { GfCreateAssetProfileDialogModule } from './create-asset-profile-dialog/create-asset-profile-dialog.module';@NgModule({declarations: [AdminMarketDataComponent],@@ -15,10 +17,12 @@ import { GfAssetProfileDialogModule } from './asset-profile-dialog/asset-profileCommonModule,GfActivitiesFilterModule,GfAssetProfileDialogModule,+ GfCreateAssetProfileDialogModule,MatButtonModule,MatMenuModule,MatSortModule,- MatTableModule+ MatTableModule,+ RouterModule],schemas: [CUSTOM_ELEMENTS_SCHEMA]})diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.scss b/apps/client/src/app/components/admin-market-data/admin-market-data.scssindex b5b58f67e4..50901445bf 100644--- a/apps/client/src/app/components/admin-market-data/admin-market-data.scss+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.scss@@ -2,4 +2,11 @@:host {display: block;++ .fab-container {+ bottom: 2rem;+ position: fixed;+ right: 2rem;+ z-index: 999;+ }}diff --git a/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.tsnew file mode 100644index 0000000000..c3c2fb2eb0--- /dev/null+++ b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts@@ -0,0 +1,53 @@+import {+ ChangeDetectionStrategy,+ ChangeDetectorRef,+ Component,+ Inject,+ OnDestroy,+ OnInit+} from '@angular/core';+import {+ FormBuilder,+ FormControl,+ FormGroup,+ Validators+} from '@angular/forms';+import { MatDialogRef } from '@angular/material/dialog';+import { AdminService } from '@ghostfolio/client/services/admin.service';++@Component({+ changeDetection: ChangeDetectionStrategy.OnPush,+ host: { class: 'h-100' },+ selector: 'gf-create-asset-profile-dialog',+ templateUrl: 'create-asset-profile-dialog.html'+})+export class CreateAssetProfileDialog implements OnInit, OnDestroy {+ public createAssetProfileForm: FormGroup;++ public constructor(+ public readonly adminService: AdminService,+ public readonly changeDetectorRef: ChangeDetectorRef,+ public readonly dialogRef: MatDialogRef<CreateAssetProfileDialog>,+ public readonly formBuilder: FormBuilder+ ) {}++ public ngOnInit() {+ this.createAssetProfileForm = this.formBuilder.group({+ searchSymbol: new FormControl(null, [Validators.required])+ });+ }++ public onCancel() {+ this.dialogRef.close();+ }++ public onSubmit() {+ this.dialogRef.close({+ dataSource:+ this.createAssetProfileForm.controls['searchSymbol'].value.dataSource,+ symbol: this.createAssetProfileForm.controls['searchSymbol'].value.symbol+ });+ }++ public ngOnDestroy() {}+}diff --git a/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.htmlnew file mode 100644index 0000000000..16e67bd515--- /dev/null+++ b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html@@ -0,0 +1,25 @@+<form+ class="d-flex flex-column h-100"+ [formGroup]="createAssetProfileForm"+ (keyup.enter)="createAssetProfileForm.valid && onSubmit()"+ (ngSubmit)="onSubmit()"+>+ <h1 i18n mat-dialog-title>Create Asset Profile</h1>+ <div class="flex-grow-1 py-3" mat-dialog-content>+ <mat-form-field appearance="outline" class="w-100">+ <mat-label i18n>Name, symbol or ISIN</mat-label>+ <gf-symbol-autocomplete formControlName="searchSymbol" />+ </mat-form-field>+ </div>+ <div class="d-flex justify-content-end" mat-dialog-actions>+ <button i18n mat-button type="button" (click)="onCancel()">Cancel</button>+ <button+ color="primary"+ mat-flat-button+ type="submit"+ [disabled]="!createAssetProfileForm.valid"+ >+ <ng-container i18n>Create</ng-container>+ </button>+ </div>+</form>diff --git a/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.module.ts b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.module.tsnew file mode 100644index 0000000000..e99d8f7880--- /dev/null+++ b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.module.ts@@ -0,0 +1,24 @@+import { CommonModule } from '@angular/common';+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';+import { FormsModule, ReactiveFormsModule } from '@angular/forms';+import { MatButtonModule } from '@angular/material/button';+import { MatDialogModule } from '@angular/material/dialog';+import { MatFormFieldModule } from '@angular/material/form-field';+import { GfSymbolAutocompleteModule } from '@ghostfolio/ui/symbol-autocomplete';++import { CreateAssetProfileDialog } from './create-asset-profile-dialog.component';++@NgModule({+ declarations: [CreateAssetProfileDialog],+ imports: [+ CommonModule,+ FormsModule,+ GfSymbolAutocompleteModule,+ MatDialogModule,+ MatButtonModule,+ MatFormFieldModule,+ ReactiveFormsModule+ ],+ schemas: [CUSTOM_ELEMENTS_SCHEMA]+})+export class GfCreateAssetProfileDialogModule {}diff --git a/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/interfaces/interfaces.ts b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/interfaces/interfaces.tsnew file mode 100644index 0000000000..16be906c99--- /dev/null+++ b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/interfaces/interfaces.ts@@ -0,0 +1,4 @@+export interface CreateAssetProfileDialogParams {+ deviceType: string;+ locale: string;+}diff --git a/apps/client/src/app/services/admin.service.ts b/apps/client/src/app/services/admin.service.tsindex 7d26668e8f..8b126898fd 100644--- a/apps/client/src/app/services/admin.service.ts+++ b/apps/client/src/app/services/admin.service.ts@@ -23,6 +23,13 @@ import { Observable, map } from 'rxjs';export class AdminService {public constructor(private http: HttpClient) {}+ public addAssetProfile({ dataSource, symbol }: UniqueAsset) {+ return this.http.post<void>(+ `/api/v1/admin/profile-data/${dataSource}/${symbol}`,+ null+ );+ }+public deleteJob(aId: string) {return this.http.delete<void>(`/api/v1/admin/queue/job/${aId}`);}