@barchart/portfolio-api-common 1.0.122 → 1.0.126

package/lib/processing/PositionContainer.js

@@ -95,11 +95,9 @@ module.exports = (() => {
 			}, [ ]);
 
 			this._symbols = this._items.reduce((map, item) => {
-				const position = item.position;
-
-				if (position.instrument && position.instrument.symbol && position.instrument.symbol.barchart) {
-					const symbol = position.instrument.symbol.barchart;
+				const symbol = extractSymbolForBarchart(item.position);
 
+				if (symbol) {
 					if (!map.hasOwnProperty(symbol)) {
 						map[symbol] = [ ];
 					}
@@ -225,8 +223,26 @@ module.exports = (() => {
 			return this._defaultCurrency;
 		}
 		
-		getPositionSymbols() {
-			return Object.keys(this._symbols);
+		getPositionSymbols(display) {
+			const symbols = this._items.reduce((symbols, item) => {
+				const position = item.position;
+
+				let symbol;
+
+				if (display) {
+					symbol = extractSymbolForDisplay(position);
+				} else {
+					symbol = extractSymbolForBarchart(position);
+				}
+
+				if (symbol !== null) {
+					symbols.push(symbol);
+				}
+
+				return symbols;
+			}, [ ]);
+
+			return array.unique(symbols);
 		}
 
 		setPositionQuote(symbol, quote) {
@@ -259,6 +275,14 @@ module.exports = (() => {
 			} else {
 				this._forexQuotes[index] = rate;
 			}
+
+			this._trees.forEach((tree) => {
+				tree.walk(group => group.setForexRate(rate), true, false);
+			});
+		}
+
+		setPositionFundamentals(data) {
+			return;
 		}
 
 		getGroup(name, keys) {
@@ -301,5 +325,22 @@ module.exports = (() => {
 		return ranges.map(range => null);
 	}
 
+	function extractSymbolForBarchart(position) {
+		if (position.instrument && position.instrument.symbol && position.instrument.symbol.barchart) {
+			return position.instrument.symbol.barchart;
+		} else {
+			return null;
+		}
+	}
+
+	function extractSymbolForDisplay(position) {
+		if (position.instrument && position.instrument.symbol && position.instrument.symbol.display) {
+			return position.instrument.symbol.display;
+		} else {
+			return null;
+		}
+	}
+
+
 	return PositionContainer;
 })();

package/lib/processing/PositionGroup.js

@@ -19,6 +19,7 @@ module.exports = (() => {
 
 			this._items = items;
 			this._currency = currency || Currency.CAD;
+			this._bypassCurrencyTranslation = false;
 
 			this._key = key;
 			this._description = description;
@@ -156,8 +157,10 @@ module.exports = (() => {
 			return this._excluded;
 		}
 
-		setForexQuote(quote) {
-
+		setForexRate(rate) {
+			if (!this._bypassCurrencyTranslation) {
+				this.refresh();
+			}
 		}
 
 		setExcluded(value) {
@@ -242,6 +245,8 @@ module.exports = (() => {
 		
 		const items = group._items;
 
+		group._bypassCurrencyTranslation = items.some(item => item.currency !== currency);
+
 		const translate = (item, value) => {
 			let translated;
 
@@ -413,7 +418,7 @@ module.exports = (() => {
 				let numerator;
 
 				if (group.currency !== parent.currency) {
-					numerator = Rate.convert(parentData.market, group.currency, parent.currency, ...rates);
+					numerator = Rate.convert(actual.market, group.currency, parent.currency, ...rates);
 				} else {
 					numerator = actual.market;
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barchart/portfolio-api-common",
-  "version": "1.0.122",
+  "version": "1.0.126",
   "description": "Common classes used by the Portfolio system",
   "author": {
     "name": "Bryan Ingle",

package/test/SpecRunner.js

@@ -811,11 +811,9 @@ module.exports = (() => {
 			}, [ ]);
 
 			this._symbols = this._items.reduce((map, item) => {
-				const position = item.position;
-
-				if (position.instrument && position.instrument.symbol && position.instrument.symbol.barchart) {
-					const symbol = position.instrument.symbol.barchart;
+				const symbol = extractSymbolForBarchart(item.position);
 
+				if (symbol) {
 					if (!map.hasOwnProperty(symbol)) {
 						map[symbol] = [ ];
 					}
@@ -941,8 +939,26 @@ module.exports = (() => {
 			return this._defaultCurrency;
 		}
 		
-		getPositionSymbols() {
-			return Object.keys(this._symbols);
+		getPositionSymbols(display) {
+			const symbols = this._items.reduce((symbols, item) => {
+				const position = item.position;
+
+				let symbol;
+
+				if (display) {
+					symbol = extractSymbolForDisplay(position);
+				} else {
+					symbol = extractSymbolForBarchart(position);
+				}
+
+				if (symbol !== null) {
+					symbols.push(symbol);
+				}
+
+				return symbols;
+			}, [ ]);
+
+			return array.unique(symbols);
 		}
 
 		setPositionQuote(symbol, quote) {
@@ -975,6 +991,14 @@ module.exports = (() => {
 			} else {
 				this._forexQuotes[index] = rate;
 			}
+
+			this._trees.forEach((tree) => {
+				tree.walk(group => group.setForexRate(rate), true, false);
+			});
+		}
+
+		setPositionFundamentals(data) {
+			return;
 		}
 
 		getGroup(name, keys) {
@@ -1017,6 +1041,23 @@ module.exports = (() => {
 		return ranges.map(range => null);
 	}
 
+	function extractSymbolForBarchart(position) {
+		if (position.instrument && position.instrument.symbol && position.instrument.symbol.barchart) {
+			return position.instrument.symbol.barchart;
+		} else {
+			return null;
+		}
+	}
+
+	function extractSymbolForDisplay(position) {
+		if (position.instrument && position.instrument.symbol && position.instrument.symbol.display) {
+			return position.instrument.symbol.display;
+		} else {
+			return null;
+		}
+	}
+
+
 	return PositionContainer;
 })();
 
@@ -1042,6 +1083,7 @@ module.exports = (() => {
 
 			this._items = items;
 			this._currency = currency || Currency.CAD;
+			this._bypassCurrencyTranslation = false;
 
 			this._key = key;
 			this._description = description;
@@ -1179,8 +1221,10 @@ module.exports = (() => {
 			return this._excluded;
 		}
 
-		setForexQuote(quote) {
-
+		setForexRate(rate) {
+			if (!this._bypassCurrencyTranslation) {
+				this.refresh();
+			}
 		}
 
 		setExcluded(value) {
@@ -1265,6 +1309,8 @@ module.exports = (() => {
 		
 		const items = group._items;
 
+		group._bypassCurrencyTranslation = items.some(item => item.currency !== currency);
+
 		const translate = (item, value) => {
 			let translated;
 
@@ -1436,7 +1482,7 @@ module.exports = (() => {
 				let numerator;
 
 				if (group.currency !== parent.currency) {
-					numerator = Rate.convert(parentData.market, group.currency, parent.currency, ...rates);
+					numerator = Rate.convert(actual.market, group.currency, parent.currency, ...rates);
 				} else {
 					numerator = actual.market;
 				}