@barchart/portfolio-api-common 1.0.179 → 1.0.183

package/lib/processing/PositionContainer.js

@@ -611,7 +611,9 @@ module.exports = (() => {
 		}));
 
 		addGroupBinding.call(this, group, group.registerMarketPercentChangeHandler(() => {
-			groupTree.getParent().walk((childGroup) => childGroup.refreshMarketPercent());
+			if (!groupTree.getIsRoot()) {
+				groupTree.getParent().walk((childGroup) => childGroup.refreshMarketPercent());
+			}
 		}));
 	}
 
@@ -629,7 +631,7 @@ module.exports = (() => {
 			const items = populatedObjects[key];
 			const first = items[0];
 
-			list.push(new PositionGroup(this, parent, levelDefinition, items, levelDefinition.currencySelector(first), key, levelDefinition.descriptionSelector(first), levelDefinition.single && items.length === 1, levelDefinition.aggregateCash));
+			list.push(new PositionGroup(this, parent, levelDefinition, items, levelDefinition.currencySelector(first), key, levelDefinition.descriptionSelector(first), levelDefinition.aggregateCash));
 
 			return list;
 		}, [ ]);

package/lib/processing/PositionGroup.js

@@ -28,11 +28,10 @@ module.exports = (() => {
 	 * @param {Currency} currency
 	 * @param {String} key
 	 * @param {String} description
-	 * @param {Boolean=} single
 	 * @param {Boolean=} aggregateCash
 	 */
 	class PositionGroup {
-		constructor(container, parent, definition, items, currency, key, description, single, aggregateCash) {
+		constructor(container, parent, definition, items, currency, key, description, aggregateCash) {
 			this._id = counter++;
 
 			this._definition = definition;
@@ -46,7 +45,7 @@ module.exports = (() => {
 			this._key = key;
 			this._description = description;
 
-			this._single = is.boolean(single) && single;
+			this._single = this._definition.single;
 			this._aggregateCash = is.boolean(aggregateCash) && aggregateCash;
 
 			this._excluded = false;
@@ -79,7 +78,7 @@ module.exports = (() => {
 			this._dataActual.quantity = null;
 			this._dataActual.basisPrice = null;
 
-			if (this._single) {
+			if (this._single && items.length === 1) {
 				const item = items[0];
 
 				this._dataFormat.portfolio = item.portfolio.portfolio;
@@ -565,7 +564,7 @@ module.exports = (() => {
 
 		calculateUnrealizedPercent(group);
 
-		if (group.single) {
+		if (group.single && group._items.length === 1) {
 			const item = group._items[0];
 
 			actual.quantity = item.position.snapshot.open;

package/lib/processing/definitions/PositionLevelDefinition.js

@@ -20,12 +20,11 @@ module.exports = (() => {
 	 * @param {PositionLevelDefinition~descriptionSelector} descriptionSelector
 	 * @param {PositionLevelDefinition~currencySelector} currencySelector
 	 * @param {Array.<PositionLevelDefinition~RequiredGroup>=} requiredGroups
-	 * @param {Boolean=} single
 	 * @param {Boolean=} aggregateCash
 	 * @param {Function=} requiredGroupGenerator
 	 */
 	class PositionLevelDefinition {
-		constructor(name, type, keySelector, descriptionSelector, currencySelector, requiredGroups, single, aggregateCash, requiredGroupGenerator) {
+		constructor(name, type, keySelector, descriptionSelector, currencySelector, requiredGroups, aggregateCash, requiredGroupGenerator) {
 			assert.argumentIsRequired(name, 'name', String);
 			assert.argumentIsRequired(type, 'type', PositionLevelType, 'PositionLevelType');
 			assert.argumentIsRequired(keySelector, 'keySelector', Function);
@@ -36,7 +35,6 @@ module.exports = (() => {
 				assert.argumentIsArray(requiredGroups, 'requiredGroups', String);
 			}
 
-			assert.argumentIsOptional(single, 'single', Boolean);
 			assert.argumentIsOptional(aggregateCash, 'aggregateCash', Boolean);
 			assert.argumentIsOptional(requiredGroupGenerator, 'requiredGroupGenerator', Function);
 
@@ -49,7 +47,7 @@ module.exports = (() => {
 
 			this._requiredGroups = requiredGroups || [ ];
 
-			this._single = is.boolean(single) && single;
+			this._single = type === PositionLevelType.POSITION;
 			this._aggregateCash = is.boolean(aggregateCash) && aggregateCash;
 
 			this._requiredGroupGenerator = requiredGroupGenerator || (input => null);

package/package.json

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

package/test/SpecRunner.js

@@ -1327,7 +1327,9 @@ module.exports = (() => {
 		}));
 
 		addGroupBinding.call(this, group, group.registerMarketPercentChangeHandler(() => {
-			groupTree.getParent().walk((childGroup) => childGroup.refreshMarketPercent());
+			if (!groupTree.getIsRoot()) {
+				groupTree.getParent().walk((childGroup) => childGroup.refreshMarketPercent());
+			}
 		}));
 	}
 
@@ -1345,7 +1347,7 @@ module.exports = (() => {
 			const items = populatedObjects[key];
 			const first = items[0];
 
-			list.push(new PositionGroup(this, parent, levelDefinition, items, levelDefinition.currencySelector(first), key, levelDefinition.descriptionSelector(first), levelDefinition.single && items.length === 1, levelDefinition.aggregateCash));
+			list.push(new PositionGroup(this, parent, levelDefinition, items, levelDefinition.currencySelector(first), key, levelDefinition.descriptionSelector(first), levelDefinition.aggregateCash));
 
 			return list;
 		}, [ ]);
@@ -1554,11 +1556,10 @@ module.exports = (() => {
 	 * @param {Currency} currency
 	 * @param {String} key
 	 * @param {String} description
-	 * @param {Boolean=} single
 	 * @param {Boolean=} aggregateCash
 	 */
 	class PositionGroup {
-		constructor(container, parent, definition, items, currency, key, description, single, aggregateCash) {
+		constructor(container, parent, definition, items, currency, key, description, aggregateCash) {
 			this._id = counter++;
 
 			this._definition = definition;
@@ -1572,7 +1573,7 @@ module.exports = (() => {
 			this._key = key;
 			this._description = description;
 
-			this._single = is.boolean(single) && single;
+			this._single = this._definition.single;
 			this._aggregateCash = is.boolean(aggregateCash) && aggregateCash;
 
 			this._excluded = false;
@@ -1605,7 +1606,7 @@ module.exports = (() => {
 			this._dataActual.quantity = null;
 			this._dataActual.basisPrice = null;
 
-			if (this._single) {
+			if (this._single && items.length === 1) {
 				const item = items[0];
 
 				this._dataFormat.portfolio = item.portfolio.portfolio;
@@ -2091,7 +2092,7 @@ module.exports = (() => {
 
 		calculateUnrealizedPercent(group);
 
-		if (group.single) {
+		if (group.single && group._items.length === 1) {
 			const item = group._items[0];
 
 			actual.quantity = item.position.snapshot.open;
@@ -2711,12 +2712,11 @@ module.exports = (() => {
 	 * @param {PositionLevelDefinition~descriptionSelector} descriptionSelector
 	 * @param {PositionLevelDefinition~currencySelector} currencySelector
 	 * @param {Array.<PositionLevelDefinition~RequiredGroup>=} requiredGroups
-	 * @param {Boolean=} single
 	 * @param {Boolean=} aggregateCash
 	 * @param {Function=} requiredGroupGenerator
 	 */
 	class PositionLevelDefinition {
-		constructor(name, type, keySelector, descriptionSelector, currencySelector, requiredGroups, single, aggregateCash, requiredGroupGenerator) {
+		constructor(name, type, keySelector, descriptionSelector, currencySelector, requiredGroups, aggregateCash, requiredGroupGenerator) {
 			assert.argumentIsRequired(name, 'name', String);
 			assert.argumentIsRequired(type, 'type', PositionLevelType, 'PositionLevelType');
 			assert.argumentIsRequired(keySelector, 'keySelector', Function);
@@ -2727,7 +2727,6 @@ module.exports = (() => {
 				assert.argumentIsArray(requiredGroups, 'requiredGroups', String);
 			}
 
-			assert.argumentIsOptional(single, 'single', Boolean);
 			assert.argumentIsOptional(aggregateCash, 'aggregateCash', Boolean);
 			assert.argumentIsOptional(requiredGroupGenerator, 'requiredGroupGenerator', Function);
 
@@ -2740,7 +2739,7 @@ module.exports = (() => {
 
 			this._requiredGroups = requiredGroups || [ ];
 
-			this._single = is.boolean(single) && single;
+			this._single = type === PositionLevelType.POSITION;
 			this._aggregateCash = is.boolean(aggregateCash) && aggregateCash;
 
 			this._requiredGroupGenerator = requiredGroupGenerator || (input => null);