sudacode/ghostfolio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Refactor item type (#3119)

Browse Source
This commit is contained in:
Thomas Kaul 2024-03-09 12:32:56 +01:00 committed by GitHub
parent bc8d8309d4
commit b642ce08e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/api/src/app/portfolio/interfaces/portfolio-calculator.interface.ts
View File

@ -5,7 +5,7 @@ import { PortfolioOrder } from './portfolio-order.interface';
export interface PortfolioOrderItem extends PortfolioOrder { export interface PortfolioOrderItem extends PortfolioOrder {
feeInBaseCurrency?: Big; feeInBaseCurrency?: Big;
feeInBaseCurrencyWithCurrencyEffect?: Big; feeInBaseCurrencyWithCurrencyEffect?: Big;
itemType?: '' | 'start' | 'end'; itemType?: 'end' | 'start';
unitPriceInBaseCurrency?: Big; unitPriceInBaseCurrency?: Big;
unitPriceInBaseCurrencyWithCurrencyEffect?: Big; unitPriceInBaseCurrencyWithCurrencyEffect?: Big;
} }

22
apps/api/src/app/portfolio/portfolio-calculator.ts
View File

@ -1049,28 +1049,26 @@ export class PortfolioCalculator {
} }
} }
// Sort orders so that the start and end placeholder order are at the right // Sort orders so that the start and end placeholder order are at the correct
// position // position
orders = sortBy(orders, (order) => { orders = sortBy(orders, ({ date, itemType }) => {
let sortIndex = new Date(order.date); let sortIndex = new Date(date);
if (order.itemType === 'start') { if (itemType === 'end') {
sortIndex = addMilliseconds(sortIndex, -1);
}
if (order.itemType === 'end') {
sortIndex = addMilliseconds(sortIndex, 1); sortIndex = addMilliseconds(sortIndex, 1);
} else if (itemType === 'start') {
sortIndex = addMilliseconds(sortIndex, -1);
} }
return sortIndex.getTime(); return sortIndex.getTime();
}); });
const indexOfStartOrder = orders.findIndex((order) => { const indexOfStartOrder = orders.findIndex(({ itemType }) => {
return order.itemType === 'start'; return itemType === 'start';
}); });
const indexOfEndOrder = orders.findIndex((order) => { const indexOfEndOrder = orders.findIndex(({ itemType }) => {
return order.itemType === 'end'; return itemType === 'end';
}); });
let totalInvestmentDays = 0; let totalInvestmentDays = 0;