diff --git a/ais-structure/src/modules/customer/customer.ctrl.js b/ais-structure/src/modules/customer/customer.ctrl.js index db097fb..bf1bb1b 100644 --- a/ais-structure/src/modules/customer/customer.ctrl.js +++ b/ais-structure/src/modules/customer/customer.ctrl.js @@ -10,22 +10,32 @@ exports.customer = async function (req, res, next) { var sendCmd = "Customer"; var sacf = "SACF"; var d01 = "D01" - - log.startlog(getCmd,req); - log.logDetail.addInput(sacf,getCmd,constant.REQUEST,req,req.body); + 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){ + var customerId = req.params.userData+"@"+req.params.userType + } else { + var customerId = req.query.clientName+"@"+req.query.commandId; + } + + log.startlog(method+"_"+getCmd,req.query.commandId,customerId); + log.logDetail.addInput(req.query.clientName,getCmd,constant.REQUEST,req,req.body); + if(err.length > 0) { + log.addErrorSummary(req.query.clientName,method+"_"+getCmd,"null","Fail"); log.log(err,'error'); var response = responseMsg.error(req,getCmd,40300); // res.status(200).json(response); }else { + log.addSuccessSummary(req.query.clientName,method+"_"+getCmd,"null","Success"); var objectData = req.query; - - const result = await connection.requestJsonToD01(objectData,sendCmd,constant.METHOD.GET); + const result = await connection.requestJsonToD01(objectData,sendCmd,method); // console.log(Object.keys(result)) log.logDetail.addInput(d01,sendCmd,constant.RESPONSE,result,result.response); if(typeof result.err === 'undefined'){ @@ -35,28 +45,29 @@ exports.customer = async function (req, res, next) { { if(resultObj.resultData && resultObj.resultData.length>0) { - stats.receiveRestResponse(d01,constant.METHOD.GET,sendCmd,"Success"); + stats.receiveRestResponse(d01,method,sendCmd,"Success"); var response = responseMsg.success(req,getCmd,resultObj); - log.addSuccessSummary(d01,sendCmd,response); + log.addSuccessSummary(d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); }else { - stats.receiveRestResponse(d01,constant.METHOD.GET,sendCmd,"Data Not Found"); + stats.receiveRestResponse(d01,method,sendCmd,"Data Not Found"); var response = responseMsg.error(req,getCmd,40300); - log.addErrorSummary(d01,sendCmd,response); + log.addErrorSummary(d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); } } } else { + stats.receiveRestResponse(d01,method,sendCmd,"Error"); response = responseMsg.direct(req,getCmd,result.response); - log.addErrorSummary(d01,sendCmd,response); + log.addErrorSummary(d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); } } if(!response){ var response = responseMsg.error(req,getCmd,50000); - stats.receiveResponse(sacf,sendCmd,"Error"); + stats.receiveRestResponse(d01,method,sendCmd,"Error"); } - log.logDetail.addOutput(sacf,getCmd,constant.RESPONSE,response,response); + log.logDetail.addOutput(req.query.clientName,getCmd,constant.RESPONSE,response,response); res.status(200).json(response); next(); }; @@ -65,17 +76,18 @@ exports.customer = async function (req, res, next) { function validator(req,api) { var list = []; - // list.push([true,"queryStr","commandId","String"]); + list.push([true,"queryStr","commandId","String"]); + list.push([true,"queryStr","clientName","String"]); var err = validatorHelper(req,list,api) - if((typeof req.query["userType"] !== 'undefined') && (typeof req.query["userData"] === 'undefined')) - { - var errDes = { - Param : "userData", - Reason : "Missing" - } - err.push(errDes); - } + // if((typeof req.query["userType"] !== 'undefined') && (typeof req.query["userData"] === 'undefined')) + // { + // var errDes = { + // Param : "userData", + // Reason : "Missing" + // } + // err.push(errDes); + // } if(err.length > 0) stats.receiveBadRequest(req.method,api); diff --git a/ais-structure/src/modules/helper/log.js b/ais-structure/src/modules/helper/log.js index a08d9d0..f2b9d4f 100644 --- a/ais-structure/src/modules/helper/log.js +++ b/ais-structure/src/modules/helper/log.js @@ -59,7 +59,7 @@ logger.startlog = function (cmdData,session,identity) logger.addSuccessSummary = function (nodeData,cmdData,resultCode,developerMessage) { summary = { - node : nodeData, + node : undefinedToNull(nodeData), cmd : cmdData, resultCode : resultCode, resultDesc : developerMessage, @@ -72,7 +72,7 @@ logger.addSuccessSummary = function (nodeData,cmdData,resultCode,developerMessag logger.addErrorSummary = function (nodeData,cmdData,resultCode,developerMessage) { summary = { - node : nodeData, + node : undefinedToNull(nodeData), cmd : cmdData, resultCode : resultCode, resultDesc : developerMessage, @@ -119,7 +119,7 @@ var addlogDetailData = function(inputType,node,cmd,type,rawData,data){ } detail.input = { - node : node, + node : undefinedToNull(node), cmd : cmd, type : type, rawData : raw, @@ -131,7 +131,7 @@ var addlogDetailData = function(inputType,node,cmd,type,rawData,data){ else if(inputType == 'output') { detail.output = { - node : node, + node : undefinedToNull(node), cmd : cmd, type : type, rawData : rawData, @@ -160,6 +160,16 @@ var logDetailData = { logger.logDetail = logDetailData; +var undefinedToNull = function(data){ + if(!data){ + data = 'null'; + } else { + data = data; + } + + return data; +} + diff --git a/ais-structure/src/modules/vizcard/vizCard.ctrl.js b/ais-structure/src/modules/vizcard/vizCard.ctrl.js index f8b3fe1..fdcc7a6 100644 --- a/ais-structure/src/modules/vizcard/vizCard.ctrl.js +++ b/ais-structure/src/modules/vizcard/vizCard.ctrl.js @@ -14,8 +14,10 @@ exports.vizcard = async function (req, res, next) { var sacf = "SACF"; var method = constant.METHOD.GET; - log.startlog(method+"_"+getCmd,req.query.commandId,null); - log.logDetail.addInput(sacf,method+"_"+getCmd,constant.REQUEST,req,req.body); + var customerId = req.query.clientName+"@"+req.query.commandId; + + log.startlog(method+"_"+getCmd,req.query.commandId,customerId); + log.logDetail.addInput(req.query.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body); var err = validator(req,getCmd); @@ -40,8 +42,7 @@ exports.vizcard = async function (req, res, next) { moblieNo : req.query.moblieNo }; - const result = await connection.requestSoapToSACF(objectData,sendCmd,constant.METHOD.POST - ); + const result = await connection.requestSoapToSACF(objectData,sendCmd,constant.METHOD.POST); // console.log(result.err) if(typeof result.err === 'undefined'){ -- libgit2 0.21.2