@barchart/portfolio-api-common 1.0.147 → 1.0.151

package/lib/processing/PositionContainer.js

@@ -242,6 +242,32 @@ module.exports = (() => {
 									parentGroup.setExcludedItems(array.unique(excludedItems));
 								}
 							}, false);
+
+							if (treeDefinition.exclusionDependencies.length > 0) {
+								const dependantTrees = treeDefinition.exclusionDependencies.reduce((trees, name) => {
+									if (this._trees.hasOwnProperty(name)) {
+										trees.push(this._trees[name]);
+									}
+
+									return trees;
+								}, [ ]);
+
+								if (dependantTrees.length > 0) {
+									let excludedItems = [ ];
+
+									tree.walk((childGroup) => {
+										if (childGroup.excluded) {
+											excludedItems = excludedItems.concat(childGroup.items);
+										}
+									}, false, false);
+
+									dependantTrees.forEach((dependantTrees) => {
+										dependantTrees.walk((childGroup) => {
+											childGroup.setExcludedItems(excludedItems);
+										}, false, false);
+									});
+								}
+							}
 						}));
 					};
 

package/lib/processing/PositionGroup.js

@@ -545,18 +545,6 @@ module.exports = (() => {
 				summaryTotalCurrent: actual.summaryTotalCurrent.add(translate(item, item.data.summaryTotalCurrentChange))
 			};
 		}
-		
-		if (parent !== null) {
-			const parentData = parent._dataActual;
-
-			if (parentData.market !== null && !parentData.market.getIsZero()) {
-				updates.marketPercent = updates.market.divide(parentData.market);
-			} else {
-				updates.marketPercent = null;
-			}
-		} else {
-			updates.marketPercent = null;
-		}
 
 		actual.market = updates.market;
 		actual.unrealized = updates.unrealized;
@@ -593,13 +581,14 @@ module.exports = (() => {
 		}
 
 		const parent = group._parent;
+		const excluded = group._excluded;
 
 		const actual = group._dataActual;
 		const format = group._dataFormat;
 		
 		let marketPercent;
 		
-		if (parent !== null) {
+		if (parent !== null && !excluded) {
 			const parentData = parent._dataActual;
 
 			if (parentData.market !== null && !parentData.market.getIsZero()) {

package/lib/processing/definitions/PositionTreeDefinition.js

@@ -13,17 +13,23 @@ module.exports = (() => {
 	 * @param {Array.<PositionLevelDefinition>} definitions
 	 */
 	class PositionTreeDefinitions {
-		constructor(name, definitions) {
+		constructor(name, definitions, exclusionDependencies) {
 			assert.argumentIsRequired(name, 'name', String);
 			assert.argumentIsArray(definitions, 'definitions', PositionLevelDefinition, 'PositionLevelDefinition');
 
+			if (exclusionDependencies) {
+				assert.argumentIsArray(exclusionDependencies, 'exclusionDependencies', String);
+			}
+
 			this._name = name;
 			this._definitions = definitions;
+			this._exclusionDependencies = exclusionDependencies || [ ];
 		}
 
 		/**
 		 * The name of the tree.
 		 *
+		 * @public
 		 * @returns {String}
 		 */
 		get name() {
@@ -43,6 +49,17 @@ module.exports = (() => {
 			return this._definitions;
 		}
 
+		/**
+		 * Returns the names of other trees which should be impacted when a
+		 * group (from the current tree) is excluded.
+		 *
+		 * @public
+		 * @return {Array.<String>}
+		 */
+		get exclusionDependencies() {
+			return this._exclusionDependencies;
+		}
+
 		toString() {
 			return '[PositionTreeDefinitions]';
 		}

package/package.json

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

package/test/SpecRunner.js

@@ -958,6 +958,32 @@ module.exports = (() => {
 									parentGroup.setExcludedItems(array.unique(excludedItems));
 								}
 							}, false);
+
+							if (treeDefinition.exclusionDependencies.length > 0) {
+								const dependantTrees = treeDefinition.exclusionDependencies.reduce((trees, name) => {
+									if (this._trees.hasOwnProperty(name)) {
+										trees.push(this._trees[name]);
+									}
+
+									return trees;
+								}, [ ]);
+
+								if (dependantTrees.length > 0) {
+									let excludedItems = [ ];
+
+									tree.walk((childGroup) => {
+										if (childGroup.excluded) {
+											excludedItems = excludedItems.concat(childGroup.items);
+										}
+									}, false, false);
+
+									dependantTrees.forEach((dependantTrees) => {
+										dependantTrees.walk((childGroup) => {
+											childGroup.setExcludedItems(excludedItems);
+										}, false, false);
+									});
+								}
+							}
 						}));
 					};
 
@@ -1765,18 +1791,6 @@ module.exports = (() => {
 				summaryTotalCurrent: actual.summaryTotalCurrent.add(translate(item, item.data.summaryTotalCurrentChange))
 			};
 		}
-		
-		if (parent !== null) {
-			const parentData = parent._dataActual;
-
-			if (parentData.market !== null && !parentData.market.getIsZero()) {
-				updates.marketPercent = updates.market.divide(parentData.market);
-			} else {
-				updates.marketPercent = null;
-			}
-		} else {
-			updates.marketPercent = null;
-		}
 
 		actual.market = updates.market;
 		actual.unrealized = updates.unrealized;
@@ -1813,13 +1827,14 @@ module.exports = (() => {
 		}
 
 		const parent = group._parent;
+		const excluded = group._excluded;
 
 		const actual = group._dataActual;
 		const format = group._dataFormat;
 		
 		let marketPercent;
 		
-		if (parent !== null) {
+		if (parent !== null && !excluded) {
 			const parentData = parent._dataActual;
 
 			if (parentData.market !== null && !parentData.market.getIsZero()) {
@@ -2407,17 +2422,23 @@ module.exports = (() => {
 	 * @param {Array.<PositionLevelDefinition>} definitions
 	 */
 	class PositionTreeDefinitions {
-		constructor(name, definitions) {
+		constructor(name, definitions, exclusionDependencies) {
 			assert.argumentIsRequired(name, 'name', String);
 			assert.argumentIsArray(definitions, 'definitions', PositionLevelDefinition, 'PositionLevelDefinition');
 
+			if (exclusionDependencies) {
+				assert.argumentIsArray(exclusionDependencies, 'exclusionDependencies', String);
+			}
+
 			this._name = name;
 			this._definitions = definitions;
+			this._exclusionDependencies = exclusionDependencies || [ ];
 		}
 
 		/**
 		 * The name of the tree.
 		 *
+		 * @public
 		 * @returns {String}
 		 */
 		get name() {
@@ -2437,6 +2458,17 @@ module.exports = (() => {
 			return this._definitions;
 		}
 
+		/**
+		 * Returns the names of other trees which should be impacted when a
+		 * group (from the current tree) is excluded.
+		 *
+		 * @public
+		 * @return {Array.<String>}
+		 */
+		get exclusionDependencies() {
+			return this._exclusionDependencies;
+		}
+
 		toString() {
 			return '[PositionTreeDefinitions]';
 		}