Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/rename SymbolProfile to assetProfile in portfolio order interface (#7310)
Thomas Kaul3fdf9d7e3485
diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.tsindex ab3f76703c..e73e222ac9 100644--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts@@ -141,9 +141,9 @@ export abstract class PortfolioCalculator {}return {- SymbolProfile,tags,type,+ assetProfile: SymbolProfile,date: format(date, DATE_FORMAT),fee: new Big(feeInAssetProfileCurrency),feeInBaseCurrency: new Big(feeInBaseCurrency),@@ -934,23 +934,23 @@ export abstract class PortfolioCalculator {let lastTransactionPoint: TransactionPoint = null;for (const {+ assetProfile,date,fee,feeInBaseCurrency,quantity,- SymbolProfile,tags,type,unitPrice} of this.activities) {let currentTransactionPointItem: TransactionPointSymbol;- const assetSubClass = SymbolProfile.assetSubClass;- const currency = SymbolProfile.currency;- const dataSource = SymbolProfile.dataSource;+ const assetSubClass = assetProfile.assetSubClass;+ const currency = assetProfile.currency;+ const dataSource = assetProfile.dataSource;const factor = getFactor(type);- const skipErrors = !!SymbolProfile.userId; // Skip errors for custom asset profiles- const symbol = SymbolProfile.symbol;+ const skipErrors = !!assetProfile.userId; // Skip errors for custom asset profiles+ const symbol = assetProfile.symbol;const oldAccumulatedSymbol = symbols[symbol];@@ -1034,12 +1034,12 @@ export abstract class PortfolioCalculator {'id');- symbols[SymbolProfile.symbol] = currentTransactionPointItem;+ symbols[symbol] = currentTransactionPointItem;const items = lastTransactionPoint?.items ?? [];const newItems = items.filter(({ symbol }) => {- return symbol !== SymbolProfile.symbol;+ return symbol !== assetProfile.symbol;});newItems.push(currentTransactionPointItem);diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.tsindex d5efc4bf24..f79e5bc796 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts@@ -192,12 +192,12 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {// Clone orders to keep the original values in this.orderslet orders: PortfolioOrderItem[] = cloneDeep(- this.activities.filter(({ SymbolProfile }) => {- return SymbolProfile.symbol === symbol;+ this.activities.filter(({ assetProfile }) => {+ return assetProfile.symbol === symbol;}));- const isCash = orders[0]?.SymbolProfile?.assetSubClass === 'CASH';+ const isCash = orders[0]?.assetProfile?.assetSubClass === 'CASH';if (orders.length <= 0) {return {@@ -299,32 +299,30 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {};}+ const assetProfile: PortfolioOrderItem['assetProfile'] = {+ dataSource,+ symbol,+ assetSubClass: isCash ? 'CASH' : undefined+ };+// Add a synthetic order at the start and the end dateorders.push({+ assetProfile,date: startDateString,fee: new Big(0),feeInBaseCurrency: new Big(0),itemType: 'start',quantity: new Big(0),- SymbolProfile: {- dataSource,- symbol,- assetSubClass: isCash ? 'CASH' : undefined- },type: 'BUY',unitPrice: unitPriceAtStartDate});orders.push({+ assetProfile,date: endDateString,fee: new Big(0),feeInBaseCurrency: new Big(0),itemType: 'end',- SymbolProfile: {- dataSource,- symbol,- assetSubClass: isCash ? 'CASH' : undefined- },quantity: new Big(0),type: 'BUY',unitPrice: unitPriceAtEndDate@@ -357,15 +355,11 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {}} else {orders.push({+ assetProfile,date: dateString,fee: new Big(0),feeInBaseCurrency: new Big(0),quantity: new Big(0),- SymbolProfile: {- dataSource,- symbol,- assetSubClass: isCash ? 'CASH' : undefined- },type: 'BUY',unitPrice: marketSymbolMap[dateString]?.[symbol] ?? lastUnitPrice,unitPriceFromMarketData:diff --git a/apps/api/src/app/portfolio/interfaces/portfolio-order.interface.ts b/apps/api/src/app/portfolio/interfaces/portfolio-order.interface.tsindex 2dbd68f12a..8d90c5bc6d 100644--- a/apps/api/src/app/portfolio/interfaces/portfolio-order.interface.ts+++ b/apps/api/src/app/portfolio/interfaces/portfolio-order.interface.ts@@ -1,13 +1,13 @@import { Activity } from '@ghostfolio/common/interfaces';export interface PortfolioOrder extends Pick<Activity, 'tags' | 'type'> {+ assetProfile: Pick<+ Activity['SymbolProfile'],+ 'assetSubClass' | 'currency' | 'dataSource' | 'name' | 'symbol' | 'userId'+ >;date: string;fee: Big;feeInBaseCurrency: Big;quantity: Big;- SymbolProfile: Pick<- Activity['SymbolProfile'],- 'assetSubClass' | 'currency' | 'dataSource' | 'name' | 'symbol' | 'userId'- >;unitPrice: Big;}