@barchart/portfolio-api-common 1.0.172 → 1.0.176

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);
-					}
+			this._previousSummaryFrame = PositionSummaryFrame.YEARLY;
+			this._previousSummaryRanges = this._previousSummaryFrame.getRecentRanges(0);
 
-					const index = previousSummaryRanges.findIndex(r => r.start.getIsEqual(summary.start.date) && r.end.getIsEqual(summary.end.date));
-
-					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];
-
-				if (position) {
-					const currentSummary = this._summariesCurrent[position.position] || null;
-					const previousSummaries = this._summariesPrevious[position.position] || getSummaryArray(previousSummaryRanges);
+				const item = createPositionItem.call(this, position);
 
-					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;
 			}, { });
@@ -257,12 +222,40 @@ 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);
+			});
 		}
 
+		/**
+		 * 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));
 		}
 
 		/**
@@ -503,10 +496,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;
@@ -670,6 +659,75 @@ module.exports = (() => {
 		}, [ ]);
 	}
 
+	function getSummaryArray(ranges) {
+		return ranges.map(range => null);
+	}
+
+	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;
+
+			map[key] = summary;
+		}
+	}
+
+	function addSummaryPrevious(map, summary, previousSummaryFrame, previousSummaryRanges) {
+		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));
+
+			if (!(index < 0)) {
+				map[key][index] = summary;
+			}
+		}
+	}
+
+	function addBarchartSymbol(map, item) {
+		const barchartSymbol = extractSymbolForBarchart(item.position);
+
+		if (barchartSymbol) {
+			if (!map.hasOwnProperty(barchartSymbol)) {
+				map[barchartSymbol] = [ ];
+			}
+
+			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) {
 		if (!positionItem) {
 			return;
@@ -698,6 +756,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

@@ -627,7 +627,7 @@ module.exports = (() => {
 
 			updates = items.reduce((updates, item) => {
 				updates.market = updates.market.add(translate(item, item.data.market));
-				updates.marketAbsolute = updates.marketAbsolute.add(translate(item, item.data.market));
+				updates.marketAbsolute = updates.marketAbsolute.add(translate(item, item.data.marketAbsolute));
 				updates.unrealized = updates.unrealized.add(translate(item, item.data.unrealized));
 				updates.unrealizedToday = updates.unrealizedToday.add(translate(item, item.data.unrealizedToday));
 				updates.summaryTotalCurrent = updates.summaryTotalCurrent.add(translate(item, item.data.summaryTotalCurrent));
@@ -702,7 +702,7 @@ module.exports = (() => {
 				let numerator;
 
 				if (group.currency !== parent.currency) {
-					numerator = Rate.convert(actual.market, group.currency, parent.currency, ...rates);
+					numerator = Rate.convert(actual.marketAbsolute, group.currency, parent.currency, ...rates);
 				} else {
 					numerator = actual.marketAbsolute;
 				}

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barchart/portfolio-api-common",
-  "version": "1.0.172",
+  "version": "1.0.176",
   "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];
-
-				if (position) {
-					const currentSummary = this._summariesCurrent[position.position] || null;
-					const previousSummaries = this._summariesPrevious[position.position] || getSummaryArray(previousSummaryRanges);
+				const item = createPositionItem.call(this, position);
 
-					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;
 			}, { });
@@ -973,12 +938,40 @@ 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);
+			});
 		}
 
+		/**
+		 * 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));
 		}
 
 		/**
@@ -1219,10 +1212,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;
@@ -1386,6 +1375,75 @@ module.exports = (() => {
 		}, [ ]);
 	}
 
+	function getSummaryArray(ranges) {
+		return ranges.map(range => null);
+	}
+
+	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;
+
+			map[key] = summary;
+		}
+	}
+
+	function addSummaryPrevious(map, summary, previousSummaryFrame, previousSummaryRanges) {
+		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));
+
+			if (!(index < 0)) {
+				map[key][index] = summary;
+			}
+		}
+	}
+
+	function addBarchartSymbol(map, item) {
+		const barchartSymbol = extractSymbolForBarchart(item.position);
+
+		if (barchartSymbol) {
+			if (!map.hasOwnProperty(barchartSymbol)) {
+				map[barchartSymbol] = [ ];
+			}
+
+			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) {
 		if (!positionItem) {
 			return;
@@ -1414,6 +1472,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();
 	}
 
@@ -2050,7 +2114,7 @@ module.exports = (() => {
 
 			updates = items.reduce((updates, item) => {
 				updates.market = updates.market.add(translate(item, item.data.market));
-				updates.marketAbsolute = updates.marketAbsolute.add(translate(item, item.data.market));
+				updates.marketAbsolute = updates.marketAbsolute.add(translate(item, item.data.marketAbsolute));
 				updates.unrealized = updates.unrealized.add(translate(item, item.data.unrealized));
 				updates.unrealizedToday = updates.unrealizedToday.add(translate(item, item.data.unrealizedToday));
 				updates.summaryTotalCurrent = updates.summaryTotalCurrent.add(translate(item, item.data.summaryTotalCurrent));
@@ -2125,7 +2189,7 @@ module.exports = (() => {
 				let numerator;
 
 				if (group.currency !== parent.currency) {
-					numerator = Rate.convert(actual.market, group.currency, parent.currency, ...rates);
+					numerator = Rate.convert(actual.marketAbsolute, group.currency, parent.currency, ...rates);
 				} else {
 					numerator = actual.marketAbsolute;
 				}
@@ -2509,8 +2573,8 @@ module.exports = (() => {
 			marketAbsoluteChange = marketAbsolute.subtract(data.marketAbsolute);
 		}
 
-		data.marketAbsolute = market;
-		data.marketAbsoluteChange = marketChange;
+		data.marketAbsolute = marketAbsolute;
+		data.marketAbsoluteChange = marketAbsoluteChange;
 
 		let unrealizedToday;
 		let unrealizedTodayChange;