@barchart/portfolio-api-common 1.0.189 → 1.0.193

package/lib/processing/PositionContainer.js

@@ -5,6 +5,7 @@ const array = require('@barchart/common-js/lang/array'),
 	Currency = require('@barchart/common-js/lang/Currency'),
 	Decimal = require('@barchart/common-js/lang/Decimal'),
 	DisposableStack = require('@barchart/common-js/collections/specialized/DisposableStack'),
+	Event = require('@barchart/common-js/messaging/Event'),
 	is = require('@barchart/common-js/lang/is'),
 	Rate = require('@barchart/common-js/lang/Rate'),
 	Tree = require('@barchart/common-js/collections/Tree');
@@ -48,6 +49,9 @@ module.exports = (() => {
 
 			this._groupBindings = { };
 
+			this._positionSymbolAddedEvent = new Event(this);
+			this._positionSymbolRemovedEvent = new Event(this);
+
 			this._portfolios = portfolios.reduce((map, portfolio) => {
 				map[portfolio.portfolio] = portfolio;
 
@@ -241,7 +245,9 @@ module.exports = (() => {
 			}
 
 			this.startTransaction(() => {
-				this.removePosition(position);
+				const existingBarchartSymbols = this.getPositionSymbols(false);
+
+				removePositionItem.call(this, this._items.find((item) => item.position.position === position.position));
 
 				summaries.forEach((summary) => {
 					addSummaryCurrent(this._summariesCurrent, summary, this._currentSummaryFrame, this._currentSummaryRange);
@@ -256,6 +262,10 @@ module.exports = (() => {
 				this._items.push(item);
 
 				const createGroupOrInjectItem = (parentTree, treeDefinition, levelDefinitions) => {
+					if (levelDefinitions.length === 0) {
+						return;
+					}
+
 					const levelDefinition = levelDefinitions[0];
 					const levelKey = levelDefinition.keySelector(item);
 
@@ -277,6 +287,12 @@ module.exports = (() => {
 				};
 
 				this._definitions.forEach(definition => createGroupOrInjectItem(this._trees[definition.name], definition, definition.definitions));
+
+				const addedBarchartSymbol = extractSymbolForBarchart(item.position);
+
+				if (!existingBarchartSymbols.some(existingBarchartSymbol => existingBarchartSymbol === addedBarchartSymbol)) {
+					this._positionSymbolAddedEvent.fire(addedBarchartSymbol);
+				}
 			});
 		}
 
@@ -486,7 +502,10 @@ module.exports = (() => {
 		getPositions(portfolio) {
 			assert.argumentIsRequired(portfolio, 'portfolio', String);
 
-			return getPositionItemsForPortfolio(this._items, portfolio);
+			return getPositionItemsForPortfolio(this._items, portfolio)
+				.map((item) => {
+					return item.position;
+				});
 		}
 
 		/**
@@ -522,6 +541,31 @@ module.exports = (() => {
 			namesToUse.forEach((name) => this._trees[name].walk(group => group.setSuspended(false), false, false));
 		}
 
+		/**
+		 * Registers an observer for symbol addition (this occurs when a new position is added
+		 * for a symbol that does not already exist in the container). This event only fires
+		 * after the constructor completes (and initial positions have been added).
+		 *
+		 * @public
+		 * @param {Function} handler
+		 * @returns {Disposable}
+		 */
+		registerPositionSymbolAddedHandler(handler) {
+			return this._positionSymbolAddedEvent.register(handler);
+		}
+
+		/**
+		 * Registers an observer for symbol removal (this occurs when the last position for a
+		 * symbol is removed from the container).
+		 *
+		 * @public
+		 * @param {Function} handler
+		 * @returns {Disposable}
+		 */
+		registerPositionSymbolAddedHandler(handler) {
+			return this._positionSymbolRemovedEvent.register(handler);
+		}
+
 		toString() {
 			return '[PositionContainer]';
 		}
@@ -691,7 +735,7 @@ module.exports = (() => {
 	function getPositionItemsForPortfolio(items, portfolio) {
 		return items.reduce((positionItems, item) => {
 			if (item.position.portfolio === portfolio) {
-				positionItems.push(item.position);
+				positionItems.push(item);
 			}
 
 			return positionItems;

package/lib/processing/PositionGroup.js

@@ -273,6 +273,11 @@ module.exports = (() => {
 			bindItem.call(this, item);
 
 			this.refresh();
+
+			if (this._excluded) {
+				this.setExcluded(false);
+				this.setExcluded(true);
+			}
 		}
 
 		/**

package/package.json

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

package/test/SpecRunner.js

@@ -721,6 +721,7 @@ const array = require('@barchart/common-js/lang/array'),
 	Currency = require('@barchart/common-js/lang/Currency'),
 	Decimal = require('@barchart/common-js/lang/Decimal'),
 	DisposableStack = require('@barchart/common-js/collections/specialized/DisposableStack'),
+	Event = require('@barchart/common-js/messaging/Event'),
 	is = require('@barchart/common-js/lang/is'),
 	Rate = require('@barchart/common-js/lang/Rate'),
 	Tree = require('@barchart/common-js/collections/Tree');
@@ -764,6 +765,9 @@ module.exports = (() => {
 
 			this._groupBindings = { };
 
+			this._positionSymbolAddedEvent = new Event(this);
+			this._positionSymbolRemovedEvent = new Event(this);
+
 			this._portfolios = portfolios.reduce((map, portfolio) => {
 				map[portfolio.portfolio] = portfolio;
 
@@ -957,7 +961,9 @@ module.exports = (() => {
 			}
 
 			this.startTransaction(() => {
-				this.removePosition(position);
+				const existingBarchartSymbols = this.getPositionSymbols(false);
+
+				removePositionItem.call(this, this._items.find((item) => item.position.position === position.position));
 
 				summaries.forEach((summary) => {
 					addSummaryCurrent(this._summariesCurrent, summary, this._currentSummaryFrame, this._currentSummaryRange);
@@ -972,6 +978,10 @@ module.exports = (() => {
 				this._items.push(item);
 
 				const createGroupOrInjectItem = (parentTree, treeDefinition, levelDefinitions) => {
+					if (levelDefinitions.length === 0) {
+						return;
+					}
+
 					const levelDefinition = levelDefinitions[0];
 					const levelKey = levelDefinition.keySelector(item);
 
@@ -993,6 +1003,12 @@ module.exports = (() => {
 				};
 
 				this._definitions.forEach(definition => createGroupOrInjectItem(this._trees[definition.name], definition, definition.definitions));
+
+				const addedBarchartSymbol = extractSymbolForBarchart(item.position);
+
+				if (!existingBarchartSymbols.some(existingBarchartSymbol => existingBarchartSymbol === addedBarchartSymbol)) {
+					this._positionSymbolAddedEvent.fire(addedBarchartSymbol);
+				}
 			});
 		}
 
@@ -1202,7 +1218,10 @@ module.exports = (() => {
 		getPositions(portfolio) {
 			assert.argumentIsRequired(portfolio, 'portfolio', String);
 
-			return getPositionItemsForPortfolio(this._items, portfolio);
+			return getPositionItemsForPortfolio(this._items, portfolio)
+				.map((item) => {
+					return item.position;
+				});
 		}
 
 		/**
@@ -1238,6 +1257,31 @@ module.exports = (() => {
 			namesToUse.forEach((name) => this._trees[name].walk(group => group.setSuspended(false), false, false));
 		}
 
+		/**
+		 * Registers an observer for symbol addition (this occurs when a new position is added
+		 * for a symbol that does not already exist in the container). This event only fires
+		 * after the constructor completes (and initial positions have been added).
+		 *
+		 * @public
+		 * @param {Function} handler
+		 * @returns {Disposable}
+		 */
+		registerPositionSymbolAddedHandler(handler) {
+			return this._positionSymbolAddedEvent.register(handler);
+		}
+
+		/**
+		 * Registers an observer for symbol removal (this occurs when the last position for a
+		 * symbol is removed from the container).
+		 *
+		 * @public
+		 * @param {Function} handler
+		 * @returns {Disposable}
+		 */
+		registerPositionSymbolAddedHandler(handler) {
+			return this._positionSymbolRemovedEvent.register(handler);
+		}
+
 		toString() {
 			return '[PositionContainer]';
 		}
@@ -1407,7 +1451,7 @@ module.exports = (() => {
 	function getPositionItemsForPortfolio(items, portfolio) {
 		return items.reduce((positionItems, item) => {
 			if (item.position.portfolio === portfolio) {
-				positionItems.push(item.position);
+				positionItems.push(item);
 			}
 
 			return positionItems;
@@ -1525,7 +1569,7 @@ module.exports = (() => {
 	return PositionContainer;
 })();
 
-},{"./../data/PositionSummaryFrame":2,"./PositionGroup":5,"./PositionItem":6,"./definitions/PositionLevelDefinition":7,"./definitions/PositionLevelType":8,"./definitions/PositionTreeDefinition":9,"@barchart/common-js/collections/Tree":11,"@barchart/common-js/collections/sorting/ComparatorBuilder":12,"@barchart/common-js/collections/sorting/comparators":13,"@barchart/common-js/collections/specialized/DisposableStack":14,"@barchart/common-js/lang/Currency":15,"@barchart/common-js/lang/Decimal":17,"@barchart/common-js/lang/Rate":20,"@barchart/common-js/lang/array":21,"@barchart/common-js/lang/assert":22,"@barchart/common-js/lang/is":24}],5:[function(require,module,exports){
+},{"./../data/PositionSummaryFrame":2,"./PositionGroup":5,"./PositionItem":6,"./definitions/PositionLevelDefinition":7,"./definitions/PositionLevelType":8,"./definitions/PositionTreeDefinition":9,"@barchart/common-js/collections/Tree":11,"@barchart/common-js/collections/sorting/ComparatorBuilder":12,"@barchart/common-js/collections/sorting/comparators":13,"@barchart/common-js/collections/specialized/DisposableStack":14,"@barchart/common-js/lang/Currency":15,"@barchart/common-js/lang/Decimal":17,"@barchart/common-js/lang/Rate":20,"@barchart/common-js/lang/array":21,"@barchart/common-js/lang/assert":22,"@barchart/common-js/lang/is":24,"@barchart/common-js/messaging/Event":26}],5:[function(require,module,exports){
 const array = require('@barchart/common-js/lang/array'),
 	assert = require('@barchart/common-js/lang/assert'),
 	Currency = require('@barchart/common-js/lang/Currency'),
@@ -1801,6 +1845,11 @@ module.exports = (() => {
 			bindItem.call(this, item);
 
 			this.refresh();
+
+			if (this._excluded) {
+				this.setExcluded(false);
+				this.setExcluded(true);
+			}
 		}
 
 		/**