Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Refactor item type (#3119)

Thomas Kaulb642ce08e573
diff --git a/apps/api/src/app/portfolio/interfaces/portfolio-calculator.interface.ts b/apps/api/src/app/portfolio/interfaces/portfolio-calculator.interface.ts
index 357b454fd8..c5266fb33e 100644
--- a/apps/api/src/app/portfolio/interfaces/portfolio-calculator.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/portfolio-calculator.interface.ts
@@ -5,7 +5,7 @@ import { PortfolioOrder } from './portfolio-order.interface';
export interface PortfolioOrderItem extends PortfolioOrder {
feeInBaseCurrency?: Big;
feeInBaseCurrencyWithCurrencyEffect?: Big;
- itemType?: '' | 'start' | 'end';
+ itemType?: 'end' | 'start';
unitPriceInBaseCurrency?: Big;
unitPriceInBaseCurrencyWithCurrencyEffect?: Big;
}
diff --git a/apps/api/src/app/portfolio/portfolio-calculator.ts b/apps/api/src/app/portfolio/portfolio-calculator.ts
index 07016efcfc..1521787e7d 100644
--- a/apps/api/src/app/portfolio/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator.ts
@@ -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
- orders = sortBy(orders, (order) => {
- let sortIndex = new Date(order.date);
+ orders = sortBy(orders, ({ date, itemType }) => {
+ let sortIndex = new Date(date);
- if (order.itemType === 'start') {
- sortIndex = addMilliseconds(sortIndex, -1);
- }
-
- if (order.itemType === 'end') {
+ if (itemType === 'end') {
sortIndex = addMilliseconds(sortIndex, 1);
+ } else if (itemType === 'start') {
+ sortIndex = addMilliseconds(sortIndex, -1);
}
return sortIndex.getTime();
});
- const indexOfStartOrder = orders.findIndex((order) => {
- return order.itemType === 'start';
+ const indexOfStartOrder = orders.findIndex(({ itemType }) => {
+ return itemType === 'start';
});
- const indexOfEndOrder = orders.findIndex((order) => {
- return order.itemType === 'end';
+ const indexOfEndOrder = orders.findIndex(({ itemType }) => {
+ return itemType === 'end';
});
let totalInvestmentDays = 0;