Browse Source

Fix format

pull/5027/head
Dan 2 years ago
parent
commit
caf1aa059a
  1. 21
      apps/api/src/app/portfolio/portfolio.service.ts
  2. 12
      apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts

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

@ -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;
} }
} }
} }

12
apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts

@ -53,9 +53,9 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
}, DEFAULT_REQUEST_TIMEOUT); }, DEFAULT_REQUEST_TIMEOUT);
return got( return got(
`${TrackinsightDataEnhancerService.baseUrl}/funds/${ `${TrackinsightDataEnhancerService.baseUrl}/funds/${symbol.split(
symbol.split('.')?.[0] '.'
}.json`, )?.[0]}.json`,
{ {
// @ts-ignore // @ts-ignore
signal: abortController.signal signal: abortController.signal
@ -95,9 +95,9 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
}, DEFAULT_REQUEST_TIMEOUT); }, DEFAULT_REQUEST_TIMEOUT);
return got( return got(
`${TrackinsightDataEnhancerService.baseUrl}/holdings/${ `${TrackinsightDataEnhancerService.baseUrl}/holdings/${symbol.split(
symbol.split('.')?.[0] '.'
}.json`, )?.[0]}.json`,
{ {
// @ts-ignore // @ts-ignore
signal: abortController.signal signal: abortController.signal

Loading…
Cancel
Save