diff --git a/ais-structure/src/modules/helper/log.js b/ais-structure/src/modules/helper/log.js index 5fa54bd..a08d9d0 100644 --- a/ais-structure/src/modules/helper/log.js +++ b/ais-structure/src/modules/helper/log.js @@ -47,35 +47,35 @@ logger.log = function (msg,type) console.log(msg); } -logger.startlog = function (cmdData,rawData) +logger.startlog = function (cmdData,session,identity) { start = { - session : "Session", + session : session, cmd : cmdData, - identity : "Identity" + identity : identity }; } -logger.addSuccessSummary = function (nodeData,cmdData,resultData) +logger.addSuccessSummary = function (nodeData,cmdData,resultCode,developerMessage) { summary = { node : nodeData, cmd : cmdData, - resultCode : resultData.resultCode, - resultDesc : resultData.developerMessage, + resultCode : resultCode, + resultDesc : developerMessage, type : "success" }; summaryList.push(summary); // console.log(summary); } -logger.addErrorSummary = function (nodeData,cmdData,resultData) +logger.addErrorSummary = function (nodeData,cmdData,resultCode,developerMessage) { summary = { node : nodeData, cmd : cmdData, - resultCode : resultData.resultCode, - resultDesc : resultData.developerMessage, + resultCode : resultCode, + resultDesc : developerMessage, type : "error" }; summaryList.push(summary); diff --git a/ais-structure/src/modules/vizcard/vizCard.ctrl.js b/ais-structure/src/modules/vizcard/vizCard.ctrl.js index a757c80..f8b3fe1 100644 --- a/ais-structure/src/modules/vizcard/vizCard.ctrl.js +++ b/ais-structure/src/modules/vizcard/vizCard.ctrl.js @@ -10,22 +10,24 @@ var constant = require('../helper/constants.js') exports.vizcard = async function (req, res, next) { var getCmd = "VIZCard"; - var sendCmd = "SearchCustomer" - var sacf = "SACF" + var sendCmd = "SearchCustomer"; + var sacf = "SACF"; + var method = constant.METHOD.GET; - log.startlog(getCmd,req); - log.logDetail.addInput(sacf,getCmd,constant.REQUEST,req,req.body); + log.startlog(method+"_"+getCmd,req.query.commandId,null); + log.logDetail.addInput(sacf,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"); 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 = { Username : "axviz", Password : "1234", @@ -53,21 +55,22 @@ exports.vizcard = async function (req, res, next) { stats.receiveSACFResponse(sacf,sendCmd,"Success"); var response = responseMsg.success(req,getCmd,{resultData:resultSet.returnData,rowCount:resultSet.returnData.length}); - log.addSuccessSummary(sacf,sendCmd,response); - // log.addErrorSummary("ABCD","EFGH",{resultCode : '50000',developerMessage : "error"}); - } - catch(error) { + log.addSuccessSummary(sacf,method+"_"+sendCmd,response.resultCode,response.developerMessage); + } + catch(error) { result.response = constant.RESPONSERESULT.ERROR stats.receiveSACFBadResponse(sacf,sendCmd); response = responseMsg.direct(req,getCmd,result.response); - log.addErrorSummary(sacf,sendCmd,response); + log.addErrorSummary(sacf,method+"_"+sendCmd,response.resultCode,response.developerMessage); var resultSet = {rawDataJson : ""} - } + } } else { + stats.receiveSACFResponse(sacf,sendCmd,"Error"); response = responseMsg.direct(req,getCmd,result.response); + log.addErrorSummary(sacf,method+"_"+sendCmd,response.resultCode,response.developerMessage); var resultSet = {rawDataJson : ""} } @@ -88,8 +91,8 @@ exports.vizcard = async function (req, res, next) { function validator(req,cmd) { var list = []; - // list.push([true,"queryStr","commandId","int"]); - // list.push([true,"queryStr","firstName","string"]); + list.push([true,"queryStr","commandId","int"]); + list.push([true,"queryStr","clientName","string"]); // list.push([true,"queryStr","lastName","string"]); // list.push([true,"queryStr","emailAddress","string"]); // list.push([true,"queryStr","mobileNo","string"]); -- libgit2 0.21.2