@barchart/portfolio-client-js 1.2.22 → 1.2.25

package/example/example.js

@@ -192,8 +192,6 @@ module.exports = function () {
 				requestInterceptorToUse = RequestInterceptor.EMPTY;
 			}
 
-			_this._positionObservers = {};
-
 			_this._readPortfoliosEndpoint = EndpointBuilder.for('read-portfolios', 'read portfolios').withVerb(VerbType.GET).withProtocol(protocolType).withHost(host).withPort(port).withPathBuilder(function (pb) {
 				pb.withLiteralParameter('portfolios', 'portfolios').withVariableParameter('portfolio', 'portfolio', 'portfolio', false);
 			}).withRequestInterceptor(RequestInterceptor.PLAIN_TEXT_RESPONSE).withRequestInterceptor(requestInterceptorToUse).withResponseInterceptor(responseInterceptorForPortfolioDeserialization).withErrorInterceptor(ErrorInterceptor.GENERAL).endpoint;
@@ -231,8 +229,8 @@ module.exports = function () {
 					return frames.map(function (f) {
 						return f.code;
 					}).join();
-				}).withVariableParameter('periods', 'periods', 'periods', true).withVariableParameter('start', 'start', 'start', true, function (s) {
-					return s.format();
+				}).withVariableParameter('periods', 'periods', 'periods', true).withVariableParameter('start', 'start', 'start', true, function (x) {
+					return x.format();
 				});
 			}).withRequestInterceptor(requestInterceptorToUse).withRequestInterceptor(RequestInterceptor.PLAIN_TEXT_RESPONSE).withResponseInterceptor(responseInterceptorForPositionSummaryDeserialization).withErrorInterceptor(ErrorInterceptor.GENERAL).endpoint;
 
@@ -245,8 +243,8 @@ module.exports = function () {
 			_this._createTransactionEndpoint = EndpointBuilder.for('create-transaction', 'create transaction').withVerb(VerbType.POST).withProtocol(protocolType).withHost(host).withPort(port).withPathBuilder(function (pb) {
 				pb.withLiteralParameter('portfolios', 'portfolios').withVariableParameter('portfolio', 'portfolio', 'portfolio', false).withLiteralParameter('positions', 'positions').withVariableParameter('position', 'position', 'position', false).withLiteralParameter('transactions', 'transactions');
 			}).withQueryBuilder(function (qb) {
-				qb.withVariableParameter('type', 'type', 'type', false, function (t) {
-					return t.code;
+				qb.withVariableParameter('type', 'type', 'type', false, function (x) {
+					return x.code;
 				});
 			}).withBody('transaction').withRequestInterceptor(requestInterceptorToUse).withResponseInterceptor(responseInterceptorForPositionMutateDeserialization).withErrorInterceptor(ErrorInterceptor.GENERAL).endpoint;
 
@@ -257,15 +255,19 @@ module.exports = function () {
 			_this._editTransactionEndpoint = EndpointBuilder.for('edit-transaction', 'edit transaction').withVerb(VerbType.POST).withProtocol(protocolType).withHost(host).withPort(port).withPathBuilder(function (pb) {
 				pb.withLiteralParameter('portfolios', 'portfolios').withVariableParameter('portfolio', 'portfolio', 'portfolio', false).withLiteralParameter('positions', 'positions').withVariableParameter('position', 'position', 'position', false).withLiteralParameter('transactions', 'transactions').withVariableParameter('sequence', 'sequence', 'sequence', false);
 			}).withQueryBuilder(function (qb) {
-				qb.withVariableParameter('type', 'type', 'type', false, function (t) {
-					return t.code;
+				qb.withVariableParameter('type', 'type', 'type', false, function (x) {
+					return x.code;
 				});
 			}).withBody('transaction').withRequestInterceptor(requestInterceptorToUse).withResponseInterceptor(responseInterceptorForPositionMutateDeserialization).withErrorInterceptor(ErrorInterceptor.GENERAL).endpoint;
 
 			_this._deleteTransactionEndpoint = EndpointBuilder.for('delete-transaction', 'delete transaction').withVerb(VerbType.DELETE).withProtocol(protocolType).withHost(host).withPort(port).withPathBuilder(function (pb) {
 				pb.withLiteralParameter('portfolios', 'portfolios').withVariableParameter('portfolio', 'portfolio', 'portfolio', false).withLiteralParameter('positions', 'positions').withVariableParameter('position', 'position', 'position', false).withLiteralParameter('transactions', 'transactions').withVariableParameter('sequence', 'sequence', 'sequence', false);
 			}).withQueryBuilder(function (qb) {
-				qb.withVariableParameter('force', 'force', 'force', false).withVariableParameter('echo', 'echo', 'echo', false);
+				qb.withVariableParameter('force', 'force', 'force', false).withVariableParameter('echoStart', 'echoStart', 'echoStart', true, function (x) {
+					return x.format();
+				}).withVariableParameter('echoEnd', 'echoEnd', 'echoEnd', true, function (x) {
+					return x.format();
+				});
 			}).withRequestInterceptor(requestInterceptorToUse).withResponseInterceptor(responseInterceptorForPositionMutateDeserialization).withErrorInterceptor(ErrorInterceptor.GENERAL).endpoint;
 
 			_this._readTransactionsReportEndpoint = EndpointBuilder.for('read-transaction-report', 'read transaction report').withVerb(VerbType.GET).withProtocol(protocolType).withHost(host).withPort(port).withPathBuilder(function (pb) {
@@ -493,8 +495,8 @@ module.exports = function () {
 				var _this10 = this;
 
 				return promise.build(function (resolveCallback) {
-					assert.argumentIsOptional(portfolio, 'portfolio', String);
-					assert.argumentIsOptional(position, 'position', String);
+					assert.argumentIsRequired(portfolio, 'portfolio', String);
+					assert.argumentIsRequired(position, 'position', String);
 
 					var scheduleCheck = function scheduleCheck(delay) {
 						setTimeout(function () {
@@ -505,9 +507,9 @@ module.exports = function () {
 
 								if (is.object(p)) {
 									if (is.object(p.system) && is.object(p.system) && is.boolean(p.system.locked) && p.system.locked) {
-										resolveCallback(p);
+										scheduleCheck(delay + 1000);
 									} else {
-										scheduleCheck(5000);
+										resolveCallback(p);
 									}
 								} else {
 									resolveCallback(null);
@@ -729,13 +731,14 @@ module.exports = function () {
     * @param {String} position
     * @param {Number} sequence
     * @param {Boolean=} force
-    * @param {Boolean=} echo
+    * @param {Day=} echoStart
+    * @param {Day=} echoEnd
     * @returns {Promise.<TransactionMutateResult>}
     */
 
 		}, {
 			key: 'deleteTransaction',
-			value: function deleteTransaction(portfolio, position, sequence, force, echo) {
+			value: function deleteTransaction(portfolio, position, sequence, force, echoStart, echoEnd) {
 				var _this16 = this;
 
 				return Promise.resolve().then(function () {
@@ -745,9 +748,25 @@ module.exports = function () {
 					assert.argumentIsRequired(position, 'position', String);
 					assert.argumentIsRequired(sequence, 'sequence', Number);
 					assert.argumentIsOptional(force, 'force', Boolean);
-					assert.argumentIsOptional(echo, 'echo', Boolean);
+					assert.argumentIsOptional(echoStart, 'echoStart', Day, 'Day');
+					assert.argumentIsOptional(echoEnd, 'echoEnd', Day, 'Day');
+
+					var payload = {};
+
+					payload.portfolio = portfolio;
+					payload.position = position;
+					payload.sequence = sequence;
+					payload.force = is.boolean(force) && force;
+
+					if (echoStart) {
+						payload.echoStart = echoStart;
+					}
+
+					if (echoEnd) {
+						payload.echoEnd = echoEnd;
+					}
 
-					return Gateway.invoke(_this16._deleteTransactionEndpoint, { portfolio: portfolio, position: position, sequence: sequence, force: is.boolean(force) && force, echo: is.boolean(echo) && echo });
+					return Gateway.invoke(_this16._deleteTransactionEndpoint, payload);
 				});
 			}
 
@@ -1438,7 +1457,7 @@ module.exports = function () {
 	return {
 		JwtGateway: JwtGateway,
 		PortfolioGateway: PortfolioGateway,
-		version: '1.2.22'
+		version: '1.2.25'
 	};
 }();
 

package/lib/gateway/PortfolioGateway.js

@@ -58,8 +58,6 @@ module.exports = (() => {
 				requestInterceptorToUse = RequestInterceptor.EMPTY;
 			}
 
-			this._positionObservers = { };
-
 			this._readPortfoliosEndpoint = EndpointBuilder.for('read-portfolios', 'read portfolios')
 				.withVerb(VerbType.GET)
 				.withProtocol(protocolType)
@@ -190,7 +188,7 @@ module.exports = (() => {
 				.withQueryBuilder((qb) => {
 					qb.withVariableParameter('frames', 'frames', 'frames', true, frames => frames.map(f => f.code).join())
 						.withVariableParameter('periods', 'periods', 'periods', true)
-						.withVariableParameter('start', 'start', 'start', true, s => s.format());
+						.withVariableParameter('start', 'start', 'start', true, x => x.format());
 				})
 				.withRequestInterceptor(requestInterceptorToUse)
 				.withRequestInterceptor(RequestInterceptor.PLAIN_TEXT_RESPONSE)
@@ -232,7 +230,7 @@ module.exports = (() => {
 						.withLiteralParameter('transactions', 'transactions');
 				})
 				.withQueryBuilder((qb) => {
-					qb.withVariableParameter('type', 'type', 'type', false, t => t.code);
+					qb.withVariableParameter('type', 'type', 'type', false, x => x.code);
 				})
 				.withBody('transaction')
 				.withRequestInterceptor(requestInterceptorToUse)
@@ -272,7 +270,7 @@ module.exports = (() => {
 						.withVariableParameter('sequence', 'sequence', 'sequence', false);
 				})
 				.withQueryBuilder((qb) => {
-					qb.withVariableParameter('type', 'type', 'type', false, t => t.code);
+					qb.withVariableParameter('type', 'type', 'type', false, x => x.code);
 				})
 				.withBody('transaction')
 				.withRequestInterceptor(requestInterceptorToUse)
@@ -295,7 +293,8 @@ module.exports = (() => {
 				})
 				.withQueryBuilder((qb) => {
 					qb.withVariableParameter('force', 'force', 'force', false)
-						.withVariableParameter('echo', 'echo', 'echo', false);
+						.withVariableParameter('echoStart', 'echoStart', 'echoStart', true, x => x.format())
+						.withVariableParameter('echoEnd', 'echoEnd', 'echoEnd', true, x => x.format());
 				})
 				.withRequestInterceptor(requestInterceptorToUse)
 				.withResponseInterceptor(responseInterceptorForPositionMutateDeserialization)
@@ -508,8 +507,8 @@ module.exports = (() => {
 		 */
 		observePositionLock(portfolio, position) {
 			return promise.build((resolveCallback) => {
-				assert.argumentIsOptional(portfolio, 'portfolio', String);
-				assert.argumentIsOptional(position, 'position', String);
+				assert.argumentIsRequired(portfolio, 'portfolio', String);
+				assert.argumentIsRequired(position, 'position', String);
 
 				const scheduleCheck = (delay) => {
 					setTimeout(() => {
@@ -519,9 +518,9 @@ module.exports = (() => {
 
 								if (is.object(p)) {
 									if (is.object(p.system) && is.object(p.system) && is.boolean(p.system.locked) && p.system.locked) {
-										resolveCallback(p);
+										scheduleCheck(delay + 1000);
 									} else {
-										scheduleCheck(5000);
+										resolveCallback(p);
 									}
 								} else {
 									resolveCallback(null);
@@ -723,10 +722,11 @@ module.exports = (() => {
 		 * @param {String} position
 		 * @param {Number} sequence
 		 * @param {Boolean=} force
-		 * @param {Boolean=} echo
+		 * @param {Day=} echoStart
+		 * @param {Day=} echoEnd
 		 * @returns {Promise.<TransactionMutateResult>}
 		 */
-		deleteTransaction(portfolio, position, sequence, force, echo) {
+		deleteTransaction(portfolio, position, sequence, force, echoStart, echoEnd) {
 			return Promise.resolve()
 				.then(() => {
 					checkStart.call(this);
@@ -735,9 +735,25 @@ module.exports = (() => {
 					assert.argumentIsRequired(position, 'position', String);
 					assert.argumentIsRequired(sequence, 'sequence', Number);
 					assert.argumentIsOptional(force, 'force', Boolean);
-					assert.argumentIsOptional(echo, 'echo', Boolean);
+					assert.argumentIsOptional(echoStart, 'echoStart', Day, 'Day');
+					assert.argumentIsOptional(echoEnd, 'echoEnd', Day, 'Day');
+
+					let payload = { };
+
+					payload.portfolio = portfolio;
+					payload.position = position;
+					payload.sequence = sequence;
+					payload.force = is.boolean(force) && force;
+
+					if (echoStart) {
+						payload.echoStart = echoStart;
+					}
+
+					if (echoEnd) {
+						payload.echoEnd = echoEnd;
+					}
 
-					return Gateway.invoke(this._deleteTransactionEndpoint, { portfolio: portfolio, position: position, sequence: sequence, force: is.boolean(force) && force, echo: is.boolean(echo) && echo });
+					return Gateway.invoke(this._deleteTransactionEndpoint, payload);
 				});
 		}
 

package/lib/index.js

@@ -7,6 +7,6 @@ module.exports = (() => {
 	return {
 		JwtGateway: JwtGateway,
 		PortfolioGateway: PortfolioGateway,
-		version: '1.2.22'
+		version: '1.2.25'
 	};
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barchart/portfolio-client-js",
-  "version": "1.2.22",
+  "version": "1.2.25",
   "description": "JavaScript library for interfacing with Barchart's Portfolio API",
   "author": {
     "name": "Bryan Ingle",