Refactor item type

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?: 'between' | 'end' | 'start';
   unitPriceInBaseCurrency?: Big;
   unitPriceInBaseCurrencyWithCurrencyEffect?: Big;
 }

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

@@ -1040,28 +1040,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) => {
+    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);
+      } else if (itemType === 'start') {
+        sortIndex = addMilliseconds(sortIndex, -1);
       }
 
       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;