@barchart/portfolio-client-js 1.1.24 → 1.1.27

package/example/example.html

@@ -111,7 +111,7 @@
 				    return;
                 }
 
-				that.gateway.updatePortfolio(that.portfolio(), portfolio)
+				that.gateway.updatePortfolio(portfolio)
 					.then((data) => {
 						writeConsoleText(action, true);
 						writeConsoleObject(data);

package/example/example.js

@@ -179,11 +179,11 @@ module.exports = function () {
 
 			_this._createPortfolioEndpoint = EndpointBuilder.for('create-portfolio', 'create portfolio').withVerb(VerbType.POST).withProtocol(protocolType).withHost(host).withPort(port).withPathBuilder(function (pb) {
 				pb.withLiteralParameter('portfolios', 'portfolios');
-			}).withBody('portfolio').withRequestInterceptor(RequestInterceptor.fromDelegate(createPortfolioRequestInterceptor)).withRequestInterceptor(requestInterceptorToUse).withResponseInterceptor(responseInterceptorForPortfolioDeserialization).withErrorInterceptor(ErrorInterceptor.GENERAL).endpoint;
+			}).withBody('portfolio').withRequestInterceptor(RequestInterceptor.PLAIN_TEXT_RESPONSE).withRequestInterceptor(RequestInterceptor.fromDelegate(createPortfolioRequestInterceptor)).withRequestInterceptor(requestInterceptorToUse).withResponseInterceptor(responseInterceptorForPortfolioDeserialization).withErrorInterceptor(ErrorInterceptor.GENERAL).endpoint;
 
 			_this._updatePortfolioEndpoint = EndpointBuilder.for('update-portfolio', 'update portfolio').withVerb(VerbType.PUT).withProtocol(protocolType).withHost(host).withPort(port).withPathBuilder(function (pb) {
 				pb.withLiteralParameter('portfolios', 'portfolios').withVariableParameter('portfolio', 'portfolio', 'portfolio', false);
-			}).withBody('portfolio').withRequestInterceptor(RequestInterceptor.fromDelegate(updatePortfolioRequestInterceptor)).withRequestInterceptor(requestInterceptorToUse).withResponseInterceptor(responseInterceptorForPortfolioDeserialization).withErrorInterceptor(ErrorInterceptor.GENERAL).endpoint;
+			}).withBody('portfolio').withRequestInterceptor(RequestInterceptor.PLAIN_TEXT_RESPONSE).withRequestInterceptor(RequestInterceptor.fromDelegate(updatePortfolioRequestInterceptor)).withRequestInterceptor(requestInterceptorToUse).withResponseInterceptor(responseInterceptorForPortfolioDeserialization).withErrorInterceptor(ErrorInterceptor.GENERAL).endpoint;
 
 			_this._deletePortfolioEndpoint = EndpointBuilder.for('delete-portfolio', 'delete portfolios').withVerb(VerbType.DELETE).withProtocol(protocolType).withHost(host).withPort(port).withPathBuilder(function (pb) {
 				pb.withLiteralParameter('portfolios', 'portfolios').withVariableParameter('portfolio', 'portfolio', 'portfolio', false);
@@ -201,10 +201,6 @@ module.exports = function () {
 				qb.withVariableParameter('frame', 'frame', 'frame', true).withVariableParameter('periods', 'periods', 'periods', true);
 			}).withRequestInterceptor(requestInterceptorToUse).withRequestInterceptor(RequestInterceptor.PLAIN_TEXT_RESPONSE).withResponseInterceptor(responseInterceptorForPositionSummaryDeserialization).withErrorInterceptor(ErrorInterceptor.GENERAL).endpoint;
 
-			_this._deletePortfoliosEndpoint = EndpointBuilder.for('delete-portfolio', 'delete portfolios').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);
-			}).withRequestInterceptor(requestInterceptorToUse).withErrorInterceptor(ErrorInterceptor.GENERAL).endpoint;
-
 			_this._readTransactionsEndpoint = EndpointBuilder.for('read-transactions', 'read transactions').withVerb(VerbType.GET).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) {
@@ -474,8 +470,7 @@ module.exports = function () {
 
 						code = transaction.type;
 					} else {
-						assert.argumentIsRequired(transaction.type, 'transaction.type', Object);
-						assert.argumentIsRequired(transaction.type.code, 'transaction.type.code', String);
+						assert.argumentIsRequired(transaction.type, 'transaction.type', TransactionType, 'TransactionType');
 
 						code = transaction.type.code;
 					}
@@ -636,9 +631,7 @@ module.exports = function () {
 	};
 
 	var updatePortfolioRequestInterceptor = function updatePortfolioRequestInterceptor(request) {
-		return FailureReason.validateSchema(PortfolioSchema.UPDATE, request.data.portfolioData).then(function () {
-			request.data = request.data.portfolioData;
-
+		return FailureReason.validateSchema(PortfolioSchema.UPDATE, request.data).then(function () {
 			return Promise.resolve(request);
 		}).catch(function (e) {
 			console.error('Error serializing data to create a portfolio', e);
@@ -651,7 +644,7 @@ module.exports = function () {
 		try {
 			return JSON.parse(response.data, PortfolioSchema.CLIENT.schema.getReviver());
 		} catch (e) {
-			console.log('Error deserializing positions', e);
+			console.log('Error deserializing portfolios', e);
 		}
 	});
 
@@ -1011,7 +1004,7 @@ module.exports = function () {
 	return {
 		JwtGateway: JwtGateway,
 		PortfolioGateway: PortfolioGateway,
-		version: '1.1.24'
+		version: '1.1.27'
 	};
 }();
 

package/lib/gateway/PortfolioGateway.js

@@ -77,6 +77,7 @@ module.exports = (() => {
 					pb.withLiteralParameter('portfolios', 'portfolios');
 				})
 				.withBody('portfolio')
+				.withRequestInterceptor(RequestInterceptor.PLAIN_TEXT_RESPONSE)
 				.withRequestInterceptor(RequestInterceptor.fromDelegate(createPortfolioRequestInterceptor))
 				.withRequestInterceptor(requestInterceptorToUse)
 				.withResponseInterceptor(responseInterceptorForPortfolioDeserialization)
@@ -93,6 +94,7 @@ module.exports = (() => {
 						.withVariableParameter('portfolio', 'portfolio', 'portfolio', false);
 				})
 				.withBody('portfolio')
+				.withRequestInterceptor(RequestInterceptor.PLAIN_TEXT_RESPONSE)
 				.withRequestInterceptor(RequestInterceptor.fromDelegate(updatePortfolioRequestInterceptor))
 				.withRequestInterceptor(requestInterceptorToUse)
 				.withResponseInterceptor(responseInterceptorForPortfolioDeserialization)
@@ -153,21 +155,6 @@ module.exports = (() => {
 				.withErrorInterceptor(ErrorInterceptor.GENERAL)
 				.endpoint;
 
-			this._deletePortfoliosEndpoint = EndpointBuilder.for('delete-portfolio', 'delete portfolios')
-				.withVerb(VerbType.DELETE)
-				.withProtocol(protocolType)
-				.withHost(host)
-				.withPort(port)
-				.withPathBuilder((pb) => {
-					pb.withLiteralParameter('portfolios', 'portfolios')
-						.withVariableParameter('portfolio', 'portfolio', 'portfolio', false)
-						.withLiteralParameter('positions', 'positions')
-						.withVariableParameter('position', 'position', 'position', false);
-				})
-				.withRequestInterceptor(requestInterceptorToUse)
-				.withErrorInterceptor(ErrorInterceptor.GENERAL)
-				.endpoint;
-
 			this._readTransactionsEndpoint = EndpointBuilder.for('read-transactions', 'read transactions')
 				.withVerb(VerbType.GET)
 				.withProtocol(protocolType)
@@ -456,8 +443,7 @@ module.exports = (() => {
 
 						code = transaction.type;
 					} else {
-						assert.argumentIsRequired(transaction.type, 'transaction.type', Object);
-						assert.argumentIsRequired(transaction.type.code, 'transaction.type.code', String);
+						assert.argumentIsRequired(transaction.type, 'transaction.type', TransactionType, 'TransactionType');
 
 						code = transaction.type.code;
 					}
@@ -588,8 +574,9 @@ module.exports = (() => {
 
 	const createPortfolioRequestInterceptor = (request) => {
 		return FailureReason.validateSchema(PortfolioSchema.CREATE, request.data)
-			.then(() => Promise.resolve(request))
-			.catch(e => {
+			.then(() => {
+				return Promise.resolve(request)
+			}).catch(e => {
 				console.error('Error serializing data to create a portfolio', e);
 
 				return Promise.reject();
@@ -597,13 +584,10 @@ module.exports = (() => {
 	};
 
 	const updatePortfolioRequestInterceptor = (request) => {
-		return FailureReason.validateSchema(PortfolioSchema.UPDATE, request.data.portfolioData)
+		return FailureReason.validateSchema(PortfolioSchema.UPDATE, request.data)
 			.then(() => {
-				request.data = request.data.portfolioData;
-
 				return Promise.resolve(request);
-			})
-			.catch(e => {
+			}).catch(e => {
 				console.error('Error serializing data to create a portfolio', e);
 
 				return Promise.reject();
@@ -614,7 +598,7 @@ module.exports = (() => {
 		try {
 			return JSON.parse(response.data, PortfolioSchema.CLIENT.schema.getReviver());
 		} catch (e) {
-			console.log('Error deserializing positions', e);
+			console.log('Error deserializing portfolios', e);
 		}
 	});
 

package/lib/index.js

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

package/package.json

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