diff --git a/ais-structure/src/modules/customer/customer.ctrl.js b/ais-structure/src/modules/customer/customer.ctrl.js index 396cb66..7cde0e6 100644 --- a/ais-structure/src/modules/customer/customer.ctrl.js +++ b/ais-structure/src/modules/customer/customer.ctrl.js @@ -53,16 +53,16 @@ exports.customer = async function (req, res, next) { { stats.receiveRestResponse(d01,method,sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); var response = responseMsg.error(req,getCmd,40401); - log.addErrorSummary(req,d01,method+"_"+sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.resultCode,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); } } else if(resultObj.resultCode.startsWith("404")){ stats.receiveRestResponse(d01,method,sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); var response = responseMsg.direct(req,getCmd,resultObj); - log.addErrorSummary(req,d01,method+"_"+sendCmd,resultObj.resultCode,resultObj.developerMessage); + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); } else if(resultObj.resultCode.startsWith("5")){ stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); var response = responseMsg.direct(req,getCmd,resultObj); - log.addErrorSummary(req,d01,method+"_"+sendCmd,resultObj.resultCode,resultObj.developerMessage); + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); } else { stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); var response = responseMsg.error(req,getCmd,50000); diff --git a/ais-structure/src/modules/customer/postCustomer.ctrl.js b/ais-structure/src/modules/customer/postCustomer.ctrl.js index 423e8ec..d396b0c 100644 --- a/ais-structure/src/modules/customer/postCustomer.ctrl.js +++ b/ais-structure/src/modules/customer/postCustomer.ctrl.js @@ -51,11 +51,11 @@ exports.postCustomer = async function (req, res, next){ } else if(resultObj.resultCode.startsWith("404")){ stats.receiveRestResponse(d01,method,sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); var response = responseMsg.direct(req,getCmd,resultObj); - log.addErrorSummary(req,d01,method+"_"+sendCmd,resultObj.resultCode,resultObj.developerMessage); + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); } else if(resultObj.resultCode.startsWith("5")){ stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); var response = responseMsg.direct(req,getCmd,resultObj); - log.addErrorSummary(req,d01,method+"_"+sendCmd,resultObj.resultCode,resultObj.developerMessage); + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); } else { stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); var response = responseMsg.error(req,getCmd,50000); diff --git a/ais-structure/src/modules/membercard/getMembership.ctrl.js b/ais-structure/src/modules/membercard/getMembership.ctrl.js index f0f3e3d..ea0629b 100644 --- a/ais-structure/src/modules/membercard/getMembership.ctrl.js +++ b/ais-structure/src/modules/membercard/getMembership.ctrl.js @@ -65,28 +65,39 @@ exports.getMembership = async function (req, res, next) { stats.receiveRestResponse(d01,method,sendMemCmd,constant.SUCCESS); log.logDetail.addInput(req,d01,method+"_"+sendMemCmd,constant.RESPONSE,resultMemberCard,resultMemberCard.response); log.addSuccessSummary(req,d01,method+"_"+sendMemCmd,resultMemberCardObj.resultCode,resultMemberCardObj.resultDescription); - - for(var i = 0; i < resultObj.resultData.length; i++){ - for(var j = 0; j < resultMemberCardObj.resultData.length; j++){ - if(resultMemberCardObj.resultData[j].cardOwnerIdList.includes(resultObj.resultData[i].customerId)){ - resultObj.resultData[i] = Object.assign(resultObj.resultData[i],{cardId : resultMemberCardObj.resultData[j].cardId}); + + try{ + for(var i = 0; i < resultObj.resultData.length; i++){ + for(var j = 0; j < resultMemberCardObj.resultData.length; j++){ + if(resultMemberCardObj.resultData[j].cardOwnerIdList.includes(resultObj.resultData[i].customerId)){ + resultObj.resultData[i] = Object.assign(resultObj.resultData[i],{cardId : resultMemberCardObj.resultData[j].cardId}); + } } } + var response = responseMsg.success(req,getCmd,resultObj); } - var response = responseMsg.success(req,getCmd,resultObj); + catch(err){ + + log.log(err); + + stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); + var response = responseMsg.error(req,getCmd,50000); + } + + } else { stats.receiveRestResponse(d01,method,sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); var response = responseMsg.error(req,getCmd,40401); - log.addErrorSummary(req,d01,method+"_"+sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.resultCode,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); + log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage); } } else if(resultObj.resultCode.startsWith("404")){ stats.receiveRestResponse(d01,method,sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); var response = responseMsg.direct(req,getCmd,resultObj); - log.addErrorSummary(req,d01,method+"_"+sendCusCmd,resultObj.resultCode,resultObj.developerMessage); + log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage); } else if(resultObj.resultCode.startsWith("5")){ stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); var response = responseMsg.direct(req,getCmd,resultObj); - log.addErrorSummary(req,d01,method+"_"+sendCusCmd,resultObj.resultCode,resultObj.developerMessage); + log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage); } else { stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); var response = responseMsg.error(req,getCmd,50000); @@ -106,11 +117,11 @@ exports.getMembership = async function (req, res, next) { } else if(resultObj.resultCode.startsWith("404")){ stats.receiveRestResponse(d01,method,sendMemCmd,constant.ERROR); var response = responseMsg.direct(req,getCmd,resultObj); - log.addErrorSummary(req,d01,method+"_"+sendMemCmd,resultObj.resultCode,resultObj.developerMessage); + log.addErrorSummary(req,d01,method+"_"+sendMemCmd,response.resultCode,response.developerMessage); } else if(resultObj.resultCode.startsWith("5")){ stats.receiveRestResponse(d01,method,sendMemCmd,constant.ERROR); var response = responseMsg.direct(req,getCmd,resultObj); - log.addErrorSummary(req,d01,method+"_"+sendMemCmd,resultObj.resultCode,resultObj.developerMessage); + log.addErrorSummary(req,d01,method+"_"+sendMemCmd,response.resultCode,response.developerMessage); } else { stats.receiveRestResponse(d01,method,sendMemCmd,constant.ERROR); var response = responseMsg.error(req,getCmd,50000); diff --git a/ais-structure/src/modules/membercard/postMembership.ctrl.js b/ais-structure/src/modules/membercard/postMembership.ctrl.js index cae83de..1bd72f1 100644 --- a/ais-structure/src/modules/membercard/postMembership.ctrl.js +++ b/ais-structure/src/modules/membercard/postMembership.ctrl.js @@ -87,55 +87,64 @@ exports.postMembership = async function (req, res, next){ } } - if(typeof result.err === 'undefined'){ - var resultObj = result.response; - if(resultObj.resultCode.startsWith("2")){ - if(resultObj.resultData && resultObj.resultData.length>0){ - - stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.SUCCESS); - log.addSuccessSummary(req,d01,getMethod+"_"+sendMemberCardCmd,resultObj.resultCode,resultObj.resultDescription); - - var todo = await checkOwnerCard(resultObj.resultData,objectData); - if(todo){ + try { + if(typeof result.err === 'undefined'){ + var resultObj = result.response; + if(resultObj.resultCode.startsWith("2")){ + if(resultObj.resultData && resultObj.resultData.length>0){ + + stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.SUCCESS); + log.addSuccessSummary(req,d01,getMethod+"_"+sendMemberCardCmd,resultObj.resultCode,resultObj.resultDescription); + + var todo = await checkOwnerCard(resultObj.resultData,objectData); + if(todo){ + var getCustomer = await getCustomerD01(req, objDataGetCustomer); + var response = await getCustomerHandler(req, getCustomer, resultObj, objDataMembership); + } else { + stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.SUCCESS); + var response = responseMsg.direct(req,getCmd,constant.RESPONSECONN.MESSAGE.EXCEED); + log.addSuccessSummary(req,d01, getMethod+"_"+sendMemberCardCmd, response.resultCode, response.developerMessage); + } + + } else { //data not found + + stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); + log.addErrorSummary(req,d01,getMethod+"_"+sendMemberCardCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.resultCode,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); + + //get customer + var getCustomer = await getCustomerD01(req, objDataGetCustomer); var response = await getCustomerHandler(req, getCustomer, resultObj, objDataMembership); - } else { - stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.SUCCESS); - var response = responseMsg.direct(req,getCmd,constant.RESPONSECONN.MESSAGE.EXCEED); - log.addSuccessSummary(req,d01, getMethod+"_"+sendMemberCardCmd, response.resultCode, response.developerMessage); } - - } else { //data not found - + } else if(resultObj.resultCode.startsWith("404")){ //data not found + stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); log.addErrorSummary(req,d01,getMethod+"_"+sendMemberCardCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.resultCode,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); - + //get customer - var getCustomer = await getCustomerD01(req, objDataGetCustomer); var response = await getCustomerHandler(req, getCustomer, resultObj, objDataMembership); + + } else if(resultObj.resultCode.startsWith("5")){ + stats.receiveRestResponse(d01, getMethod, sendMemberCardCmd, constant.ERROR); + var response = responseMsg.direct(req, getCmd, resultObj); + log.addErrorSummary(req,d01, getMethod+"_"+sendMemberCardCmd, response.resultCode, response.developerMessage); + } else { + stats.receiveRestResponse(d01, getMethod, sendMemberCardCmd, constant.ERROR); + var response = responseMsg.error(req, getCmd, 50000); } - } else if(resultObj.resultCode.startsWith("404")){ //data not found - - stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); - log.addErrorSummary(req,d01,getMethod+"_"+sendMemberCardCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.resultCode,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); - - //get customer - var getCustomer = await getCustomerD01(req, objDataGetCustomer); - var response = await getCustomerHandler(req, getCustomer, resultObj, objDataMembership); - - } else if(resultObj.resultCode.startsWith("5")){ - stats.receiveRestResponse(d01, getMethod, sendMemberCardCmd, constant.ERROR); - var response = responseMsg.direct(req, getCmd, resultObj); - log.addErrorSummary(req,d01, getMethod+"_"+sendMemberCardCmd, resultObj.resultCode, resultObj.developerMessage); } else { - stats.receiveRestResponse(d01, getMethod, sendMemberCardCmd, constant.ERROR); - var response = responseMsg.error(req, getCmd, 50000); + stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.ERROR); + var response = responseMsg.error(req,getCmd,50000); } - } else { + } catch (err) { + + log.log(err); + stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.ERROR); var response = responseMsg.error(req,getCmd,50000); } + } log.logDetail.addOutput(req,req.body.clientName, postMethod+"_"+getCmd, constant.RESPONSE, response, response); @@ -290,7 +299,7 @@ async function getCustomerHandler(req, getCustomer, getMemberCard, objDataMember } else { stats.receiveRestResponse(d01, getMethod, sendCustomerCmd, constant.RESPONSERESULT.DATA_NOT_FOUND.resultDescription); var response = responseMsg.error(req, getCmd, 40401); - log.addErrorSummary(req,d01, getMethod+"_"+sendCustomerCmd, constant.RESPONSERESULT.DATA_NOT_FOUND.resultCode, constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); + log.addErrorSummary(req,d01, getMethod+"_"+sendCustomerCmd, response.resultCode, response.developerMessage); } } else if(getCustomer.isDirect){ stats.receiveRestResponse(d01, getMethod, sendCustomerCmd, constant.ERROR); @@ -314,7 +323,7 @@ async function postMemberCardHandler(req, memberCard){ } else if(memberCard.isDirect){ stats.receiveRestResponse(d01, postMethod, sendMemberCardCmd, constant.ERROR); var response = responseMsg.direct(req, getCmd, memberCard.response); - log.addErrorSummary(req,d01, postMethod+"_"+sendMemberCardCmd, memberCard.response.resultCode, memberCard.response.developerMessage); + log.addErrorSummary(req,d01, postMethod+"_"+sendMemberCardCmd, response.resultCode, response.developerMessage); } else { stats.receiveRestResponse(d01, postMethod, sendMemberCardCmd, constant.ERROR); var response = responseMsg.error(req, getCmd, 50000); -- libgit2 0.21.2