From 4e9d5089087d01b9c38f183c0e701772dfa80674 Mon Sep 17 00:00:00 2001 From: Simon Legg Date: Wed, 20 Jun 2018 18:12:31 +0100 Subject: [PATCH 1/4] =?UTF-8?q?increase=20logs=20in=20getLicences=20functi?= =?UTF-8?q?on=20=20=F0=9F=90=BF=20v2.5.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/accessLicenceClient.js | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/lib/accessLicenceClient.js b/lib/accessLicenceClient.js index 241a301..09d2a57 100644 --- a/lib/accessLicenceClient.js +++ b/lib/accessLicenceClient.js @@ -22,16 +22,25 @@ function getLicences (query) { log.debug({operation, query: JSON.stringify(query)}); if (query.adminuserid || query.linkid || query.linktype || query.status || query.userid) { - const queryString = helpers.createParams(query); - const url = `${config.API_GATEWAY_HOST}/licences${queryString}`; - return fetch(url, Object.assign({}, options)) - .then(res => helpers.parseJsonRes(res, `${operation} ${queryString}`)) - .then(res => { - log.debug({operation, queryString, res: 'success'}); - return res.accessLicences; - }); + const error = new Error('At least one of adminuserid | linkid | linktype | status | userid must be specified'); + return Promise.reject(error); } - return Promise.reject(Error('At least one of adminuserid | linkid | linktype | status | userid must be specified')); + + const queryString = helpers.createParams(query); + const url = `${config.API_GATEWAY_HOST}/licences${queryString}`; + + log.info({operation, msg: 'Requesting licences user administrates form Access Licence Service', url }); + + return fetch(url, options) + .then(res => { + log.info({ operation, msg: `Recieved status ${res.status} from Access Licence Service` }); + const message = `${operation} ${queryString}`; + return helpers.parseJsonRes(res, message); + }) + .then(res => { + log.info({ operation, queryString, res: 'success', status: res.status }); + return res.accessLicences; + }); } /** From ccc492df022afb6b5fca2942b3abae0901cfe633 Mon Sep 17 00:00:00 2001 From: Simon Legg Date: Wed, 20 Jun 2018 18:19:22 +0100 Subject: [PATCH 2/4] log response --- lib/accessLicenceClient.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/accessLicenceClient.js b/lib/accessLicenceClient.js index 09d2a57..c6e22e4 100644 --- a/lib/accessLicenceClient.js +++ b/lib/accessLicenceClient.js @@ -38,7 +38,7 @@ function getLicences (query) { return helpers.parseJsonRes(res, message); }) .then(res => { - log.info({ operation, queryString, res: 'success', status: res.status }); + log.info({ operation, queryString, status: res.status, res: JSON.stringify(res) }); return res.accessLicences; }); } From 5d52d610ef98fbc975601ccb8cfeba47bf54ddd8 Mon Sep 17 00:00:00 2001 From: Simon Legg Date: Wed, 20 Jun 2018 18:21:27 +0100 Subject: [PATCH 3/4] =?UTF-8?q?correct=20if=20statement=20=20=F0=9F=90=BF?= =?UTF-8?q?=20v2.5.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/accessLicenceClient.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/accessLicenceClient.js b/lib/accessLicenceClient.js index c6e22e4..ddf6bc6 100644 --- a/lib/accessLicenceClient.js +++ b/lib/accessLicenceClient.js @@ -21,7 +21,7 @@ function getLicences (query) { const operation = 'accessLicenceClient.getLicences'; log.debug({operation, query: JSON.stringify(query)}); - if (query.adminuserid || query.linkid || query.linktype || query.status || query.userid) { + if (!(query.adminuserid || query.linkid || query.linktype || query.status || query.userid)) { const error = new Error('At least one of adminuserid | linkid | linktype | status | userid must be specified'); return Promise.reject(error); } From d82ee42a74880f8219abf1bdf41d7a4f4060440a Mon Sep 17 00:00:00 2001 From: Simon Legg Date: Wed, 20 Jun 2018 19:01:37 +0100 Subject: [PATCH 4/4] =?UTF-8?q?clone=20options=20because=20eager-fetch=20m?= =?UTF-8?q?utates=20it=20breaking=20later=20tests=20=20=F0=9F=90=BF=20v2.5?= =?UTF-8?q?.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/accessLicenceClient.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/accessLicenceClient.js b/lib/accessLicenceClient.js index ddf6bc6..ab018a3 100644 --- a/lib/accessLicenceClient.js +++ b/lib/accessLicenceClient.js @@ -31,7 +31,7 @@ function getLicences (query) { log.info({operation, msg: 'Requesting licences user administrates form Access Licence Service', url }); - return fetch(url, options) + return fetch(url, Object.assign({}, options)) .then(res => { log.info({ operation, msg: `Recieved status ${res.status} from Access Licence Service` }); const message = `${operation} ${queryString}`;