From 3cac963611f8269cb51506aa526e116e2780af82 Mon Sep 17 00:00:00 2001 From: Nattapon Wongpaet Date: Mon, 20 Aug 2018 17:27:09 +0700 Subject: [PATCH] update post customer --- ais-structure/src/modules/customer/customer.route.js | 2 +- ais-structure/src/modules/customer/postCustomer.ctrl.js | 3 +-- ais-structure/src/modules/helper/connection.js | 26 ++++++++++++++++++-------- ais-structure/src/modules/helper/responseMsg.js | 2 +- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/ais-structure/src/modules/customer/customer.route.js b/ais-structure/src/modules/customer/customer.route.js index 0624229..bd6097c 100644 --- a/ais-structure/src/modules/customer/customer.route.js +++ b/ais-structure/src/modules/customer/customer.route.js @@ -2,7 +2,7 @@ module.exports = function (app) { var customerCtrl = app.modules.customer.customerCtrl; var postCustomerCtrl = app.modules.customer.postCustomerCtrl; - app.get('/cmf/v2/customer/customerId.json', + app.get('/cmf/v2/customer.json', customerCtrl.customer ); diff --git a/ais-structure/src/modules/customer/postCustomer.ctrl.js b/ais-structure/src/modules/customer/postCustomer.ctrl.js index e56290d..79d129b 100644 --- a/ais-structure/src/modules/customer/postCustomer.ctrl.js +++ b/ais-structure/src/modules/customer/postCustomer.ctrl.js @@ -32,8 +32,7 @@ exports.postCustomer = async function (req, res, next){ if(typeof result.err === 'undefined'){ // console.log(result.response.body); - var resultObj = JSON.parse(result.response.body); - + var resultObj = result.response; if(resultObj.resultCode.startsWith("40")) { if(resultObj.resultCode != "40401") diff --git a/ais-structure/src/modules/helper/connection.js b/ais-structure/src/modules/helper/connection.js index 2a4b6a3..c76efac 100644 --- a/ais-structure/src/modules/helper/connection.js +++ b/ais-structure/src/modules/helper/connection.js @@ -26,6 +26,10 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { method : myMethod } + var result = {}; + result.response = {}; + result.response.resultData = []; + if(params.method == "GET") { var genUrl = getUrl(params); @@ -63,10 +67,6 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { } - var result = {}; - result.response = {}; - result.response.resultData = []; - for (var i = 0; i < multiSend.length; i++) { result.response.resultData = result.response.resultData.concat(dataRes[i].data); @@ -107,11 +107,22 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { }else if(params.method == "POST") { params.body = JSON.stringify(params.body); + + var resultRes = await asyncRequest(params,cmd,cfg.service.D01.Name); + resultRes.body = JSON.parse(resultRes.body) + + if(resultRes.body.resultCode === "20000"){ + result.response.resultCode = resultRes.body.resultCode; + result.response.developerMessage = "Success"; + } else { + result.response.resultCode = "50000"; + result.response.developerMessage = "System error"; + } } - - delete result.body; - // console.log(result); + // console.log(result); + // delete result.body; + return result; @@ -140,7 +151,6 @@ async function parallelRequest(multiParams,cmd,node) function asyncRequest (params = {},cmd,node) { - // console.log("Start : "+new Date().toISOString()); return new Promise((resolve, reject) => { request(params, function (error, response, body) { diff --git a/ais-structure/src/modules/helper/responseMsg.js b/ais-structure/src/modules/helper/responseMsg.js index 6c43780..39c035d 100644 --- a/ais-structure/src/modules/helper/responseMsg.js +++ b/ais-structure/src/modules/helper/responseMsg.js @@ -43,7 +43,7 @@ responseMsg.direct = function (req,cmd,result,data) { var response = { resultCode : result.resultCode, - developerMessage : result.resultDescription + developerMessage : result.developerMessage }; -- libgit2 0.21.2