Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/add asset and asset sub class to search endpoint (#1795)
Thomas Kaulbd1963ec267e
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex aeb850b8ff..43ecb21374 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Added+- Added the asset and asset sub class to the search functionality- Added the subscription expiration date to the users table of the admin control panel### Changeddiff --git a/apps/api/src/app/symbol/interfaces/lookup-item.interface.ts b/apps/api/src/app/symbol/interfaces/lookup-item.interface.tsindex cf45f4c7e1..e9c90b0bce 100644--- a/apps/api/src/app/symbol/interfaces/lookup-item.interface.ts+++ b/apps/api/src/app/symbol/interfaces/lookup-item.interface.ts@@ -1,6 +1,8 @@-import { DataSource } from '@prisma/client';+import { AssetClass, AssetSubClass, DataSource } from '@prisma/client';export interface LookupItem {+ assetClass: AssetClass;+ assetSubClass: AssetSubClass;currency: string;dataSource: DataSource;name: string;diff --git a/apps/api/src/services/data-provider/coingecko/coingecko.service.ts b/apps/api/src/services/data-provider/coingecko/coingecko.service.tsindex 28fe7a0cf8..70fa6f0393 100644--- a/apps/api/src/services/data-provider/coingecko/coingecko.service.ts+++ b/apps/api/src/services/data-provider/coingecko/coingecko.service.ts@@ -176,6 +176,8 @@ export class CoinGeckoService implements DataProviderInterface {return {name,symbol,+ assetClass: AssetClass.CASH,+ assetSubClass: AssetSubClass.CRYPTOCURRENCY,currency: this.baseCurrency,dataSource: this.getName()};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 e2d1efd95a..73f16872c0 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@@ -171,9 +171,25 @@ export class EodHistoricalDataService implements DataProviderInterface {.filter(({ symbol }) => {return !symbol.toLowerCase().endsWith('forex');})- .map(({ currency, dataSource, name, symbol }) => {- return { currency, dataSource, name, symbol };- })+ .map(+ ({+ assetClass,+ assetSubClass,+ currency,+ dataSource,+ name,+ symbol+ }) => {+ return {+ assetClass,+ assetSubClass,+ currency,+ dataSource,+ name,+ symbol+ };+ }+ )};}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 201d57aa4a..65de9d28ca 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@@ -145,6 +145,8 @@ export class GoogleSheetsService implements DataProviderInterface {public async search(aQuery: string): Promise<{ items: LookupItem[] }> {const items = await this.prismaService.symbolProfile.findMany({select: {+ assetClass: true,+ assetSubClass: true,currency: true,dataSource: true,name: true,diff --git a/apps/api/src/services/data-provider/manual/manual.service.ts b/apps/api/src/services/data-provider/manual/manual.service.tsindex 876910f964..324fa7aa72 100644--- a/apps/api/src/services/data-provider/manual/manual.service.ts+++ b/apps/api/src/services/data-provider/manual/manual.service.ts@@ -165,6 +165,8 @@ export class ManualService implements DataProviderInterface {public async search(aQuery: string): Promise<{ items: LookupItem[] }> {let items = await this.prismaService.symbolProfile.findMany({select: {+ assetClass: true,+ assetSubClass: true,currency: true,dataSource: true,name: true,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 20895340e2..6a8349f895 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@@ -101,9 +101,10 @@ export class YahooFinanceService implements DataProviderInterface {modules: ['price', 'summaryProfile', 'topHoldings']});- const { assetClass, assetSubClass } = this.parseAssetClass(- assetProfile.price- );+ const { assetClass, assetSubClass } = this.parseAssetClass({+ quoteType: assetProfile.price.quoteType,+ shortName: assetProfile.price.shortName+ });response.assetClass = assetClass;response.assetSubClass = assetSubClass;@@ -408,7 +409,14 @@ export class YahooFinanceService implements DataProviderInterface {marketDataItem.symbol);+ const { assetClass, assetSubClass } = this.parseAssetClass({+ quoteType: quote.quoteType,+ shortName: quote.shortname+ });+items.push({+ assetClass,+ assetSubClass,symbol,currency: marketDataItem.currency,dataSource: this.getName(),@@ -484,14 +492,20 @@ export class YahooFinanceService implements DataProviderInterface {return value;}- private parseAssetClass(aPrice: Price): {+ private parseAssetClass({+ quoteType,+ shortName+ }: {+ quoteType: string;+ shortName: string;+ }): {assetClass: AssetClass;assetSubClass: AssetSubClass;} {let assetClass: AssetClass;let assetSubClass: AssetSubClass;- switch (aPrice?.quoteType?.toLowerCase()) {+ switch (quoteType?.toLowerCase()) {case 'cryptocurrency':assetClass = AssetClass.CASH;assetSubClass = AssetSubClass.CRYPTOCURRENCY;@@ -509,10 +523,10 @@ export class YahooFinanceService implements DataProviderInterface {assetSubClass = AssetSubClass.COMMODITY;if (- aPrice?.shortName?.toLowerCase()?.startsWith('gold') ||- aPrice?.shortName?.toLowerCase()?.startsWith('palladium') ||- aPrice?.shortName?.toLowerCase()?.startsWith('platinum') ||- aPrice?.shortName?.toLowerCase()?.startsWith('silver')+ shortName?.toLowerCase()?.startsWith('gold') ||+ shortName?.toLowerCase()?.startsWith('palladium') ||+ shortName?.toLowerCase()?.startsWith('platinum') ||+ shortName?.toLowerCase()?.startsWith('silver')) {assetSubClass = AssetSubClass.PRECIOUS_METAL;}