@barchart/portfolio-api-common 1.0.82 → 1.0.86

package/lib/processing/PositionContainer.js

@@ -153,6 +153,10 @@ module.exports = (() => {
 				compositeGroups.forEach((group) => {
 					const child = tree.addChild(group);
 
+					group.registerMarketPercentChangeHandler(() => {
+						this._tree.walk((childNode, childGroup) => childGroup.refreshMarketPercent());
+					});
+
 					createGroups(child, group.items, additionalDefinitions);
 				});
 			};

package/lib/processing/PositionGroup.js

@@ -1,6 +1,7 @@
 const assert = require('@barchart/common-js/lang/assert'),
 	Currency = require('@barchart/common-js/lang/Currency'),
 	Decimal = require('@barchart/common-js/lang/Decimal'),
+	Event = require('@barchart/common-js/messaging/Event'),
 	formatter = require('@barchart/common-js/lang/formatter'),
 	is = require('@barchart/common-js/lang/is');
 
@@ -25,6 +26,8 @@ module.exports = (() => {
 			this._excluded = false;
 			this._suspended = false;
 
+			this._marketPercentChangeEvent = new Event(this);
+
 			this._dataFormat = { };
 			this._dataActual = { };
 			
@@ -52,7 +55,6 @@ module.exports = (() => {
 			this._dataFormat.marketDirection = null;
 			this._dataFormat.unrealizedToday = null;
 			this._dataFormat.unrealizedTodayNegative = false;
-			this._dataFormat.unrealizedTodayDirection = null;
 			this._dataFormat.total = null;
 			this._dataFormat.totalNegative = false;
 			this._dataFormat.summaryOneTotal = null;
@@ -93,6 +95,10 @@ module.exports = (() => {
 			return this._dataFormat;
 		}
 
+		get actual() {
+			return this._dataActual;
+		}
+
 		get single() {
 			return this._single;
 		}
@@ -132,6 +138,14 @@ module.exports = (() => {
 			calculatePriceData(this, null, true);
 		}
 
+		refreshMarketPercent() {
+			calculateMarketPercent(this, true);
+		}
+
+		registerMarketPercentChangeHandler(handler) {
+			this._marketPercentChangeEvent.register(handler);
+		}
+
 		toString() {
 			return '[PositionGroup]';
 		}
@@ -225,16 +239,14 @@ module.exports = (() => {
 			}, {
 				market: Decimal.ZERO,
 				marketDirection: unchanged,
-				unrealizedToday: Decimal.ZERO,
-				unrealizedTodayDirection: unchanged
+				unrealizedToday: Decimal.ZERO
 
 			});
 		} else {
 			updates = {
 				market: actual.market.add(item.data.marketChange),
 				marketDirection: { up: item.data.marketChange.getIsPositive(), down: item.data.marketChange.getIsNegative() },
-				unrealizedToday: actual.unrealizedToday.add(item.data.unrealizedTodayChange),
-				unrealizedTodayDirection: { up: item.data.unrealizedTodayChange.getIsPositive(), down: item.data.unrealizedTodayChange.getIsNegative() }
+				unrealizedToday: actual.unrealizedToday.add(item.data.unrealizedTodayChange)
 			};
 		}
 		
@@ -251,24 +263,54 @@ module.exports = (() => {
 		}
 
 		actual.market = updates.market;
-		actual.marketPercent = updates.marketPercent;
 		actual.unrealizedToday = updates.unrealizedToday;
 		actual.total = updates.unrealizedToday.add(actual.realized).add(actual.income);
+		
 		format.market = formatCurrency(actual.market, currency);
-		format.marketPercent = formatPercent(actual.marketPercent, 2);
+		
+		if (updates.marketDirection.up || updates.marketDirection.down) {
+			format.marketDirection = unchanged;
+			setTimeout(() => format.marketDirection = updates.marketDirection, 0);
+		}
+
 		format.unrealizedToday = formatCurrency(actual.unrealizedToday, currency);
 		format.unrealizedTodayNegative = actual.unrealizedToday.getIsNegative();
 		format.total = formatCurrency(actual.total, currency);
 		format.totalNegative = actual.total.getIsNegative();
+		
+		calculateMarketPercent(group, false);
+	}
 
-		if (updates.marketDirection.up || updates.marketDirection.down) {
-			format.marketDirection = unchanged;
-			setTimeout(() => format.marketDirection = updates.marketDirection, 0);
+	function calculateMarketPercent(group, silent) {
+		if (group.suspended) {
+			return;
+		}
+
+		const parent = group._parent;
+
+		const actual = group._dataActual;
+		const format = group._dataFormat;
+		
+		let marketPercent;
+		
+		if (parent !== null) {
+			const parentData = parent._dataActual;
+
+			if (parentData.market !== null && !parentData.market.getIsZero()) {
+				marketPercent = actual.market.divide(parentData.market);
+			} else {
+				marketPercent = null;
+			}
+		} else {
+			marketPercent = null;
 		}
 
-		if (updates.unrealizedTodayDirection.up || updates.unrealizedTodayDirection.down) {
-			format.unrealizedTodayDirection = unchanged;
-			setTimeout(() => format.unrealizedTodayDirection = updates.unrealizedTodayDirection, 0);
+		actual.marketPercent = marketPercent;
+		
+		format.marketPercent = formatPercent(actual.marketPercent, 2);
+		
+		if (!silent) {
+			group._marketPercentChangeEvent.fire(group);
 		}
 	}
 

package/lib/serialization/TransactionSchema.js

@@ -159,7 +159,7 @@ module.exports = (() => {
 		}
 
 		toString() {
-			return '[TransactionSchema]';
+			return `[TransactionSchema (code=${this.code})]`;
 		}
 	}
 

package/package.json

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

package/test/SpecRunner.js

@@ -857,6 +857,10 @@ module.exports = (() => {
 				compositeGroups.forEach((group) => {
 					const child = tree.addChild(group);
 
+					group.registerMarketPercentChangeHandler(() => {
+						this._tree.walk((childNode, childGroup) => childGroup.refreshMarketPercent());
+					});
+
 					createGroups(child, group.items, additionalDefinitions);
 				});
 			};
@@ -940,6 +944,7 @@ module.exports = (() => {
 const assert = require('@barchart/common-js/lang/assert'),
 	Currency = require('@barchart/common-js/lang/Currency'),
 	Decimal = require('@barchart/common-js/lang/Decimal'),
+	Event = require('@barchart/common-js/messaging/Event'),
 	formatter = require('@barchart/common-js/lang/formatter'),
 	is = require('@barchart/common-js/lang/is');
 
@@ -964,6 +969,8 @@ module.exports = (() => {
 			this._excluded = false;
 			this._suspended = false;
 
+			this._marketPercentChangeEvent = new Event(this);
+
 			this._dataFormat = { };
 			this._dataActual = { };
 			
@@ -991,7 +998,6 @@ module.exports = (() => {
 			this._dataFormat.marketDirection = null;
 			this._dataFormat.unrealizedToday = null;
 			this._dataFormat.unrealizedTodayNegative = false;
-			this._dataFormat.unrealizedTodayDirection = null;
 			this._dataFormat.total = null;
 			this._dataFormat.totalNegative = false;
 			this._dataFormat.summaryOneTotal = null;
@@ -1032,6 +1038,10 @@ module.exports = (() => {
 			return this._dataFormat;
 		}
 
+		get actual() {
+			return this._dataActual;
+		}
+
 		get single() {
 			return this._single;
 		}
@@ -1071,6 +1081,14 @@ module.exports = (() => {
 			calculatePriceData(this, null, true);
 		}
 
+		refreshMarketPercent() {
+			calculateMarketPercent(this, true);
+		}
+
+		registerMarketPercentChangeHandler(handler) {
+			this._marketPercentChangeEvent.register(handler);
+		}
+
 		toString() {
 			return '[PositionGroup]';
 		}
@@ -1164,16 +1182,14 @@ module.exports = (() => {
 			}, {
 				market: Decimal.ZERO,
 				marketDirection: unchanged,
-				unrealizedToday: Decimal.ZERO,
-				unrealizedTodayDirection: unchanged
+				unrealizedToday: Decimal.ZERO
 
 			});
 		} else {
 			updates = {
 				market: actual.market.add(item.data.marketChange),
 				marketDirection: { up: item.data.marketChange.getIsPositive(), down: item.data.marketChange.getIsNegative() },
-				unrealizedToday: actual.unrealizedToday.add(item.data.unrealizedTodayChange),
-				unrealizedTodayDirection: { up: item.data.unrealizedTodayChange.getIsPositive(), down: item.data.unrealizedTodayChange.getIsNegative() }
+				unrealizedToday: actual.unrealizedToday.add(item.data.unrealizedTodayChange)
 			};
 		}
 		
@@ -1190,24 +1206,54 @@ module.exports = (() => {
 		}
 
 		actual.market = updates.market;
-		actual.marketPercent = updates.marketPercent;
 		actual.unrealizedToday = updates.unrealizedToday;
 		actual.total = updates.unrealizedToday.add(actual.realized).add(actual.income);
+		
 		format.market = formatCurrency(actual.market, currency);
-		format.marketPercent = formatPercent(actual.marketPercent, 2);
+		
+		if (updates.marketDirection.up || updates.marketDirection.down) {
+			format.marketDirection = unchanged;
+			setTimeout(() => format.marketDirection = updates.marketDirection, 0);
+		}
+
 		format.unrealizedToday = formatCurrency(actual.unrealizedToday, currency);
 		format.unrealizedTodayNegative = actual.unrealizedToday.getIsNegative();
 		format.total = formatCurrency(actual.total, currency);
 		format.totalNegative = actual.total.getIsNegative();
+		
+		calculateMarketPercent(group, false);
+	}
 
-		if (updates.marketDirection.up || updates.marketDirection.down) {
-			format.marketDirection = unchanged;
-			setTimeout(() => format.marketDirection = updates.marketDirection, 0);
+	function calculateMarketPercent(group, silent) {
+		if (group.suspended) {
+			return;
+		}
+
+		const parent = group._parent;
+
+		const actual = group._dataActual;
+		const format = group._dataFormat;
+		
+		let marketPercent;
+		
+		if (parent !== null) {
+			const parentData = parent._dataActual;
+
+			if (parentData.market !== null && !parentData.market.getIsZero()) {
+				marketPercent = actual.market.divide(parentData.market);
+			} else {
+				marketPercent = null;
+			}
+		} else {
+			marketPercent = null;
 		}
 
-		if (updates.unrealizedTodayDirection.up || updates.unrealizedTodayDirection.down) {
-			format.unrealizedTodayDirection = unchanged;
-			setTimeout(() => format.unrealizedTodayDirection = updates.unrealizedTodayDirection, 0);
+		actual.marketPercent = marketPercent;
+		
+		format.marketPercent = formatPercent(actual.marketPercent, 2);
+		
+		if (!silent) {
+			group._marketPercentChangeEvent.fire(group);
 		}
 	}
 
@@ -1216,7 +1262,7 @@ module.exports = (() => {
 	return PositionGroup;
 })();
 
-},{"@barchart/common-js/lang/Currency":11,"@barchart/common-js/lang/Decimal":13,"@barchart/common-js/lang/assert":17,"@barchart/common-js/lang/formatter":18,"@barchart/common-js/lang/is":19}],6:[function(require,module,exports){
+},{"@barchart/common-js/lang/Currency":11,"@barchart/common-js/lang/Decimal":13,"@barchart/common-js/lang/assert":17,"@barchart/common-js/lang/formatter":18,"@barchart/common-js/lang/is":19,"@barchart/common-js/messaging/Event":20}],6:[function(require,module,exports){
 const assert = require('@barchart/common-js/lang/assert'),
 	is = require('@barchart/common-js/lang/is');
 
@@ -5870,10 +5916,10 @@ describe('When a position container data is gathered', () => {
 				income: new Decimal(0),
 				gain: new Decimal(0)
 			}
-		}
+		};
 	}
 
-	describe('for two portfolios, each with the same position, and the second portfolio with an additonal position', () => {
+	describe('for two portfolios, each with the same position, and the second portfolio with an addition position', () => {
 		let portfolios;
 		let positions;
 		let summaries;

package/test/specs/processing/PositionContainerSpec.js

@@ -29,10 +29,10 @@ describe('When a position container data is gathered', () => {
 				income: new Decimal(0),
 				gain: new Decimal(0)
 			}
-		}
+		};
 	}
 
-	describe('for two portfolios, each with the same position, and the second portfolio with an additonal position', () => {
+	describe('for two portfolios, each with the same position, and the second portfolio with an addition position', () => {
 		let portfolios;
 		let positions;
 		let summaries;