Fixed missing params in requests.

highcharts · Nov 28, 2024 · 991dd39 · 991dd39
1 parent 9d36132
commit 991dd39
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/demos/xray_wip/demo.js b/demos/xray_wip/demo.js
@@ -22,7 +22,9 @@ async function displaySecurityDetails (postmanJSON) {
                         id: 'F0GBR052QA',
                         idType: 'MSID',
                         type: 'FO',
-                        weight: '100'
+                        weight: '100',
+                        name: 'BlackRock Income and Growth Ord',
+                        holdingType: 'weight'
                     }
                 ]
             }

diff --git a/src/Shared/MorningstarOptions.ts b/src/Shared/MorningstarOptions.ts
@@ -210,6 +210,16 @@ interface MorningstarSecurityOptionsGeneric<IDType> {
      */
     type?: (string|MorningstarSecurityType);
 
+    /**
+     * Type of holding.
+     */
+    holdingType?: string;
+
+    /**
+     * Weight of holding.
+     */
+    weight?: (number|string);
+
 }
 
 

diff --git a/src/XRay/XRayConnector.ts b/src/XRay/XRayConnector.ts
@@ -47,7 +47,7 @@ interface XRayHoldingObject {
     amount?: string;
     identifier: string;
     identifierType: string;
-    holdingType: number;
+    holdingType: string|number;
     name?: string;
     securityType?: string;
     weight?: string;
@@ -78,7 +78,7 @@ function convertHoldings (
         const holding: XRayHoldingObject = {
             identifier: security.id,
             identifierType: security.idType,
-            holdingType
+            holdingType: security.holdingType || holdingType
         };
 
         if (security.name) {
@@ -89,6 +89,10 @@ function convertHoldings (
             holding.securityType = security.type;
         }
 
+        if (security.weight) {
+            holding.weight = security.weight.toString();
+        }
+
         return holding;
     });
 }

diff --git a/src/XRay/XRayJSON.ts b/src/XRay/XRayJSON.ts
@@ -149,22 +149,34 @@ namespace XRayJSON {
         );
     }
 
+    function checkRegionalExposure (
+        regionalExposureArray?: unknown
+    ): regionalExposureArray is Array<RegionalExposure> {
+        return (
+            !!regionalExposureArray &&
+            typeof regionalExposureArray === 'object' &&
+            regionalExposureArray instanceof Array &&
+            (
+                regionalExposureArray &&
+                regionalExposureArray.length === 0 ||
+                isRegionalExposure(regionalExposureArray[0])
+            )
+        );
+    }
+
 
     function isBreakdowns (
         json?: unknown
     ): json is Breakdowns {
         return (
             !!json &&
             typeof json === 'object' &&
+
             (json as Breakdowns).assetAllocation instanceof Array &&
             (
                 (json as Breakdowns).assetAllocation.length === 0 ||
                 isAssetAllocation((json as Breakdowns).assetAllocation[0])
-            ) &&
-            (
-                typeof (json as Breakdowns).regionalExposure === 'undefined' ||
-                isRegionalExposure((json as Breakdowns).regionalExposure)
-            )
+            ) && checkRegionalExposure((json as Breakdowns).regionalExposure)
         );
     }