|
@ -465,9 +465,8 @@ export class PortfolioService { |
|
|
transactionPoints[0]?.date ?? format(new Date(), DATE_FORMAT) |
|
|
transactionPoints[0]?.date ?? format(new Date(), DATE_FORMAT) |
|
|
); |
|
|
); |
|
|
const startDate = this.getStartDate(dateRange, portfolioStart); |
|
|
const startDate = this.getStartDate(dateRange, portfolioStart); |
|
|
const currentPositions = await portfolioCalculator.getCurrentPositions( |
|
|
const currentPositions = |
|
|
startDate |
|
|
await portfolioCalculator.getCurrentPositions(startDate); |
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
const cashDetails = await this.accountService.getCashDetails({ |
|
|
const cashDetails = await this.accountService.getCashDetails({ |
|
|
filters, |
|
|
filters, |
|
@ -882,9 +881,8 @@ export class PortfolioService { |
|
|
const transactionPoints = portfolioCalculator.getTransactionPoints(); |
|
|
const transactionPoints = portfolioCalculator.getTransactionPoints(); |
|
|
|
|
|
|
|
|
const portfolioStart = parseDate(transactionPoints[0].date); |
|
|
const portfolioStart = parseDate(transactionPoints[0].date); |
|
|
const currentPositions = await portfolioCalculator.getCurrentPositions( |
|
|
const currentPositions = |
|
|
portfolioStart |
|
|
await portfolioCalculator.getCurrentPositions(portfolioStart); |
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
const position = currentPositions.positions.find( |
|
|
const position = currentPositions.positions.find( |
|
|
(item) => item.symbol === aSymbol |
|
|
(item) => item.symbol === aSymbol |
|
@ -1133,9 +1131,8 @@ export class PortfolioService { |
|
|
|
|
|
|
|
|
const portfolioStart = parseDate(transactionPoints[0].date); |
|
|
const portfolioStart = parseDate(transactionPoints[0].date); |
|
|
const startDate = this.getStartDate(dateRange, portfolioStart); |
|
|
const startDate = this.getStartDate(dateRange, portfolioStart); |
|
|
const currentPositions = await portfolioCalculator.getCurrentPositions( |
|
|
const currentPositions = |
|
|
startDate |
|
|
await portfolioCalculator.getCurrentPositions(startDate); |
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
let positions = currentPositions.positions.filter(({ quantity }) => { |
|
|
let positions = currentPositions.positions.filter(({ quantity }) => { |
|
|
return !quantity.eq(0); |
|
|
return !quantity.eq(0); |
|
@ -1333,9 +1330,8 @@ export class PortfolioService { |
|
|
const portfolioStart = parseDate( |
|
|
const portfolioStart = parseDate( |
|
|
transactionPoints[0]?.date ?? format(new Date(), DATE_FORMAT) |
|
|
transactionPoints[0]?.date ?? format(new Date(), DATE_FORMAT) |
|
|
); |
|
|
); |
|
|
const currentPositions = await portfolioCalculator.getCurrentPositions( |
|
|
const currentPositions = |
|
|
portfolioStart |
|
|
await portfolioCalculator.getCurrentPositions(portfolioStart); |
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
const positions = currentPositions.positions.filter( |
|
|
const positions = currentPositions.positions.filter( |
|
|
(item) => !item.quantity.eq(0) |
|
|
(item) => !item.quantity.eq(0) |
|
@ -1727,6 +1723,7 @@ export class PortfolioService { |
|
|
break; |
|
|
break; |
|
|
case 'INTEREST': |
|
|
case 'INTEREST': |
|
|
interest += amount; |
|
|
interest += amount; |
|
|
|
|
|
break; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|