Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/add data provider info to asset profile details dialog (#3434)
Thomas Kaulc009f8c12f40
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 855ecaa059..274071d21e 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0## Unreleased+### Added++- Added the data provider information to the asset profile details dialog of the admin control+### Fixed- Fixed an issue with the initial annual interest rate in the _FIRE_ calculatordiff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.tsindex 7df4498d78..9e4b6a6c6a 100644--- a/apps/api/src/app/admin/admin.service.ts+++ b/apps/api/src/app/admin/admin.service.ts@@ -313,6 +313,12 @@ export class AdminService {})]);+ if (assetProfile) {+ assetProfile.dataProviderInfo = this.dataProviderService+ .getDataProvider(assetProfile.dataSource)+ .getDataProviderInfo();+ }+return {marketData,assetProfile: assetProfile ?? {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.tsindex 08dc48e57b..4e93bc7573 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@@ -50,7 +50,9 @@ export class AlphaVantageService implements DataProviderInterface {public getDataProviderInfo(): DataProviderInfo {return {- isPremium: false+ isPremium: false,+ name: 'Alpha Vantage',+ url: 'https://www.alphavantage.co'};}diff --git a/apps/api/src/services/data-provider/data-provider.service.ts b/apps/api/src/services/data-provider/data-provider.service.tsindex 26fc171b51..34067fa6f1 100644--- a/apps/api/src/services/data-provider/data-provider.service.ts+++ b/apps/api/src/services/data-provider/data-provider.service.ts@@ -598,10 +598,14 @@ export class DataProviderService {return name1?.toLowerCase().localeCompare(name2?.toLowerCase());}).map((lookupItem) => {- if (- !this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') ||- user.subscription.type === 'Premium'- ) {+ if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {+ if (user.subscription.type === 'Premium') {+ lookupItem.dataProviderInfo.isPremium = false;+ }++ lookupItem.dataProviderInfo.name = undefined;+ lookupItem.dataProviderInfo.url = undefined;+ } else {lookupItem.dataProviderInfo.isPremium = false;}diff --git a/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts b/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.tsindex 1b6abd585e..e16986cbbe 100644--- a/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts+++ b/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts@@ -66,7 +66,9 @@ export class EodHistoricalDataService implements DataProviderInterface {public getDataProviderInfo(): DataProviderInfo {return {- isPremium: true+ isPremium: true,+ name: 'EOD Historical Data',+ url: 'https://eodhd.com'};}diff --git a/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts b/apps/api/src/services/data-provider/google-sheets/google-sheets.service.tsindex 68e8bf7322..c8ff87719f 100644--- a/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts+++ b/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts@@ -46,7 +46,9 @@ export class GoogleSheetsService implements DataProviderInterface {public getDataProviderInfo(): DataProviderInfo {return {- isPremium: false+ isPremium: false,+ name: 'Google Sheets',+ url: 'https://docs.google.com/spreadsheets'};}diff --git a/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts b/apps/api/src/services/data-provider/rapid-api/rapid-api.service.tsindex e55fbd4e2c..7e866552ed 100644--- a/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts+++ b/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts@@ -43,7 +43,9 @@ export class RapidApiService implements DataProviderInterface {public getDataProviderInfo(): DataProviderInfo {return {- isPremium: false+ isPremium: false,+ name: 'Rapid API',+ url: 'https://rapidapi.com'};}diff --git a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.tsindex c55da2597a..e0d88f0c68 100644--- a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts+++ b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts@@ -43,7 +43,9 @@ export class YahooFinanceService implements DataProviderInterface {public getDataProviderInfo(): DataProviderInfo {return {- isPremium: false+ isPremium: false,+ name: 'Yahoo Finance',+ url: 'https://finance.yahoo.com'};}diff --git a/apps/api/src/services/symbol-profile/symbol-profile.service.ts b/apps/api/src/services/symbol-profile/symbol-profile.service.tsindex 915b2f7161..01901d4f30 100644--- a/apps/api/src/services/symbol-profile/symbol-profile.service.ts+++ b/apps/api/src/services/symbol-profile/symbol-profile.service.ts@@ -61,7 +61,9 @@ export class SymbolProfileService {})}})- .then((symbolProfiles) => this.getSymbols(symbolProfiles));+ .then((symbolProfiles) => {+ return this.enhanceSymbolProfiles(symbolProfiles);+ });}public async getSymbolProfilesByIds(@@ -83,7 +85,9 @@ export class SymbolProfileService {}}})- .then((symbolProfiles) => this.getSymbols(symbolProfiles));+ .then((symbolProfiles) => {+ return this.enhanceSymbolProfiles(symbolProfiles);+ });}public updateSymbolProfile({@@ -119,7 +123,7 @@ export class SymbolProfileService {});}- private getSymbols(+ private enhanceSymbolProfiles(symbolProfiles: (SymbolProfile & {_count: { Order: number };Order?: {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.htmlindex 4f01a933ee..487794f66a 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@@ -115,11 +115,22 @@>Symbol</gf-value></div>+ <div class="col-6 mb-3">+ <gf-value+ i18n+ size="medium"+ [value]="+ assetProfile?.dataProviderInfo?.name ?? assetProfile?.dataSource+ "+ >Data Source</gf-value+ >+ </div><div class="col-6 mb-3"><gf-value i18n size="medium" [value]="assetProfile?.currency">Currency</gf-value></div>+ <div class="col-6 mb-3"></div><div class="col-6 mb-3"><gf-valuei18ndiff --git a/libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.ts b/libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.tsindex e9fe2f6585..dfdd223c21 100644--- a/libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.ts+++ b/libs/common/src/lib/interfaces/enhanced-symbol-profile.interface.ts@@ -1,6 +1,7 @@import { AssetClass, AssetSubClass, DataSource } from '@prisma/client';import { Country } from './country.interface';+import { DataProviderInfo } from './data-provider-info.interface';import { ScraperConfiguration } from './scraper-configuration.interface';import { Sector } from './sector.interface';@@ -12,6 +13,7 @@ export interface EnhancedSymbolProfile {countries: Country[];createdAt: Date;currency?: string;+ dataProviderInfo?: DataProviderInfo;dataSource: DataSource;dateOfFirstActivity?: Date;id: string;