From a55a3d023dde851cbd15615a116f0b84ba951ae7 Mon Sep 17 00:00:00 2001 From: Nattapon Wongpaet Date: Wed, 22 Aug 2018 15:42:48 +0700 Subject: [PATCH] update post customer and get customer --- ais-structure/src/modules/customer/customer.ctrl.js | 17 +++++++++-------- ais-structure/src/modules/customer/postCustomer.ctrl.js | 42 +++++++++++++++++++++++++++--------------- ais-structure/src/modules/helper/connection.js | 16 +++++++--------- ais-structure/src/modules/helper/log.js | 3 ++- ais-structure/src/modules/vizcard/vizCard.ctrl.js | 4 ++-- 5 files changed, 47 insertions(+), 35 deletions(-) diff --git a/ais-structure/src/modules/customer/customer.ctrl.js b/ais-structure/src/modules/customer/customer.ctrl.js index 6a6a253..d9c2f7b 100644 --- a/ais-structure/src/modules/customer/customer.ctrl.js +++ b/ais-structure/src/modules/customer/customer.ctrl.js @@ -23,9 +23,10 @@ exports.customer = async function (req, res, next) { }else { var objectData = req.query; - log.logDetail.addOutput(d01,sendCmd,"Request",req.url,req.body); + const result = await connection.requestJsonToD01(objectData,sendCmd,"GET"); - log.logDetail.addInput(d01,sendCmd,"Response",result,result.resultData); + // console.log(Object.keys(result)) + log.logDetail.addInput(d01,sendCmd,"Response",result,result.response); if(typeof result.err === 'undefined'){ // console.log(result.response); var resultObj = result.response; @@ -35,17 +36,17 @@ exports.customer = async function (req, res, next) { { stats.receiveRestResponse(d01,"GET",sendCmd,"Success"); var response = responseMsg.success(req,getCmd,resultObj); - log.addSuccessSummary(sacf,sendCmd,response); + log.addSuccessSummary(d01,sendCmd,response); }else { stats.receiveRestResponse(d01,"GET",sendCmd,"Data Not Found"); var response = responseMsg.error(req,getCmd,40300); - log.addErrorSummary(sacf,sendCmd,response); + log.addErrorSummary(d01,sendCmd,response); } } } else { response = responseMsg.direct(req,getCmd,result.response); - log.addErrorSummary(sacf,sendCmd,response); + log.addErrorSummary(d01,sendCmd,response); } } @@ -76,10 +77,10 @@ function validator(req,api) } if(err.length > 0) - stats.receiveRequest(req.method,api,false); + stats.receiveBadRequest(req.method,api); else - stats.receiveRequest(req.method,api,true); - + stats.receiveRequest(req.method,api); + return err; } diff --git a/ais-structure/src/modules/customer/postCustomer.ctrl.js b/ais-structure/src/modules/customer/postCustomer.ctrl.js index 16a47eb..16b873e 100644 --- a/ais-structure/src/modules/customer/postCustomer.ctrl.js +++ b/ais-structure/src/modules/customer/postCustomer.ctrl.js @@ -2,14 +2,19 @@ var stats = require('../helper/stats.js'); var validatorHelper = require('../helper/validator.js'); var connection = require('../helper/connection.js'); var responseMsg = require('../helper/responseMsg.js'); +var log = require('../helper/log.js'); exports.postCustomer = async function (req, res, next){ var getCmd = "Customer"; var sendCmd = "Customer"; + var sacf = "SACF"; + var d01 = "D01"; + + log.startlog(getCmd,req); + log.logDetail.addInput(sacf,getCmd,"Request",req,req.body); var err = validator(req,getCmd); - if(err.length > 0) { console.log(err); @@ -27,30 +32,38 @@ exports.postCustomer = async function (req, res, next){ dateCreated : req.body.dateCreated }; - const result = await connection.requestJsonToD01(objectData,sendCmd,"POST"); - + log.logDetail.addInput(d01,sendCmd,"Response",result,result.response); if(typeof result.err === 'undefined'){ // console.log(result.response.body); var resultObj = result.response; - if(resultObj.resultCode.startsWith("40")) + if(resultObj.resultCode.startsWith("2")) { - if(resultObj.resultCode != "40401") - resultObj.resultCode = "50000"; - - + stats.receiveRestResponse(d01,"POST",sendCmd,"Success"); + var response = responseMsg.direct(req,getCmd,resultObj,{customerId:objectData.customerId}); + log.addSuccessSummary(d01,sendCmd,response); + } else { + if(resultObj.resultCode != "40401"){ + resultObj.resultCode = "50000"; + } + stats.receiveRestResponse(d01,"GET",sendCmd,"Error"); + var response = responseMsg.direct(req,getCmd,resultObj); + log.addErrorSummary(d01,sendCmd,response); } - - var response = responseMsg.direct(req,getCmd,resultObj,{customerId:objectData.customerId}); } else { response = responseMsg.direct(req,getCmd,result.response); + log.addErrorSummary(d01,sendCmd,response); } } - if(!response) + if(!response){ var response = responseMsg.error(req,getCmd,50000); + stats.receiveResponse(sacf,sendCmd,"Error"); + } + log.logDetail.addOutput(sacf,getCmd,"Response",response,response); res.status(200).json(response); + next(); }; function validator(req,api) @@ -67,11 +80,10 @@ function validator(req,api) list.push([true,"body","emailAddress","string"]); var err = validatorHelper(req,list,api) - - if(err.length > 0) - stats.reciveRequest(req.method,api,false); + if(err.length > 0) + stats.receiveBadRequest(req.method,api); else - stats.reciveRequest(req.method,api,true); + stats.receiveRequest(req.method,api); return err; } \ No newline at end of file diff --git a/ais-structure/src/modules/helper/connection.js b/ais-structure/src/modules/helper/connection.js index 0b29fb5..0bb109b 100644 --- a/ais-structure/src/modules/helper/connection.js +++ b/ais-structure/src/modules/helper/connection.js @@ -18,7 +18,7 @@ connection.requestSoapToSACF = async function (soap,cmd,myMethod) { } stats.sendSACFRequest(cfg.service.SACF.Name,cmd) - log.logDetail.addOutput(cfg.service.SACF.Name,cmd,"Request",params.body,soap); + log.logDetail.addOutput(cfg.service.SACF.Name,cmd,"Request",params,soap); var result = await asyncRequest(params,cmd,cfg.service.SACF.Name); @@ -57,6 +57,8 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { timeout : service[myMethod+"_"+cmd+"_Timeout"]*1000 } + log.logDetail.addOutput(service.Name,cmd,"Request",params,params.body); + var result = {}; result.response = {}; result.response.resultData = []; @@ -120,12 +122,12 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { params.url = genUrl[0]; delete params.body; - var result = await asyncRequest(params,cmd,service.Name); + var resultRes = await asyncRequest(params,cmd,service.Name); // console.log(result); - if(result.response) + if(resultRes.response) { - var data = JSON.parse(result.response.body); + var data = JSON.parse(resultRes.response.body); result.response = data; } @@ -139,7 +141,7 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { var resultRes = await asyncRequest(params,cmd,service.Name); result.response = JSON.parse(resultRes.body); - + } // console.log(result); @@ -183,11 +185,7 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { stats.receiveResponse(service.Name,cmd,"Error"); } - - - } - return result; diff --git a/ais-structure/src/modules/helper/log.js b/ais-structure/src/modules/helper/log.js index 1051e56..dadff3d 100644 --- a/ais-structure/src/modules/helper/log.js +++ b/ais-structure/src/modules/helper/log.js @@ -117,7 +117,8 @@ var addlogDetailData = function(inputType,node,cmd,type,rawData,data){ var raw = { body : rawData.body, query : rawData.query, - params : rawData.params + params : rawData.params, + response : rawData.response }; } else { var raw = { diff --git a/ais-structure/src/modules/vizcard/vizCard.ctrl.js b/ais-structure/src/modules/vizcard/vizCard.ctrl.js index 097f548..512e6f4 100644 --- a/ais-structure/src/modules/vizcard/vizCard.ctrl.js +++ b/ais-structure/src/modules/vizcard/vizCard.ctrl.js @@ -96,9 +96,9 @@ function validator(req,cmd) var err = validatorHelper(req,list); if(err.length > 0) - stats.receiveRequest(req.method,cmd,false); + stats.receiveBadRequest(req.method,cmd); else - stats.receiveRequest(req.method,cmd,true); + stats.receiveRequest(req.method,cmd); return err; } -- libgit2 0.21.2