diff --git a/ais-structure/src/modules/customer/customer.ctrl.js b/ais-structure/src/modules/customer/customer.ctrl.js index 59a8a7b..daba487 100644 --- a/ais-structure/src/modules/customer/customer.ctrl.js +++ b/ais-structure/src/modules/customer/customer.ctrl.js @@ -35,6 +35,8 @@ exports.customer = async function (req, res, next) { var response = responseMsg.error(req,getCmd,40300); } } + } else { + response = responseMsg.direct(req,getCmd,result.response); } } diff --git a/ais-structure/src/modules/customer/postCustomer.ctrl.js b/ais-structure/src/modules/customer/postCustomer.ctrl.js index 2264b21..16a47eb 100644 --- a/ais-structure/src/modules/customer/postCustomer.ctrl.js +++ b/ais-structure/src/modules/customer/postCustomer.ctrl.js @@ -42,11 +42,13 @@ exports.postCustomer = async function (req, res, next){ } var response = responseMsg.direct(req,getCmd,resultObj,{customerId:objectData.customerId}); + } else { + response = responseMsg.direct(req,getCmd,result.response); } } if(!response) - var response = responseMsg.error(req,getCmd,5000); + var response = responseMsg.error(req,getCmd,50000); res.status(200).json(response); }; diff --git a/ais-structure/src/modules/helper/connection.js b/ais-structure/src/modules/helper/connection.js index d0808aa..6861b37 100644 --- a/ais-structure/src/modules/helper/connection.js +++ b/ais-structure/src/modules/helper/connection.js @@ -38,6 +38,8 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { result.response = {}; result.response.resultData = []; + stats.sendRestRequest(service.Name,myMethod,cmd); + if(params.method == "GET") { var genUrl = getUrl(params,service[myMethod+"_Limit"]); @@ -122,10 +124,10 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { if(result.response) { if(!result.response.resultCode) - result.err = "Miss resultCode"; + result.err = "Missing resultCode"; if(!result.response.resultDescription) - result.err = "Miss resultDescription"; + result.err = "Missing resultDescription"; } if(result.err) @@ -133,7 +135,34 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { result.response = {}; result.response.resultCode = "50000"; - // stats.reciveResponse(service.Name,cmd,"Error"); + //ETIMEDOUT = timeout + //ECONNREFUSED = servercode + + if(result.err.code == 'ETIMEDOUT'){ + result.response.resultCode = "50003"; + result.response.resultDescription = "Timeout"; + } else if(result.err.code == 'ECONNREFUSED'){ + result.response.resultCode = "50002"; + result.response.resultDescription = "Reject"; + } else { + if(result.err.indexOf("Missing") != -1){ + result.response.resultCode = "40300"; + result.response.resultDescription = result.err; + } else { + result.response.resultCode = "50000"; + result.response.resultDescription = "System error"; + } + } + + if(result.response.resultCode == "40300"){ + stats.receiveBadRestResponse(service.Name,params.method,cmd); + } else { + stats.reciveResponse(service.Name,cmd,"Error"); + } + + + + } diff --git a/ais-structure/src/modules/helper/log.js b/ais-structure/src/modules/helper/log.js index 22713b3..bd77b30 100644 --- a/ais-structure/src/modules/helper/log.js +++ b/ais-structure/src/modules/helper/log.js @@ -101,7 +101,12 @@ logger.logSummary = function (response) log.addErrorBlock(row.node,row.cmd,row.resultCode,row.resultDesc); } } - log.end(response.resultCode,response.developerMessage) + + if(response){ + log.end(response.resultCode,response.developerMessage) + } else { + log.end() + } } var addlogDetailData = function(inputType,node,cmd,type,rawData,data){ diff --git a/ais-structure/src/modules/helper/messageSOAP.js b/ais-structure/src/modules/helper/messageSOAP.js index 2df4c25..8bed451 100644 --- a/ais-structure/src/modules/helper/messageSOAP.js +++ b/ais-structure/src/modules/helper/messageSOAP.js @@ -56,8 +56,9 @@ soap.soapToArray = function(req,resultSoap) returnData.push(data); } - return returnData; + console.log(resultSet) + return { returnData : returnData, rawDataJson : resultSet}; }; function getBodySOAP(objectData) diff --git a/ais-structure/src/modules/helper/stats.js b/ais-structure/src/modules/helper/stats.js index 21704a3..67998e5 100644 --- a/ais-structure/src/modules/helper/stats.js +++ b/ais-structure/src/modules/helper/stats.js @@ -10,12 +10,12 @@ stat.sendSACFRequest = function (toNode,cmd){ writeStats(nodeName+" Send "+toNode+" OutRedirect SPW_"+cmd+" Request"); }; -stat.reciveSACFResponse = function (toNode,cmd,result){ - writeStats(nodeName+" Recive "+toNode+" OutRedirect SPW_"+cmd+" Response "+result); +stat.reciveSACFResponse = function (fromNode,cmd,result){ + writeStats(nodeName+" Recive "+fromNode+" OutRedirect SPW_"+cmd+" Response "+result); }; -stat.reciveSACFBadResponse = function (toNode,cmd){ - writeStats(nodeName+" Recive "+toNode+" Bad OutRedirect SPW_"+cmd+" Response"); +stat.reciveSACFBadResponse = function (fromNode,cmd){ + writeStats(nodeName+" Recive "+fromNode+" Bad OutRedirect SPW_"+cmd+" Response"); }; //client => CMF @@ -32,7 +32,17 @@ stat.sendResponse = function (method,cmd,result){ }; //CMF => other server [in REST api] +stat.sendRestRequest = function (toNode,method,cmd){ + writeStats(nodeName+" Send "+toNode+" "+method+" "+cmd+" Request"); +}; + +stat.receiveRestResponse = function (fromNode,method,cmd,result){ + writeStats(nodeName+" Receive "+fromNode+" "+method+" "+cmd+" Response "+result); +}; +stat.receiveBadRestResponse = function (fromNode,method,cmd){ + writeStats(nodeName+" Receive "+fromNode+" Bad "+method+" "+cmd+" Response"); +}; //CMF => other server stat.sendRequest = function (toNode,cmd){ diff --git a/ais-structure/src/modules/vizcard/vizCard.ctrl.js b/ais-structure/src/modules/vizcard/vizCard.ctrl.js index 09bc72f..97b7d08 100644 --- a/ais-structure/src/modules/vizcard/vizCard.ctrl.js +++ b/ais-structure/src/modules/vizcard/vizCard.ctrl.js @@ -38,7 +38,6 @@ exports.vizcard = async function (req, res, next) { }; const result = await connection.requestSoapToSACF(objectData,sendCmd,"POST"); - log.logDetail.addInput(sacf,getCmd,"Response",result,result.body); // console.log(result.err) if(typeof result.err === 'undefined'){ @@ -49,12 +48,14 @@ exports.vizcard = async function (req, res, next) { resultSoap = resultSoap['soap:Envelope']['soap:Body']['tem:SearchCustomerResponse']['tem:SearchCustomerResult']['tem:CustomerSearchResult']; var resultSet = messageSOAP.soapToArray(req,resultSoap); - var response = responseMsg.success(req,getCmd,{resultData:resultSet,rowCount:resultSet.length}); + 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"}); } + + log.logDetail.addInput(sacf,getCmd,"Response",result,resultSet.rawDataJson); if(!response){ var response = responseMsg.error(req,getCmd,50000); -- libgit2 0.21.2