Fix portfolio calculation for holdings with same symbol

apps/api/src/app/endpoints/public/public.service.ts

@@ -162,33 +162,32 @@ export class PublicService {
       })
     ).toNumber();
 
-    for (const portfolioPosition of holdings) {
+    for (const holding of holdings) {
       publicPortfolioResponse.holdings.push({
-        allocationInPercentage:
+        allocationInPercentage: holding.valueInBaseCurrency / totalValue,
-          portfolioPosition.valueInBaseCurrency / totalValue,
         assetProfile: {
-          ...portfolioPosition.assetProfile,
+          ...holding.assetProfile,
           assetClass:
             hasDetails ||
-            portfolioPosition.assetProfile.assetClass === AssetClass.LIQUIDITY
+            holding.assetProfile.assetClass === AssetClass.LIQUIDITY
-              ? portfolioPosition.assetProfile.assetClass
+              ? holding.assetProfile.assetClass
               : undefined,
           assetClassLabel:
             hasDetails ||
-            portfolioPosition.assetProfile.assetClass === AssetClass.LIQUIDITY
+            holding.assetProfile.assetClass === AssetClass.LIQUIDITY
-              ? portfolioPosition.assetProfile.assetClassLabel
+              ? holding.assetProfile.assetClassLabel
               : undefined,
           assetSubClass:
             hasDetails ||
-            portfolioPosition.assetProfile.assetSubClass === AssetSubClass.CASH
+            holding.assetProfile.assetSubClass === AssetSubClass.CASH
-              ? portfolioPosition.assetProfile.assetSubClass
+              ? holding.assetProfile.assetSubClass
               : undefined,
           assetSubClassLabel:
             hasDetails ||
-            portfolioPosition.assetProfile.assetSubClass === AssetSubClass.CASH
+            holding.assetProfile.assetSubClass === AssetSubClass.CASH
-              ? portfolioPosition.assetProfile.assetSubClassLabel
+              ? holding.assetProfile.assetSubClassLabel
               : undefined,
-          holdings: portfolioPosition.assetProfile.holdings?.map(
+          holdings: holding.assetProfile.holdings?.map(
             ({ allocationInPercentage, name }) => {
               return { allocationInPercentage, name };
             }
@@ -202,11 +201,11 @@ export class PublicService {
                 sectors: []
               })
         },
-        dateOfFirstActivity: portfolioPosition.dateOfFirstActivity,
+        dateOfFirstActivity: holding.dateOfFirstActivity,
-        markets: hasDetails ? portfolioPosition.markets : undefined,
+        markets: hasDetails ? holding.markets : undefined,
         netPerformancePercentWithCurrencyEffect:
-          portfolioPosition.netPerformancePercentWithCurrencyEffect,
+          holding.netPerformancePercentWithCurrencyEffect,
-        valueInPercentage: portfolioPosition.valueInBaseCurrency / totalValue
+        valueInPercentage: holding.valueInBaseCurrency / totalValue
       });
     }
 

apps/api/src/app/portfolio/portfolio.controller.ts

@@ -148,11 +148,9 @@ export class PortfolioController {
           return a + b;
         }, 0);
 
-      for (const portfolioPosition of holdings) {
+      for (const holding of holdings) {
-        portfolioPosition.investment =
+        holding.investment = holding.investment / totalInvestment;
-          portfolioPosition.investment / totalInvestment;
+        holding.valueInPercentage = holding.valueInBaseCurrency / totalValue;
-        portfolioPosition.valueInPercentage =
-          portfolioPosition.valueInBaseCurrency / totalValue;
       }
 
       for (const [name, { valueInBaseCurrency }] of Object.entries(accounts)) {