|
|
|
@ -41,6 +41,7 @@ import { |
|
|
|
HistoricalDataItem, |
|
|
|
InvestmentItem, |
|
|
|
PortfolioDetails, |
|
|
|
PortfolioHoldingResponse, |
|
|
|
PortfolioInvestments, |
|
|
|
PortfolioPerformanceResponse, |
|
|
|
PortfolioPosition, |
|
|
|
@ -87,7 +88,6 @@ import { isEmpty } from 'lodash'; |
|
|
|
|
|
|
|
import { PortfolioCalculator } from './calculator/portfolio-calculator'; |
|
|
|
import { PortfolioCalculatorFactory } from './calculator/portfolio-calculator.factory'; |
|
|
|
import { PortfolioHoldingDetail } from './interfaces/portfolio-holding-detail.interface'; |
|
|
|
import { RulesService } from './rules.service'; |
|
|
|
|
|
|
|
const asiaPacificMarkets = require('../../assets/countries/asia-pacific-markets.json'); |
|
|
|
@ -631,11 +631,11 @@ export class PortfolioService { |
|
|
|
}; |
|
|
|
} |
|
|
|
|
|
|
|
public async getPosition( |
|
|
|
public async getHolding( |
|
|
|
aDataSource: DataSource, |
|
|
|
aImpersonationId: string, |
|
|
|
aSymbol: string |
|
|
|
): Promise<PortfolioHoldingDetail> { |
|
|
|
): Promise<PortfolioHoldingResponse> { |
|
|
|
const userId = await this.getUserId(aImpersonationId, this.request.user.id); |
|
|
|
const user = await this.userService.user({ id: userId }); |
|
|
|
const userCurrency = this.getUserCurrency(user); |
|
|
|
@ -648,6 +648,7 @@ export class PortfolioService { |
|
|
|
|
|
|
|
if (activities.length === 0) { |
|
|
|
return { |
|
|
|
activities: [], |
|
|
|
averagePrice: undefined, |
|
|
|
dataProviderInfo: undefined, |
|
|
|
dividendInBaseCurrency: undefined, |
|
|
|
@ -662,13 +663,12 @@ export class PortfolioService { |
|
|
|
historicalData: [], |
|
|
|
investment: undefined, |
|
|
|
marketPrice: undefined, |
|
|
|
maxPrice: undefined, |
|
|
|
minPrice: undefined, |
|
|
|
marketPriceMax: undefined, |
|
|
|
marketPriceMin: undefined, |
|
|
|
netPerformance: undefined, |
|
|
|
netPerformancePercent: undefined, |
|
|
|
netPerformancePercentWithCurrencyEffect: undefined, |
|
|
|
netPerformanceWithCurrencyEffect: undefined, |
|
|
|
orders: [], |
|
|
|
quantity: undefined, |
|
|
|
SymbolProfile: undefined, |
|
|
|
tags: [], |
|
|
|
@ -714,7 +714,7 @@ export class PortfolioService { |
|
|
|
transactionCount |
|
|
|
} = position; |
|
|
|
|
|
|
|
const activitiesOfPosition = activities.filter(({ SymbolProfile }) => { |
|
|
|
const activitiesOfHolding = activities.filter(({ SymbolProfile }) => { |
|
|
|
return ( |
|
|
|
SymbolProfile.dataSource === dataSource && |
|
|
|
SymbolProfile.symbol === symbol |
|
|
|
@ -748,12 +748,12 @@ export class PortfolioService { |
|
|
|
); |
|
|
|
|
|
|
|
const historicalDataArray: HistoricalDataItem[] = []; |
|
|
|
let maxPrice = Math.max( |
|
|
|
activitiesOfPosition[0].unitPriceInAssetProfileCurrency, |
|
|
|
let marketPriceMax = Math.max( |
|
|
|
activitiesOfHolding[0].unitPriceInAssetProfileCurrency, |
|
|
|
marketPrice |
|
|
|
); |
|
|
|
let minPrice = Math.min( |
|
|
|
activitiesOfPosition[0].unitPriceInAssetProfileCurrency, |
|
|
|
let marketPriceMin = Math.min( |
|
|
|
activitiesOfHolding[0].unitPriceInAssetProfileCurrency, |
|
|
|
marketPrice |
|
|
|
); |
|
|
|
|
|
|
|
@ -793,27 +793,31 @@ export class PortfolioService { |
|
|
|
quantity: currentQuantity |
|
|
|
}); |
|
|
|
|
|
|
|
maxPrice = Math.max(marketPrice ?? 0, maxPrice); |
|
|
|
minPrice = Math.min(marketPrice ?? Number.MAX_SAFE_INTEGER, minPrice); |
|
|
|
marketPriceMax = Math.max(marketPrice ?? 0, marketPriceMax); |
|
|
|
marketPriceMin = Math.min( |
|
|
|
marketPrice ?? Number.MAX_SAFE_INTEGER, |
|
|
|
marketPriceMin |
|
|
|
); |
|
|
|
} |
|
|
|
} else { |
|
|
|
// Add historical entry for buy date, if no historical data available
|
|
|
|
historicalDataArray.push({ |
|
|
|
averagePrice: activitiesOfPosition[0].unitPriceInAssetProfileCurrency, |
|
|
|
averagePrice: activitiesOfHolding[0].unitPriceInAssetProfileCurrency, |
|
|
|
date: firstBuyDate, |
|
|
|
marketPrice: activitiesOfPosition[0].unitPriceInAssetProfileCurrency, |
|
|
|
quantity: activitiesOfPosition[0].quantity |
|
|
|
marketPrice: activitiesOfHolding[0].unitPriceInAssetProfileCurrency, |
|
|
|
quantity: activitiesOfHolding[0].quantity |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
return { |
|
|
|
firstBuyDate, |
|
|
|
marketPrice, |
|
|
|
maxPrice, |
|
|
|
minPrice, |
|
|
|
marketPriceMax, |
|
|
|
marketPriceMin, |
|
|
|
SymbolProfile, |
|
|
|
tags, |
|
|
|
transactionCount, |
|
|
|
activities: activitiesOfHolding, |
|
|
|
averagePrice: averagePrice.toNumber(), |
|
|
|
dataProviderInfo: portfolioCalculator.getDataProviderInfos()?.[0], |
|
|
|
dividendInBaseCurrency: dividendInBaseCurrency.toNumber(), |
|
|
|
@ -842,7 +846,6 @@ export class PortfolioService { |
|
|
|
]?.toNumber(), |
|
|
|
netPerformanceWithCurrencyEffect: |
|
|
|
position.netPerformanceWithCurrencyEffectMap?.['max']?.toNumber(), |
|
|
|
orders: activitiesOfPosition, |
|
|
|
quantity: quantity.toNumber(), |
|
|
|
value: this.exchangeRateDataService.toCurrency( |
|
|
|
quantity.mul(marketPrice ?? 0).toNumber(), |
|
|
|
@ -881,8 +884,8 @@ export class PortfolioService { |
|
|
|
} |
|
|
|
|
|
|
|
const historicalDataArray: HistoricalDataItem[] = []; |
|
|
|
let maxPrice = marketPrice; |
|
|
|
let minPrice = marketPrice; |
|
|
|
let marketPriceMax = marketPrice; |
|
|
|
let marketPriceMin = marketPrice; |
|
|
|
|
|
|
|
for (const [date, { marketPrice }] of Object.entries( |
|
|
|
historicalData[aSymbol] |
|
|
|
@ -892,15 +895,19 @@ export class PortfolioService { |
|
|
|
value: marketPrice |
|
|
|
}); |
|
|
|
|
|
|
|
maxPrice = Math.max(marketPrice ?? 0, maxPrice); |
|
|
|
minPrice = Math.min(marketPrice ?? Number.MAX_SAFE_INTEGER, minPrice); |
|
|
|
marketPriceMax = Math.max(marketPrice ?? 0, marketPriceMax); |
|
|
|
marketPriceMin = Math.min( |
|
|
|
marketPrice ?? Number.MAX_SAFE_INTEGER, |
|
|
|
marketPriceMin |
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
return { |
|
|
|
marketPrice, |
|
|
|
maxPrice, |
|
|
|
minPrice, |
|
|
|
marketPriceMax, |
|
|
|
marketPriceMin, |
|
|
|
SymbolProfile, |
|
|
|
activities: [], |
|
|
|
averagePrice: 0, |
|
|
|
dataProviderInfo: undefined, |
|
|
|
dividendInBaseCurrency: 0, |
|
|
|
@ -918,7 +925,6 @@ export class PortfolioService { |
|
|
|
netPerformancePercent: undefined, |
|
|
|
netPerformancePercentWithCurrencyEffect: undefined, |
|
|
|
netPerformanceWithCurrencyEffect: undefined, |
|
|
|
orders: [], |
|
|
|
quantity: 0, |
|
|
|
tags: [], |
|
|
|
transactionCount: undefined, |
|
|
|
@ -927,7 +933,7 @@ export class PortfolioService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public async getPositions({ |
|
|
|
public async getHoldings({ |
|
|
|
dateRange = 'max', |
|
|
|
filters, |
|
|
|
impersonationId |
|
|
|
|
Thomas Kaul
4 months ago
GitHub