@barchart/portfolio-api-common 1.0.174 → 1.0.178

package/lib/processing/PositionContainer.js

@@ -44,12 +44,6 @@ module.exports = (() => {
 			assert.argumentIsArray(positions, 'positions');
 			assert.argumentIsArray(summaries, 'summaries');
 
-			const previousSummaryFrame = PositionSummaryFrame.YEARLY;
-			const previousSummaryRanges = previousSummaryFrame.getRecentRanges(0);
-
-			const currentSummaryFrame = PositionSummaryFrame.YTD;
-			const currentSummaryRange = array.last(currentSummaryFrame.getRecentRanges(0));
-
 			this._definitions = definitions;
 
 			this._groupBindings = { };
@@ -60,71 +54,42 @@ module.exports = (() => {
 				return map;
 			}, { });
 
-			this._summariesCurrent = summaries.reduce((map, summary) => {
-				if (summary.frame === currentSummaryFrame && currentSummaryRange.start.getIsEqual(summary.start.date) && currentSummaryRange.end.getIsEqual(summary.end.date)) {
-					const key = summary.position;
+			this._currentSummaryFrame = PositionSummaryFrame.YTD;
+			this._currentSummaryRange = array.last(this._currentSummaryFrame.getRecentRanges(0));
 
-					map[key] = summary;
-				}
+			this._summariesCurrent = summaries.reduce((map, summary) => {
+				addSummaryCurrent(map, summary, this._currentSummaryFrame, this._currentSummaryRange);
 
 				return map;
 			}, { });
-			
-			this._summariesPrevious = summaries.reduce((map, summary) => {
-				if (summary.frame === previousSummaryFrame) {
-					const key = summary.position;
-
-					if (!map.hasOwnProperty(key)) {
-						map[key] = getSummaryArray(previousSummaryRanges);
-					}
 
-					const index = previousSummaryRanges.findIndex(r => r.start.getIsEqual(summary.start.date) && r.end.getIsEqual(summary.end.date));
+			this._previousSummaryFrame = PositionSummaryFrame.YEARLY;
+			this._previousSummaryRanges = this._previousSummaryFrame.getRecentRanges(0);
 
-					if (!(index < 0)) {
-						map[key][index] = summary;
-					}
-				}
+			this._summariesPrevious = summaries.reduce((map, summary) => {
+				addSummaryPrevious(map, summary, this._previousSummaryFrame, this._previousSummaryRanges);
 
 				return map;
 			}, { });
 
 			this._items = positions.reduce((items, position) => {
-				const portfolio = this._portfolios[position.portfolio];
+				const item = createPositionItem.call(this, position);
 
-				if (position) {
-					const currentSummary = this._summariesCurrent[position.position] || null;
-					const previousSummaries = this._summariesPrevious[position.position] || getSummaryArray(previousSummaryRanges);
-
-					items.push(new PositionItem(portfolio, position, currentSummary, previousSummaries));
+				if (item) {
+					items.push(item);
 				}
 
 				return items;
 			}, [ ]);
 
 			this._symbols = this._items.reduce((map, item) => {
-				const symbol = extractSymbolForBarchart(item.position);
-
-				if (symbol) {
-					if (!map.hasOwnProperty(symbol)) {
-						map[symbol] = [ ];
-					}
-
-					map[symbol].push(item);
-				}
+				addBarchartSymbol(map, item);
 
 				return map;
 			}, { });
 
 			this._symbolsDisplay = this._items.reduce((map, item) => {
-				const symbol = extractSymbolForDisplay(item.position);
-
-				if (symbol) {
-					if (!map.hasOwnProperty(symbol)) {
-						map[symbol] = [ ];
-					}
-
-					map[symbol].push(item);
-				}
+				addDisplaySymbol(map, item);
 
 				return map;
 			}, { });
@@ -160,7 +125,7 @@ module.exports = (() => {
 			this._trees = this._definitions.reduce((map, treeDefinition) => {
 				const tree = new Tree();
 
-				createGroups.call(this, tree, tree, this._items, treeDefinition, treeDefinition.definitions);
+				createGroups.call(this, tree, this._items, treeDefinition, treeDefinition.definitions);
 				
 				map[treeDefinition.name] = tree;
 
@@ -223,7 +188,7 @@ module.exports = (() => {
 						const overrideRequiredGroups = [ portfolioRequiredGroup ];
 
 						parentTrees.forEach((t) => {
-							createGroups.call(this, tree, t, [ ], treeDefinition, levelDefinitions.slice(portfolioLevelDefinitionIndex), overrideRequiredGroups);
+							createGroups.call(this, t, [ ], treeDefinition, levelDefinitions.slice(portfolioLevelDefinitionIndex), overrideRequiredGroups);
 						});
 					}
 				});
@@ -257,12 +222,75 @@ module.exports = (() => {
 			});
 		}
 
-		mutatePosition(position, summary) {
+		/**
+		 * Adds a new position to the container or updates an existing position already
+		 * in the container.
+		 *
+		 * @public
+		 * @param {Object} position
+		 * @param {Array.<Object>} summaries
+		 */
+		updatePosition(position, summaries) {
+			assert.argumentIsRequired(position, 'position', Object);
+			assert.argumentIsRequired(position.position, 'position.position', String);
+			assert.argumentIsRequired(position.portfolio, 'position.portfolio', String);
+			assert.argumentIsArray(summaries, 'summaries');
+
+			if (!this._portfolios.hasOwnProperty(position.portfolio)) {
+				return;
+			}
+
+			this.startTransaction(() => {
+				this.removePosition(position);
+
+				summaries.forEach((summary) => {
+					addSummaryCurrent(this._summariesCurrent, summary, this._currentSummaryFrame, this._currentSummaryRange);
+					addSummaryPrevious(this._summariesPrevious, summary, this._previousSummaryFrame, this._previousSummaryRanges);
+				});
 
+				const item = createPositionItem(position);
+
+				addBarchartSymbol(this._symbols, item);
+				addDisplaySymbol(this._symbolsDisplay, item);
+
+				this._items.push(item);
+
+				const createGroupOrInjectItem = (parentTree, treeDefinition, levelDefinitions) => {
+					const levelDefinition = levelDefinitions[0];
+					const levelKey = levelDefinition.keySelector(item);
+
+					let groupTree;
+
+					if (parentTree.getChildren().length > 0) {
+						groupTree = parentTree.getChildren().findChild(childGroup => childGroup.key === levelKey) || null;
+					} else {
+						groupTree = null;
+					}
+
+					if (groupTree !== null) {
+						groupTree.addItem(item);
+
+						createGroupOrInjectItem(groupTree, treeDefinition, array.dropLeft(levelDefinitions));
+					} else {
+						createGroups.call(this, parentTree, [ item ], treeDefinition, levelDefinitions, [ ]);
+					}
+				};
+
+				this._definitions.forEach(definition => createGroupOrInjectItem(this._trees[definition.name], definition, definition.definitions));
+			});
 		}
 
+		/**
+		 * Removes a single position from the container.
+		 *
+		 * @public
+		 * @param {Object} position
+		 */
 		removePosition(position) {
-			removePositionItem.call(this, this._items.find((item) => item.position.position === position));
+			assert.argumentIsRequired(position, 'position', Object);
+			assert.argumentIsRequired(position.position, 'position.position', String);
+
+			removePositionItem.call(this, this._items.find((item) => item.position.position === position.position));
 		}
 
 		/**
@@ -412,7 +440,7 @@ module.exports = (() => {
 		 *
 		 * @public
 		 * @param {String} name
-		 * @param {Array.<String> keys
+		 * @param {Array.<String>} keys
 		 * @returns {PositionGroup}
 		 */
 		getGroup(name, keys) {
@@ -428,7 +456,7 @@ module.exports = (() => {
 		 *
 		 * @public
 		 * @param {String} name
-		 * @param {Array.<String> keys
+		 * @param {Array.<String>} keys
 		 * @returns {Array.<PositionGroup>}
 		 */
 		getGroups(name, keys) {
@@ -503,10 +531,6 @@ module.exports = (() => {
 		return keys.reduce((tree, key) => tree.findChild(group => group.key === key), tree);
 	}
 
-	function getSummaryArray(ranges) {
-		return ranges.map(range => null);
-	}
-
 	function extractSymbolForBarchart(position) {
 		if (position.instrument && position.instrument.symbol && position.instrument.symbol.barchart) {
 			return position.instrument.symbol.barchart;
@@ -541,12 +565,62 @@ module.exports = (() => {
 		this._groupBindings[id].push(dispoable);
 	}
 
-	function createGroups(parentTree, currentTree, items, treeDefinition, levelDefinitions, overrideRequiredGroups) {
+	function initializeGroupObservers(groupTree, treeDefinition) {
+		const group = groupTree.getValue();
+
+		addGroupBinding.call(this, group, group.registerGroupExcludedChangeHandler(() => {
+			groupTree.climb((parentGroup, parentTree) => {
+				if (parentGroup) {
+					let excludedItems = [];
+
+					parentTree.walk((childGroup) => {
+						if (childGroup.excluded) {
+							excludedItems = excludedItems.concat(childGroup.items);
+						}
+					}, false, false);
+
+					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 = [ ];
+
+					groupTree.getRoot().walk((childGroup) => {
+						if (childGroup.excluded) {
+							excludedItems = excludedItems.concat(childGroup.items);
+						}
+					}, false, false);
+
+					dependantTrees.forEach((dependantTrees) => {
+						dependantTrees.walk((childGroup) => {
+							childGroup.setExcludedItems(excludedItems);
+						}, false, false);
+					});
+				}
+			}
+		}));
+
+		addGroupBinding.call(this, group, group.registerMarketPercentChangeHandler(() => {
+			groupTree.getParent().walk((childGroup) => childGroup.refreshMarketPercent());
+		}));
+	}
+
+	function createGroups(parentTree, items, treeDefinition, levelDefinitions, overrideRequiredGroups) {
 		if (levelDefinitions.length === 0) {
 			return;
 		}
 
-		const parent = currentTree.getValue() || null;
+		const parent = parentTree.getValue() || null;
 
 		const levelDefinition = levelDefinitions[0];
 
@@ -603,71 +677,92 @@ module.exports = (() => {
 
 		compositeGroups.sort(builder.toComparator());
 
-		const initializeGroupObservers = (group, groupTree) => {
-			addGroupBinding.call(this, group, group.registerGroupExcludedChangeHandler((excluded, sender) => {
-				groupTree.climb((parentGroup) => {
-					if (parentGroup) {
-						let excludedItems = [];
+		compositeGroups.forEach((group) => {
+			const childTree = parentTree.addChild(group);
 
-						currentTree.walk((childGroup) => {
-							if (childGroup.excluded) {
-								excludedItems = excludedItems.concat(childGroup.items);
-							}
-						}, false, false);
+			initializeGroupObservers.call(this, childTree, treeDefinition);
 
-						parentGroup.setExcludedItems(array.unique(excludedItems));
-					}
-				}, false);
+			createGroups.call(this, childTree, group.items, treeDefinition, array.dropLeft(levelDefinitions));
+		});
+	}
 
-				if (treeDefinition.exclusionDependencies.length > 0) {
-					const dependantTrees = treeDefinition.exclusionDependencies.reduce((trees, name) => {
-						if (this._trees.hasOwnProperty(name)) {
-							trees.push(this._trees[name]);
-						}
+	function getPositionItemsForPortfolio(items, portfolio) {
+		return items.reduce((positionItems, item) => {
+			if (item.position.portfolio === portfolio) {
+				positionItems.push(item.position);
+			}
 
-						return trees;
-					}, [ ]);
+			return positionItems;
+		}, [ ]);
+	}
 
-					if (dependantTrees.length > 0) {
-						let excludedItems = [ ];
+	function getSummaryArray(ranges) {
+		return ranges.map(range => null);
+	}
 
-						parentTree.walk((childGroup) => {
-							if (childGroup.excluded) {
-								excludedItems = excludedItems.concat(childGroup.items);
-							}
-						}, false, false);
+	function addSummaryCurrent(map, summary, currentSummaryFrame, currentSummaryRange) {
+		if (summary.frame === currentSummaryFrame && currentSummaryRange.start.getIsEqual(summary.start.date) && currentSummaryRange.end.getIsEqual(summary.end.date)) {
+			const key = summary.position;
 
-						dependantTrees.forEach((dependantTrees) => {
-							dependantTrees.walk((childGroup) => {
-								childGroup.setExcludedItems(excludedItems);
-							}, false, false);
-						});
-					}
-				}
-			}));
-		};
+			map[key] = summary;
+		}
+	}
 
-		compositeGroups.forEach((group) => {
-			const childTree = currentTree.addChild(group);
+	function addSummaryPrevious(map, summary, previousSummaryFrame, previousSummaryRanges) {
+		if (summary.frame === previousSummaryFrame) {
+			const key = summary.position;
 
-			initializeGroupObservers(group, childTree);
+			if (!map.hasOwnProperty(key)) {
+				map[key] = getSummaryArray(previousSummaryRanges);
+			}
 
-			addGroupBinding.call(this, group, group.registerMarketPercentChangeHandler(() => {
-				currentTree.walk((childGroup) => childGroup.refreshMarketPercent());
-			}));
+			const index = previousSummaryRanges.findIndex(r => r.start.getIsEqual(summary.start.date) && r.end.getIsEqual(summary.end.date));
 
-			createGroups.call(this, parentTree, childTree, group.items, treeDefinition, array.dropLeft(levelDefinitions));
-		});
+			if (!(index < 0)) {
+				map[key][index] = summary;
+			}
+		}
 	}
 
-	function getPositionItemsForPortfolio(items, portfolio) {
-		return items.reduce((positionItems, item) => {
-			if (item.position.portfolio === portfolio) {
-				positionItems.push(item.position);
+	function addBarchartSymbol(map, item) {
+		const barchartSymbol = extractSymbolForBarchart(item.position);
+
+		if (barchartSymbol) {
+			if (!map.hasOwnProperty(barchartSymbol)) {
+				map[barchartSymbol] = [ ];
 			}
 
-			return positionItems;
-		}, [ ]);
+			map[barchartSymbol].push(item);
+		}
+	}
+
+	function addDisplaySymbol(map, item) {
+		const displaySymbol = extractSymbolForDisplay(item.position);
+
+		if (displaySymbol) {
+			if (!map.hasOwnProperty(displaySymbol)) {
+				map[displaySymbol] = [ ];
+			}
+
+			map[displaySymbol].push(item);
+		}
+	}
+
+	function createPositionItem(position) {
+		const portfolio = this._portfolios[position.portfolio];
+
+		let returnRef;
+
+		if (portfolio) {
+			const currentSummary = this._summariesCurrent[ position.position ] || null;
+			const previousSummaries = this._summariesPrevious[ position.position ] || getSummaryArray(this._previousSummaryRanges);
+
+			returnRef = new PositionItem(portfolio, position, currentSummary, previousSummaries);
+		} else {
+			returnRef = null;
+		}
+
+		return returnRef;
 	}
 
 	function removePositionItem(positionItem) {
@@ -689,7 +784,7 @@ module.exports = (() => {
 		const displaySymbol = extractSymbolForDisplay(positionItem.position);
 
 		if (this._symbolsDisplay.hasOwnProperty(displaySymbol)) {
-			array.remove(this._symbols[displaySymbol], i => i === positionItem);
+			array.remove(this._symbolsDisplay[displaySymbol], i => i === positionItem);
 		}
 
 		const currency = extractCurrency(positionItem.position);
@@ -698,6 +793,12 @@ module.exports = (() => {
 			array.remove(this._currencies[currency.code], i => i === positionItem);
 		}
 
+		this._trees[key].walk((group, groupNode) => {
+			if (group.definition.type === PositionLevelType.POSITION && group.key === positionItem.position.position) {
+				groupNode.sever();
+			}
+		}, true, false);
+
 		positionItem.dispose();
 	}
 

package/lib/processing/PositionGroup.js

@@ -329,12 +329,13 @@ module.exports = (() => {
 			return this._excluded;
 		}
 
-		addItems(items) {
-
-			this.refresh();
-		}
-
-		removeItems(items) {
+		/**
+		 * Adds a new {@link PositionItem} to the group.
+		 *
+		 * @public
+		 * @param {PositionItem} item
+		 */
+		addItem(item) {
 
 			this.refresh();
 		}

package/lib/processing/PositionItem.js

@@ -341,8 +341,8 @@ module.exports = (() => {
 			marketAbsoluteChange = marketAbsolute.subtract(data.marketAbsolute);
 		}
 
-		data.marketAbsolute = market;
-		data.marketAbsoluteChange = marketChange;
+		data.marketAbsolute = marketAbsolute;
+		data.marketAbsoluteChange = marketAbsoluteChange;
 
 		let unrealizedToday;
 		let unrealizedTodayChange;

package/lib/processing/definitions/PositionLevelDefinition.js

@@ -240,7 +240,7 @@ module.exports = (() => {
 	 *
 	 * @public
 	 * @callback PositionLevelDefinition~keySelector
-	 * @param {PositionItem} session
+	 * @param {PositionItem} item
 	 * @returns {String}
 	 */
 
@@ -250,7 +250,7 @@ module.exports = (() => {
 	 *
 	 * @public
 	 * @callback PositionLevelDefinition~descriptionSelector
-	 * @param {PositionItem} session
+	 * @param {PositionItem} item
 	 * @returns {String}
 	 */
 
@@ -260,7 +260,7 @@ module.exports = (() => {
 	 *
 	 * @public
 	 * @callback PositionLevelDefinition~currencySelector
-	 * @param {PositionItem} session
+	 * @param {PositionItem} item
 	 * @returns {Currency}
 	 */
 

package/package.json

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

package/test/SpecRunner.js

@@ -760,12 +760,6 @@ module.exports = (() => {
 			assert.argumentIsArray(positions, 'positions');
 			assert.argumentIsArray(summaries, 'summaries');
 
-			const previousSummaryFrame = PositionSummaryFrame.YEARLY;
-			const previousSummaryRanges = previousSummaryFrame.getRecentRanges(0);
-
-			const currentSummaryFrame = PositionSummaryFrame.YTD;
-			const currentSummaryRange = array.last(currentSummaryFrame.getRecentRanges(0));
-
 			this._definitions = definitions;
 
 			this._groupBindings = { };
@@ -776,71 +770,42 @@ module.exports = (() => {
 				return map;
 			}, { });
 
-			this._summariesCurrent = summaries.reduce((map, summary) => {
-				if (summary.frame === currentSummaryFrame && currentSummaryRange.start.getIsEqual(summary.start.date) && currentSummaryRange.end.getIsEqual(summary.end.date)) {
-					const key = summary.position;
+			this._currentSummaryFrame = PositionSummaryFrame.YTD;
+			this._currentSummaryRange = array.last(this._currentSummaryFrame.getRecentRanges(0));
 
-					map[key] = summary;
-				}
+			this._summariesCurrent = summaries.reduce((map, summary) => {
+				addSummaryCurrent(map, summary, this._currentSummaryFrame, this._currentSummaryRange);
 
 				return map;
 			}, { });
-			
-			this._summariesPrevious = summaries.reduce((map, summary) => {
-				if (summary.frame === previousSummaryFrame) {
-					const key = summary.position;
-
-					if (!map.hasOwnProperty(key)) {
-						map[key] = getSummaryArray(previousSummaryRanges);
-					}
 
-					const index = previousSummaryRanges.findIndex(r => r.start.getIsEqual(summary.start.date) && r.end.getIsEqual(summary.end.date));
+			this._previousSummaryFrame = PositionSummaryFrame.YEARLY;
+			this._previousSummaryRanges = this._previousSummaryFrame.getRecentRanges(0);
 
-					if (!(index < 0)) {
-						map[key][index] = summary;
-					}
-				}
+			this._summariesPrevious = summaries.reduce((map, summary) => {
+				addSummaryPrevious(map, summary, this._previousSummaryFrame, this._previousSummaryRanges);
 
 				return map;
 			}, { });
 
 			this._items = positions.reduce((items, position) => {
-				const portfolio = this._portfolios[position.portfolio];
+				const item = createPositionItem.call(this, position);
 
-				if (position) {
-					const currentSummary = this._summariesCurrent[position.position] || null;
-					const previousSummaries = this._summariesPrevious[position.position] || getSummaryArray(previousSummaryRanges);
-
-					items.push(new PositionItem(portfolio, position, currentSummary, previousSummaries));
+				if (item) {
+					items.push(item);
 				}
 
 				return items;
 			}, [ ]);
 
 			this._symbols = this._items.reduce((map, item) => {
-				const symbol = extractSymbolForBarchart(item.position);
-
-				if (symbol) {
-					if (!map.hasOwnProperty(symbol)) {
-						map[symbol] = [ ];
-					}
-
-					map[symbol].push(item);
-				}
+				addBarchartSymbol(map, item);
 
 				return map;
 			}, { });
 
 			this._symbolsDisplay = this._items.reduce((map, item) => {
-				const symbol = extractSymbolForDisplay(item.position);
-
-				if (symbol) {
-					if (!map.hasOwnProperty(symbol)) {
-						map[symbol] = [ ];
-					}
-
-					map[symbol].push(item);
-				}
+				addDisplaySymbol(map, item);
 
 				return map;
 			}, { });
@@ -876,7 +841,7 @@ module.exports = (() => {
 			this._trees = this._definitions.reduce((map, treeDefinition) => {
 				const tree = new Tree();
 
-				createGroups.call(this, tree, tree, this._items, treeDefinition, treeDefinition.definitions);
+				createGroups.call(this, tree, this._items, treeDefinition, treeDefinition.definitions);
 				
 				map[treeDefinition.name] = tree;
 
@@ -939,7 +904,7 @@ module.exports = (() => {
 						const overrideRequiredGroups = [ portfolioRequiredGroup ];
 
 						parentTrees.forEach((t) => {
-							createGroups.call(this, tree, t, [ ], treeDefinition, levelDefinitions.slice(portfolioLevelDefinitionIndex), overrideRequiredGroups);
+							createGroups.call(this, t, [ ], treeDefinition, levelDefinitions.slice(portfolioLevelDefinitionIndex), overrideRequiredGroups);
 						});
 					}
 				});
@@ -973,12 +938,75 @@ module.exports = (() => {
 			});
 		}
 
-		mutatePosition(position, summary) {
+		/**
+		 * Adds a new position to the container or updates an existing position already
+		 * in the container.
+		 *
+		 * @public
+		 * @param {Object} position
+		 * @param {Array.<Object>} summaries
+		 */
+		updatePosition(position, summaries) {
+			assert.argumentIsRequired(position, 'position', Object);
+			assert.argumentIsRequired(position.position, 'position.position', String);
+			assert.argumentIsRequired(position.portfolio, 'position.portfolio', String);
+			assert.argumentIsArray(summaries, 'summaries');
+
+			if (!this._portfolios.hasOwnProperty(position.portfolio)) {
+				return;
+			}
+
+			this.startTransaction(() => {
+				this.removePosition(position);
+
+				summaries.forEach((summary) => {
+					addSummaryCurrent(this._summariesCurrent, summary, this._currentSummaryFrame, this._currentSummaryRange);
+					addSummaryPrevious(this._summariesPrevious, summary, this._previousSummaryFrame, this._previousSummaryRanges);
+				});
+
+				const item = createPositionItem(position);
+
+				addBarchartSymbol(this._symbols, item);
+				addDisplaySymbol(this._symbolsDisplay, item);
+
+				this._items.push(item);
 
+				const createGroupOrInjectItem = (parentTree, treeDefinition, levelDefinitions) => {
+					const levelDefinition = levelDefinitions[0];
+					const levelKey = levelDefinition.keySelector(item);
+
+					let groupTree;
+
+					if (parentTree.getChildren().length > 0) {
+						groupTree = parentTree.getChildren().findChild(childGroup => childGroup.key === levelKey) || null;
+					} else {
+						groupTree = null;
+					}
+
+					if (groupTree !== null) {
+						groupTree.addItem(item);
+
+						createGroupOrInjectItem(groupTree, treeDefinition, array.dropLeft(levelDefinitions));
+					} else {
+						createGroups.call(this, parentTree, [ item ], treeDefinition, levelDefinitions, [ ]);
+					}
+				};
+
+				this._definitions.forEach(definition => createGroupOrInjectItem(this._trees[definition.name], definition, definition.definitions));
+			});
 		}
 
+		/**
+		 * Removes a single position from the container.
+		 *
+		 * @public
+		 * @param {Object} position
+		 */
 		removePosition(position) {
-			removePositionItem.call(this, this._items.find((item) => item.position.position === position));
+			assert.argumentIsRequired(position, 'position', Object);
+			assert.argumentIsRequired(position.position, 'position.position', String);
+
+			removePositionItem.call(this, this._items.find((item) => item.position.position === position.position));
 		}
 
 		/**
@@ -1128,7 +1156,7 @@ module.exports = (() => {
 		 *
 		 * @public
 		 * @param {String} name
-		 * @param {Array.<String> keys
+		 * @param {Array.<String>} keys
 		 * @returns {PositionGroup}
 		 */
 		getGroup(name, keys) {
@@ -1144,7 +1172,7 @@ module.exports = (() => {
 		 *
 		 * @public
 		 * @param {String} name
-		 * @param {Array.<String> keys
+		 * @param {Array.<String>} keys
 		 * @returns {Array.<PositionGroup>}
 		 */
 		getGroups(name, keys) {
@@ -1219,10 +1247,6 @@ module.exports = (() => {
 		return keys.reduce((tree, key) => tree.findChild(group => group.key === key), tree);
 	}
 
-	function getSummaryArray(ranges) {
-		return ranges.map(range => null);
-	}
-
 	function extractSymbolForBarchart(position) {
 		if (position.instrument && position.instrument.symbol && position.instrument.symbol.barchart) {
 			return position.instrument.symbol.barchart;
@@ -1257,12 +1281,62 @@ module.exports = (() => {
 		this._groupBindings[id].push(dispoable);
 	}
 
-	function createGroups(parentTree, currentTree, items, treeDefinition, levelDefinitions, overrideRequiredGroups) {
+	function initializeGroupObservers(groupTree, treeDefinition) {
+		const group = groupTree.getValue();
+
+		addGroupBinding.call(this, group, group.registerGroupExcludedChangeHandler(() => {
+			groupTree.climb((parentGroup, parentTree) => {
+				if (parentGroup) {
+					let excludedItems = [];
+
+					parentTree.walk((childGroup) => {
+						if (childGroup.excluded) {
+							excludedItems = excludedItems.concat(childGroup.items);
+						}
+					}, false, false);
+
+					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 = [ ];
+
+					groupTree.getRoot().walk((childGroup) => {
+						if (childGroup.excluded) {
+							excludedItems = excludedItems.concat(childGroup.items);
+						}
+					}, false, false);
+
+					dependantTrees.forEach((dependantTrees) => {
+						dependantTrees.walk((childGroup) => {
+							childGroup.setExcludedItems(excludedItems);
+						}, false, false);
+					});
+				}
+			}
+		}));
+
+		addGroupBinding.call(this, group, group.registerMarketPercentChangeHandler(() => {
+			groupTree.getParent().walk((childGroup) => childGroup.refreshMarketPercent());
+		}));
+	}
+
+	function createGroups(parentTree, items, treeDefinition, levelDefinitions, overrideRequiredGroups) {
 		if (levelDefinitions.length === 0) {
 			return;
 		}
 
-		const parent = currentTree.getValue() || null;
+		const parent = parentTree.getValue() || null;
 
 		const levelDefinition = levelDefinitions[0];
 
@@ -1319,71 +1393,92 @@ module.exports = (() => {
 
 		compositeGroups.sort(builder.toComparator());
 
-		const initializeGroupObservers = (group, groupTree) => {
-			addGroupBinding.call(this, group, group.registerGroupExcludedChangeHandler((excluded, sender) => {
-				groupTree.climb((parentGroup) => {
-					if (parentGroup) {
-						let excludedItems = [];
+		compositeGroups.forEach((group) => {
+			const childTree = parentTree.addChild(group);
 
-						currentTree.walk((childGroup) => {
-							if (childGroup.excluded) {
-								excludedItems = excludedItems.concat(childGroup.items);
-							}
-						}, false, false);
+			initializeGroupObservers.call(this, childTree, treeDefinition);
 
-						parentGroup.setExcludedItems(array.unique(excludedItems));
-					}
-				}, false);
+			createGroups.call(this, childTree, group.items, treeDefinition, array.dropLeft(levelDefinitions));
+		});
+	}
 
-				if (treeDefinition.exclusionDependencies.length > 0) {
-					const dependantTrees = treeDefinition.exclusionDependencies.reduce((trees, name) => {
-						if (this._trees.hasOwnProperty(name)) {
-							trees.push(this._trees[name]);
-						}
+	function getPositionItemsForPortfolio(items, portfolio) {
+		return items.reduce((positionItems, item) => {
+			if (item.position.portfolio === portfolio) {
+				positionItems.push(item.position);
+			}
 
-						return trees;
-					}, [ ]);
+			return positionItems;
+		}, [ ]);
+	}
 
-					if (dependantTrees.length > 0) {
-						let excludedItems = [ ];
+	function getSummaryArray(ranges) {
+		return ranges.map(range => null);
+	}
 
-						parentTree.walk((childGroup) => {
-							if (childGroup.excluded) {
-								excludedItems = excludedItems.concat(childGroup.items);
-							}
-						}, false, false);
+	function addSummaryCurrent(map, summary, currentSummaryFrame, currentSummaryRange) {
+		if (summary.frame === currentSummaryFrame && currentSummaryRange.start.getIsEqual(summary.start.date) && currentSummaryRange.end.getIsEqual(summary.end.date)) {
+			const key = summary.position;
 
-						dependantTrees.forEach((dependantTrees) => {
-							dependantTrees.walk((childGroup) => {
-								childGroup.setExcludedItems(excludedItems);
-							}, false, false);
-						});
-					}
-				}
-			}));
-		};
+			map[key] = summary;
+		}
+	}
 
-		compositeGroups.forEach((group) => {
-			const childTree = currentTree.addChild(group);
+	function addSummaryPrevious(map, summary, previousSummaryFrame, previousSummaryRanges) {
+		if (summary.frame === previousSummaryFrame) {
+			const key = summary.position;
 
-			initializeGroupObservers(group, childTree);
+			if (!map.hasOwnProperty(key)) {
+				map[key] = getSummaryArray(previousSummaryRanges);
+			}
 
-			addGroupBinding.call(this, group, group.registerMarketPercentChangeHandler(() => {
-				currentTree.walk((childGroup) => childGroup.refreshMarketPercent());
-			}));
+			const index = previousSummaryRanges.findIndex(r => r.start.getIsEqual(summary.start.date) && r.end.getIsEqual(summary.end.date));
 
-			createGroups.call(this, parentTree, childTree, group.items, treeDefinition, array.dropLeft(levelDefinitions));
-		});
+			if (!(index < 0)) {
+				map[key][index] = summary;
+			}
+		}
 	}
 
-	function getPositionItemsForPortfolio(items, portfolio) {
-		return items.reduce((positionItems, item) => {
-			if (item.position.portfolio === portfolio) {
-				positionItems.push(item.position);
+	function addBarchartSymbol(map, item) {
+		const barchartSymbol = extractSymbolForBarchart(item.position);
+
+		if (barchartSymbol) {
+			if (!map.hasOwnProperty(barchartSymbol)) {
+				map[barchartSymbol] = [ ];
 			}
 
-			return positionItems;
-		}, [ ]);
+			map[barchartSymbol].push(item);
+		}
+	}
+
+	function addDisplaySymbol(map, item) {
+		const displaySymbol = extractSymbolForDisplay(item.position);
+
+		if (displaySymbol) {
+			if (!map.hasOwnProperty(displaySymbol)) {
+				map[displaySymbol] = [ ];
+			}
+
+			map[displaySymbol].push(item);
+		}
+	}
+
+	function createPositionItem(position) {
+		const portfolio = this._portfolios[position.portfolio];
+
+		let returnRef;
+
+		if (portfolio) {
+			const currentSummary = this._summariesCurrent[ position.position ] || null;
+			const previousSummaries = this._summariesPrevious[ position.position ] || getSummaryArray(this._previousSummaryRanges);
+
+			returnRef = new PositionItem(portfolio, position, currentSummary, previousSummaries);
+		} else {
+			returnRef = null;
+		}
+
+		return returnRef;
 	}
 
 	function removePositionItem(positionItem) {
@@ -1405,7 +1500,7 @@ module.exports = (() => {
 		const displaySymbol = extractSymbolForDisplay(positionItem.position);
 
 		if (this._symbolsDisplay.hasOwnProperty(displaySymbol)) {
-			array.remove(this._symbols[displaySymbol], i => i === positionItem);
+			array.remove(this._symbolsDisplay[displaySymbol], i => i === positionItem);
 		}
 
 		const currency = extractCurrency(positionItem.position);
@@ -1414,6 +1509,12 @@ module.exports = (() => {
 			array.remove(this._currencies[currency.code], i => i === positionItem);
 		}
 
+		this._trees[key].walk((group, groupNode) => {
+			if (group.definition.type === PositionLevelType.POSITION && group.key === positionItem.position.position) {
+				groupNode.sever();
+			}
+		}, true, false);
+
 		positionItem.dispose();
 	}
 
@@ -1752,12 +1853,13 @@ module.exports = (() => {
 			return this._excluded;
 		}
 
-		addItems(items) {
-
-			this.refresh();
-		}
-
-		removeItems(items) {
+		/**
+		 * Adds a new {@link PositionItem} to the group.
+		 *
+		 * @public
+		 * @param {PositionItem} item
+		 */
+		addItem(item) {
 
 			this.refresh();
 		}
@@ -2509,8 +2611,8 @@ module.exports = (() => {
 			marketAbsoluteChange = marketAbsolute.subtract(data.marketAbsolute);
 		}
 
-		data.marketAbsolute = market;
-		data.marketAbsoluteChange = marketChange;
+		data.marketAbsolute = marketAbsolute;
+		data.marketAbsoluteChange = marketAbsoluteChange;
 
 		let unrealizedToday;
 		let unrealizedTodayChange;
@@ -2827,7 +2929,7 @@ module.exports = (() => {
 	 *
 	 * @public
 	 * @callback PositionLevelDefinition~keySelector
-	 * @param {PositionItem} session
+	 * @param {PositionItem} item
 	 * @returns {String}
 	 */
 
@@ -2837,7 +2939,7 @@ module.exports = (() => {
 	 *
 	 * @public
 	 * @callback PositionLevelDefinition~descriptionSelector
-	 * @param {PositionItem} session
+	 * @param {PositionItem} item
 	 * @returns {String}
 	 */
 
@@ -2847,7 +2949,7 @@ module.exports = (() => {
 	 *
 	 * @public
 	 * @callback PositionLevelDefinition~currencySelector
-	 * @param {PositionItem} session
+	 * @param {PositionItem} item
 	 * @returns {Currency}
 	 */