diff --git a/ais-structure/src/modules/customer/customer.ctrl.js b/ais-structure/src/modules/customer/customer.ctrl.js index bf1bb1b..7436bf4 100644 --- a/ais-structure/src/modules/customer/customer.ctrl.js +++ b/ais-structure/src/modules/customer/customer.ctrl.js @@ -12,8 +12,6 @@ exports.customer = async function (req, res, next) { var d01 = "D01" var method = constant.METHOD.GET - var err = validator(req,getCmd); - if(req.params.customerId){ var customerId = req.params.customerId } else if(req.params.userData && req.params.userType){ @@ -23,7 +21,9 @@ exports.customer = async function (req, res, next) { } log.startlog(method+"_"+getCmd,req.query.commandId,customerId); - log.logDetail.addInput(req.query.clientName,getCmd,constant.REQUEST,req,req.body); + log.logDetail.addInput(req.query.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body); + + var err = validator(req,getCmd); if(err.length > 0) { @@ -37,7 +37,7 @@ exports.customer = async function (req, res, next) { var objectData = req.query; const result = await connection.requestJsonToD01(objectData,sendCmd,method); // console.log(Object.keys(result)) - log.logDetail.addInput(d01,sendCmd,constant.RESPONSE,result,result.response); + log.logDetail.addInput(d01,method+"_"+sendCmd,constant.RESPONSE,result,result.response); if(typeof result.err === 'undefined'){ // console.log(result.response); var resultObj = result.response; @@ -56,18 +56,12 @@ exports.customer = async function (req, res, next) { } } } else { - stats.receiveRestResponse(d01,method,sendCmd,"Error"); - response = responseMsg.direct(req,getCmd,result.response); + var response = responseMsg.direct(req,getCmd,result.response); log.addErrorSummary(d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); } } - if(!response){ - var response = responseMsg.error(req,getCmd,50000); - stats.receiveRestResponse(d01,method,sendCmd,"Error"); - } - - log.logDetail.addOutput(req.query.clientName,getCmd,constant.RESPONSE,response,response); + log.logDetail.addOutput(req.query.clientName,method+"_"+getCmd,constant.RESPONSE,response,response); res.status(200).json(response); next(); }; diff --git a/ais-structure/src/modules/customer/postCustomer.ctrl.js b/ais-structure/src/modules/customer/postCustomer.ctrl.js index 8ee484a..4345e92 100644 --- a/ais-structure/src/modules/customer/postCustomer.ctrl.js +++ b/ais-structure/src/modules/customer/postCustomer.ctrl.js @@ -10,20 +10,27 @@ exports.postCustomer = async function (req, res, next){ var sendCmd = "Customer"; var sacf = "SACF"; var d01 = "D01"; + var method = constant.METHOD.POST; - log.startlog(getCmd,req); - log.logDetail.addInput(sacf,getCmd,constant.REQUEST,req,req.body); + if(req.params.userData && req.params.userType){ + var customerId = req.body.user.userData+"@"+req.body.user.userType; + } + + log.startlog(method+"_"+getCmd,req.body.commandId,customerId); + log.logDetail.addInput(req.body.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body); var err = validator(req,getCmd); if(err.length > 0) { + log.addErrorSummary(req.query.clientName,method+"_"+getCmd,"null","Fail"); console.log(err); var response = responseMsg.error(req,getCmd,40300); }else { + log.addSuccessSummary(req.query.clientName,method+"_"+getCmd,"null","Success"); var objectData = { - customerId : req.body.user.userData+"@"+req.body.user.userType, + customerId : customerId, userIdData : req.body.user.userData, userIdType : req.body.user.userType, firstName : req.body.firstName, @@ -34,7 +41,7 @@ exports.postCustomer = async function (req, res, next){ }; const result = await connection.requestJsonToD01(objectData,sendCmd,"POST"); - log.logDetail.addInput(d01,sendCmd,constant.RESPONSE,result,result.response); + log.logDetail.addInput(d01,method+"_"+sendCmd,constant.RESPONSE,result,result.response); if(typeof result.err === 'undefined'){ // console.log(result.response.body); var resultObj = result.response; @@ -42,27 +49,23 @@ exports.postCustomer = async function (req, res, next){ { stats.receiveRestResponse(d01,constant.METHOD.POST,sendCmd,"Success"); var response = responseMsg.direct(req,getCmd,resultObj,{customerId:objectData.customerId}); - log.addSuccessSummary(d01,sendCmd,response); + log.addSuccessSummary(d01,method+"_"+sendCmd,response); } else { if(resultObj.resultCode != "40401"){ resultObj.resultCode = "50000"; } stats.receiveRestResponse(d01,constant.METHOD.POST,sendCmd,"Error"); var response = responseMsg.direct(req,getCmd,resultObj); - log.addErrorSummary(d01,sendCmd,response); + log.addErrorSummary(d01,method+"_"+sendCmd,response); } } else { - response = responseMsg.direct(req,getCmd,result.response); - log.addErrorSummary(d01,sendCmd,response); + stats.receiveRestResponse(d01,constant.METHOD.POST,sendCmd,"Error"); + var response = responseMsg.direct(req,getCmd,result.response); + log.addErrorSummary(d01,method+"_"+sendCmd,response); } } - if(!response){ - var response = responseMsg.error(req,getCmd,50000); - stats.receiveResponse(sacf,sendCmd,"Error"); - } - - log.logDetail.addOutput(sacf,getCmd,constant.RESPONSE,response,response); + log.logDetail.addOutput(req.body.clientName,getCmd,constant.RESPONSE,response,response); res.status(200).json(response); next(); }; diff --git a/ais-structure/src/modules/helper/connection.js b/ais-structure/src/modules/helper/connection.js index 06d4dd1..1304bd2 100644 --- a/ais-structure/src/modules/helper/connection.js +++ b/ais-structure/src/modules/helper/connection.js @@ -31,12 +31,12 @@ connection.requestSoapToSACF = async function (soap,cmd,myMethod) { var funS = function(){ stats.sendSACFRequest(service.Name,cmd); - log.logDetail.addOutput(service.Name,cmd,constants.REQUEST,params,soap); + log.logDetail.addOutput(service.Name,myMethod+"_"+cmd,constants.REQUEST,params,soap); }; var funStats = { start : funS, - error : function(response){log.addErrorSummary(service.Name,cmd,response);} + error : function(response){log.addErrorSummary(service.Name,myMethod+"_"+cmd,response);} }; @@ -89,12 +89,12 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { var funStats = function(){ stats.sendRestRequest(service.Name,myMethod,cmd); - log.logDetail.addOutput(service.Name,cmd,constants.Request,params,obj); + log.logDetail.addOutput(service.Name,myMethod+"_"+cmd,constants.Request,params,obj); }; var funStats = { start : funStats, - error : function(response){log.addErrorSummary(service.Name,cmd,response);} + error : function(response){log.addErrorSummary(service.Name,myMethod+"_"+cmd,response);} }; @@ -165,7 +165,7 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { var resultRes = await asyncRequest(params,objectData,funStats); - console.log(resultRes); + // console.log(resultRes); if(resultRes.response) { var data = JSON.parse(resultRes.response.body); @@ -188,7 +188,7 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { } - console.log(result); + // console.log(result); if(result.response) { @@ -312,15 +312,15 @@ function getUrl(params,limit) if(key == "fields") fields = getFields(params.body.fields,first); else - filter = getfilter(filter,key,params.body[key]); + filter = getFilter(filter,key,params.body[key]); first = false; } if(first) - fields = "?limit="+limit; + fields += "?limit="+limit; else - fields = "&limit="+limit; + fields += "&limit="+limit; } @@ -375,7 +375,7 @@ function getUrl(params,limit) // console.log(filter); // console.log(fields); - // console.log(returnData); + console.log(returnData); return returnData; } @@ -394,7 +394,7 @@ function getFields(fields,first) return returnData; } -function getfilter(filter,key,data) +function getFilter(filter,key,data) { // console.log(key); diff --git a/ais-structure/src/modules/helper/responseMsg.js b/ais-structure/src/modules/helper/responseMsg.js index 8bf1859..d3dfba1 100644 --- a/ais-structure/src/modules/helper/responseMsg.js +++ b/ais-structure/src/modules/helper/responseMsg.js @@ -33,7 +33,7 @@ responseMsg.success = function (req,cmd,data){ var response = { resultCode : constants.RESPONSERESULT.SUCCESS.resultCode, - developerMessage : constants.RESPONSERESULT.SUCCESS.resultDescription, + developerMessage : constants.RESPONSERESULT.SUCCESS.developerMessage, resultData : data.resultData, rowCount : data.resultData.length }; diff --git a/ais-structure/src/modules/vizcard/vizCard.ctrl.js b/ais-structure/src/modules/vizcard/vizCard.ctrl.js index 9c16a8e..241fd13 100644 --- a/ais-structure/src/modules/vizcard/vizCard.ctrl.js +++ b/ais-structure/src/modules/vizcard/vizCard.ctrl.js @@ -75,18 +75,11 @@ exports.vizcard = async function (req, res, next) { var resultSet = {rawDataJson : ""} } - log.logDetail.addInput(sacf,sendCmd,constant.RESPONSE,result,resultSet.rawDataJson); - - if(!response){ - var response = responseMsg.error(req,getCmd,50000); - stats.receiveSACFResponse(sacf,sendCmd,"Error"); - } - - + log.logDetail.addInput(sacf,method+"_"+sendCmd,constant.RESPONSE,result,resultSet.rawDataJson); } // console.log(response); - log.logDetail.addOutput(sacf,getCmd,constant.RESPONSE,response,response); + log.logDetail.addOutput(sacf,method+"_"+getCmd,constant.RESPONSE,response,response); res.status(200).json(response); next(); }; -- libgit2 0.21.2