Browse Source

Fix market price carry forward on dates with activities

pull/7702/head
Thomas Kaul 7 days ago
parent
commit
cf803a2331
  1. 12
      apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts

12
apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts

@ -391,16 +391,13 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
break; break;
} }
const unitPrice = marketSymbolMap[dateString]?.[symbol] ?? lastUnitPrice;
if (ordersByDate[dateString]?.length > 0) { if (ordersByDate[dateString]?.length > 0) {
for (const order of ordersByDate[dateString]) { for (const order of ordersByDate[dateString]) {
order.unitPriceFromMarketData = order.unitPriceFromMarketData = unitPrice;
marketSymbolMap[dateString]?.[symbol] ?? lastUnitPrice;
} }
} else { } else if (dateString >= dateStringOfFirstActivity) {
const unitPrice =
marketSymbolMap[dateString]?.[symbol] ?? lastUnitPrice;
if (dateString >= dateStringOfFirstActivity) {
orders.push({ orders.push({
assetProfile, assetProfile,
unitPrice, unitPrice,
@ -415,7 +412,6 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
lastUnitPrice = unitPrice; lastUnitPrice = unitPrice;
} }
}
// Sort orders so that the start and end placeholder order are at the correct // Sort orders so that the start and end placeholder order are at the correct
// position // position

Loading…
Cancel
Save