@barchart/portfolio-api-common 1.0.90 → 1.0.94

package/lib/data/PositionSummaryFrame.js

@@ -41,8 +41,6 @@ module.exports = (() => {
 		 * @return {String}
 		 */
 		describeRange(range) {
-			console.log('range: ', range);
-
 			return this._descriptionCalculator(range.start, range.end);
 		}
 

package/lib/processing/PositionGroup.js

@@ -58,6 +58,7 @@ module.exports = (() => {
 			this._dataFormat.total = null;
 			this._dataFormat.totalNegative = false;
 			this._dataFormat.summaryTotalCurrent = null;
+			this._dataActual.summaryTotalCurrentNegative = false;
 			this._dataFormat.summaryTotalPrevious = null;
 
 			this._dataFormat.unrealizedTodayNegative = false;
@@ -234,19 +235,22 @@ module.exports = (() => {
 			updates = items.reduce((updates, item) => {
 				updates.market = updates.market.add(item.data.market);
 				updates.unrealizedToday = updates.unrealizedToday.add(item.data.unrealizedToday);
+				updates.summaryTotalCurrent = updates.summaryTotalCurrent.add(item.data.summaryTotalCurrent);
 
 				return updates;
 			}, {
 				market: Decimal.ZERO,
 				marketDirection: unchanged,
-				unrealizedToday: Decimal.ZERO
+				unrealizedToday: Decimal.ZERO,
+				summaryTotalCurrent: 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)
+				unrealizedToday: actual.unrealizedToday.add(item.data.unrealizedTodayChange),
+				summaryTotalCurrent: actual.summaryTotalCurrent.add(item.data.summaryTotalCurrentChange)
 			};
 		}
 		
@@ -264,6 +268,7 @@ module.exports = (() => {
 
 		actual.market = updates.market;
 		actual.unrealizedToday = updates.unrealizedToday;
+		actual.summaryTotalCurrent = updates.summaryTotalCurrent;
 		actual.total = updates.unrealizedToday.add(actual.realized).add(actual.income);
 		
 		format.market = formatCurrency(actual.market, currency);
@@ -275,6 +280,10 @@ module.exports = (() => {
 
 		format.unrealizedToday = formatCurrency(actual.unrealizedToday, currency);
 		format.unrealizedTodayNegative = actual.unrealizedToday.getIsNegative();
+
+		format.summaryTotalCurrent = formatCurrency(actual.summaryTotalCurrent, currency);
+		format.summaryTotalCurrentNegative = actual.summaryTotalCurrent.getIsNegative();
+
 		format.total = formatCurrency(actual.total, currency);
 		format.totalNegative = actual.total.getIsNegative();
 		

package/lib/processing/PositionItem.js

@@ -37,6 +37,8 @@ module.exports = (() => {
 			this._data.income = null;
 			
 			this._data.summaryTotalCurrent = null;
+			this._data.summaryTotalCurrentChange = null;
+
 			this._data.summaryTotalPrevious = null;
 
 			this._excluded = false;
@@ -178,6 +180,28 @@ module.exports = (() => {
 
 		data.unrealizedToday = unrealizedToday;
 		data.unrealizedTodayChange = unrealizedTodayChange;
+
+		const summary = item.currentSummary;
+
+		if (summary && price) {
+			const period = summary.period;
+
+			let unrealizedCurrent = summary.end.open.multiply(price).add(summary.end.basis);
+
+			let summaryTotalCurrent = period.realized.add(period.income).add(unrealizedCurrent);
+			let summaryTotalCurrentChange;
+
+			if (data.summaryTotalCurrent !== null) {
+				summaryTotalCurrentChange = summaryTotalCurrent.subtract(data.summaryTotalCurrent);
+			}  else {
+				summaryTotalCurrentChange = Decimal.ZERO;
+			}
+
+			data.summaryTotalCurrent = summaryTotalCurrent;
+			data.summaryTotalCurrentChange = summaryTotalCurrentChange;
+		} else {
+			data.summaryTotalCurrentChange = Decimal.ZERO;
+		}
 	}
 	
 	function calculateSummaryTotal(summary) {
@@ -186,7 +210,7 @@ module.exports = (() => {
 		if (summary) {
 			const period = summary.period;
 
-			returnRef = period.realized.add(period.unrealized).add(period.income);
+			returnRef = period.realized.add(period.income).add(period.unrealized);
 		} else {
 			returnRef = Decimal.ZERO;
 		}

package/package.json

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

package/test/SpecRunner.js

@@ -160,8 +160,6 @@ module.exports = (() => {
 		 * @return {String}
 		 */
 		describeRange(range) {
-			console.log('range: ', range);
-
 			return this._descriptionCalculator(range.start, range.end);
 		}
 
@@ -1040,6 +1038,7 @@ module.exports = (() => {
 			this._dataFormat.total = null;
 			this._dataFormat.totalNegative = false;
 			this._dataFormat.summaryTotalCurrent = null;
+			this._dataActual.summaryTotalCurrentNegative = false;
 			this._dataFormat.summaryTotalPrevious = null;
 
 			this._dataFormat.unrealizedTodayNegative = false;
@@ -1216,19 +1215,22 @@ module.exports = (() => {
 			updates = items.reduce((updates, item) => {
 				updates.market = updates.market.add(item.data.market);
 				updates.unrealizedToday = updates.unrealizedToday.add(item.data.unrealizedToday);
+				updates.summaryTotalCurrent = updates.summaryTotalCurrent.add(item.data.summaryTotalCurrent);
 
 				return updates;
 			}, {
 				market: Decimal.ZERO,
 				marketDirection: unchanged,
-				unrealizedToday: Decimal.ZERO
+				unrealizedToday: Decimal.ZERO,
+				summaryTotalCurrent: 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)
+				unrealizedToday: actual.unrealizedToday.add(item.data.unrealizedTodayChange),
+				summaryTotalCurrent: actual.summaryTotalCurrent.add(item.data.summaryTotalCurrentChange)
 			};
 		}
 		
@@ -1246,6 +1248,7 @@ module.exports = (() => {
 
 		actual.market = updates.market;
 		actual.unrealizedToday = updates.unrealizedToday;
+		actual.summaryTotalCurrent = updates.summaryTotalCurrent;
 		actual.total = updates.unrealizedToday.add(actual.realized).add(actual.income);
 		
 		format.market = formatCurrency(actual.market, currency);
@@ -1257,6 +1260,10 @@ module.exports = (() => {
 
 		format.unrealizedToday = formatCurrency(actual.unrealizedToday, currency);
 		format.unrealizedTodayNegative = actual.unrealizedToday.getIsNegative();
+
+		format.summaryTotalCurrent = formatCurrency(actual.summaryTotalCurrent, currency);
+		format.summaryTotalCurrentNegative = actual.summaryTotalCurrent.getIsNegative();
+
 		format.total = formatCurrency(actual.total, currency);
 		format.totalNegative = actual.total.getIsNegative();
 		
@@ -1391,6 +1398,8 @@ module.exports = (() => {
 			this._data.income = null;
 			
 			this._data.summaryTotalCurrent = null;
+			this._data.summaryTotalCurrentChange = null;
+
 			this._data.summaryTotalPrevious = null;
 
 			this._excluded = false;
@@ -1532,6 +1541,28 @@ module.exports = (() => {
 
 		data.unrealizedToday = unrealizedToday;
 		data.unrealizedTodayChange = unrealizedTodayChange;
+
+		const summary = item.currentSummary;
+
+		if (summary && price) {
+			const period = summary.period;
+
+			let unrealizedCurrent = summary.end.open.multiply(price).add(summary.end.basis);
+
+			let summaryTotalCurrent = period.realized.add(period.income).add(unrealizedCurrent);
+			let summaryTotalCurrentChange;
+
+			if (data.summaryTotalCurrent !== null) {
+				summaryTotalCurrentChange = summaryTotalCurrent.subtract(data.summaryTotalCurrent);
+			}  else {
+				summaryTotalCurrentChange = Decimal.ZERO;
+			}
+
+			data.summaryTotalCurrent = summaryTotalCurrent;
+			data.summaryTotalCurrentChange = summaryTotalCurrentChange;
+		} else {
+			data.summaryTotalCurrentChange = Decimal.ZERO;
+		}
 	}
 	
 	function calculateSummaryTotal(summary) {
@@ -1540,7 +1571,7 @@ module.exports = (() => {
 		if (summary) {
 			const period = summary.period;
 
-			returnRef = period.realized.add(period.unrealized).add(period.income);
+			returnRef = period.realized.add(period.income).add(period.unrealized);
 		} else {
 			returnRef = Decimal.ZERO;
 		}
@@ -3191,9 +3222,9 @@ module.exports = function () {
 				assert.argumentIsRequired(a, 'a', Decimal, 'Decimal');
 				assert.argumentIsRequired(b, 'b', Decimal, 'Decimal');
 
-				if (a._big.gt(b)) {
+				if (a._big.gt(b._big)) {
 					return 1;
-				} else if (a._big.lt(b)) {
+				} else if (a._big.lt(b._big)) {
 					return -1;
 				} else {
 					return 0;