Reordering

apps/api/src/app/order/interfaces/activities.interface.ts

@@ -12,12 +12,12 @@ export interface Activity extends Order {
   Account?: AccountWithPlatform;
   error?: ActivityError;
   feeInAssetProfileCurrency: number;
+  feeInBaseCurrency: number;
   SymbolProfile?: EnhancedSymbolProfile;
   tags?: Tag[];
   unitPriceInAssetProfileCurrency: number;
   updateAccountBalance?: boolean;
   value: number;
-  feeInBaseCurrency: number;
   valueInBaseCurrency: number;
 }
 

apps/api/src/app/order/order.service.ts

@@ -565,12 +565,12 @@ export class OrderService {
 
         return {
           ...order,
-          value,
           feeInAssetProfileCurrency,
-          SymbolProfile: assetProfile,
-          unitPriceInAssetProfileCurrency,
           feeInBaseCurrency,
-          valueInBaseCurrency
+          unitPriceInAssetProfileCurrency,
+          value,
+          valueInBaseCurrency,
+          SymbolProfile: assetProfile
         };
       })
     );

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

@@ -8,6 +8,7 @@ export const activityDummyData = {
   currency: undefined,
   fee: undefined,
   feeInAssetProfileCurrency: undefined,
+  feeInBaseCurrency: undefined,
   id: undefined,
   isDraft: false,
   symbolProfileId: undefined,

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts

@@ -103,8 +103,8 @@ describe('PortfolioCalculator', () => {
           ...activityDummyData,
           date: new Date('2023-01-03'),
           feeInAssetProfileCurrency: 1,
-          quantity: 1,
           feeInBaseCurrency: 0.9238,
+          quantity: 1,
           SymbolProfile: {
             ...symbolProfileDummyData,
             currency: 'USD',