Browse Source

Fix Calculation

pull/5027/head
Dan 1 year ago
parent
commit
3be31da35f
  1. 4
      apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
  2. 2
      apps/api/src/app/portfolio/portfolio.service.ts

4
apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts

@ -339,7 +339,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
const datesWithOrders = {}; const datesWithOrders = {};
for (const { date, type } of orders) { for (const { date, type } of orders) {
if (['BUY', 'SELL'].includes(type)) { if (['BUY', 'SELL', 'STAKE'].includes(type)) {
datesWithOrders[date] = true; datesWithOrders[date] = true;
} }
} }
@ -459,7 +459,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
} }
if (order.type === 'STAKE') { if (order.type === 'STAKE') {
order.unitPrice = marketSymbolMap[order.date]?.[symbol]; order.unitPrice = marketSymbolMap[order.date]?.[symbol] ?? new Big(0);
} }
if (order.unitPrice) { if (order.unitPrice) {

2
apps/api/src/app/portfolio/portfolio.service.ts

@ -1817,7 +1817,7 @@ export class PortfolioService {
cashDetailsWithExcludedAccounts.balanceInBaseCurrency cashDetailsWithExcludedAccounts.balanceInBaseCurrency
).minus(balanceInBaseCurrency); ).minus(balanceInBaseCurrency);
excludedAccountsAndActivities = excludedBalanceInBaseCurrency let excludedAccountsAndActivities = excludedBalanceInBaseCurrency
.plus(totalOfExcludedActivities) .plus(totalOfExcludedActivities)
.toNumber(); .toNumber();

Loading…
Cancel
Save