diff --git a/ais-structure/src/modules/customer/customer.ctrl.js b/ais-structure/src/modules/customer/customer.ctrl.js index 0097f3d..86a9433 100644 --- a/ais-structure/src/modules/customer/customer.ctrl.js +++ b/ais-structure/src/modules/customer/customer.ctrl.js @@ -11,11 +11,13 @@ exports.customer = async function (req, res, next) { var d01 = "D01" var method = constant.METHOD.GET + console.log(req.params); + 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 { + } else if(req.query.clientName && req.query.commandId){ var customerId = req.query.clientName+"@"+req.query.commandId; } @@ -33,7 +35,7 @@ exports.customer = async function (req, res, next) { }else { log.addSuccessSummary(req.query.clientName,method+"_"+getCmd,"null",constant.SUCCESS); - var objectData = req.query; + var objectData = Object.assign(req.query,req.params); const result = await connection.requestJsonToD01(objectData,sendCmd,method); // console.log(Object.keys(result)) log.logDetail.addInput(d01,method+"_"+sendCmd,constant.RESPONSE,result,result.response); diff --git a/ais-structure/src/modules/helper/connection.js b/ais-structure/src/modules/helper/connection.js index eb3dc69..ddcdc0e 100644 --- a/ais-structure/src/modules/helper/connection.js +++ b/ais-structure/src/modules/helper/connection.js @@ -36,7 +36,7 @@ connection.requestSoapToSACF = async function (soap,cmd,myMethod) { var funStats = { start : funS, - error : function(response){log.addErrorSummary(service.Name,myMethod+"_"+cmd,response);} + error : function(response){log.addErrorSummary(service.Name,myMethod+"_"+cmd,response.resultCode,response.resultDescription);} }; diff --git a/ais-structure/src/modules/membercard/getMembership.ctrl.js b/ais-structure/src/modules/membercard/getMembership.ctrl.js index 12ed299..c08bc38 100644 --- a/ais-structure/src/modules/membercard/getMembership.ctrl.js +++ b/ais-structure/src/modules/membercard/getMembership.ctrl.js @@ -9,12 +9,19 @@ var log = require('../helper/log.js'); var constant = require('../helper/constants.js') exports.getMembership = async function (req, res, next) { - var getCmd = "VIZCard"; - var sendCmd = "SearchCustomer"; - var sacf = "SACF"; + var getCmd = "CustomerMembership"; + var sendCusCmd = "Customer"; + var sendMemCmd = "MemberCard"; + var d01 = "D01"; var method = constant.METHOD.GET; - var customerId = req.query.clientName+"@"+req.query.commandId; + 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 if(req.query.clientName && req.query.commandId){ + 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); @@ -30,56 +37,58 @@ exports.getMembership = async function (req, res, next) { }else { log.addSuccessSummary(req.query.clientName,method+"_"+getCmd,"null","Success"); - var objectData = { - Username : "axviz", - Password : "1234", - SystemName : "30", - QueryType : "1", - CardId : req.query.commandId, - firstName : req.query.firstName, - lastName : req.query.lastName, - emailAddress : req.query.emailAddress, - moblieNo : req.query.moblieNo - }; - - const result = await connection.requestSoapToSACF(objectData,sendCmd,constant.METHOD.POST); - // console.log(result.err) - + var objectData = Object.assign(req.query,req.params); + const result = await connection.requestJsonToD01(objectData,sendCusCmd,method); + log.logDetail.addInput(d01,method+"_"+sendCusCmd,constant.RESPONSE,result,result.response); if(typeof result.err === 'undefined'){ - - try { - var resultSoap = parseJson.xml2json(result.body, {compact: true, spaces: 4}) - resultSoap = JSON.parse(resultSoap) - resultSoap = resultSoap['soap:Envelope']['soap:Body']['tem:SearchCustomerResponse']['tem:SearchCustomerResult']['tem:CustomerSearchResult']; - - var resultSet = messageSOAP.soapToArray(req,resultSoap); - stats.receiveSACFResponse(sacf,sendCmd,"Success"); - var response = responseMsg.success(req,getCmd,{resultData:resultSet.returnData,rowCount:resultSet.returnData.length}); - - log.addSuccessSummary(sacf,method+"_"+sendCmd,response.resultCode,response.developerMessage); + var resultObj = result.response; + if(resultObj.resultCode.startsWith("2")) + { + if(resultObj.resultData && resultObj.resultData.length>0) + { + log.addSuccessSummary(d01,method+"_"+sendCusCmd,resultObj.resultCode,resultObj.resultDescription); + var cusIdArr = []; + stats.receiveRestResponse(d01,method,sendCusCmd,constant.SUCCESS); + for(var i = 0; i < resultObj.resultData.length; i++){ + cusIdArr.push(resultObj.resultData[i].customerId) + } + objectData = {customerId : cusIdArr} + // console.log(objectData) + const resultMemberCard = await connection.requestJsonToD01(objectData,sendMemCmd,method); + stats.receiveRestResponse(d01,method,sendMemCmd,constant.SUCCESS); + log.logDetail.addInput(d01,method+"_"+sendCusCmd,constant.RESPONSE,resultMemberCard,resultMemberCard.response); + // console.log(JSON.stringify(resultMemberCard)); + var resultMemberCardObj = resultMemberCard.response; + log.addSuccessSummary(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}); + } + } + } + var response = responseMsg.success(req,getCmd,resultObj); + }else + { + stats.receiveRestResponse(d01,method,sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); + var response = responseMsg.error(req,getCmd,40300); + log.addErrorSummary(d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage); + } + } else { + stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); + var response = responseMsg.direct(req,getCmd,resultObj); + log.addErrorSummary(d01,method+"_"+sendCusCmd,resultObj.resultCode,resultObj.developerMessage); } - catch(error) { - result.response = constant.RESPONSERESULT.ERROR - - stats.receiveSACFBadResponse(sacf,sendCmd); - response = responseMsg.direct(req,getCmd,result.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 : ""} + stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); + var response = responseMsg.error(req,getCmd,50000); + // log.addErrorSummary(d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); } - - log.logDetail.addInput(sacf,method+"_"+sendCmd,constant.RESPONSE,result,resultSet.rawDataJson); } // console.log(response); - log.logDetail.addOutput(sacf,method+"_"+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/vizcard/vizCard.route.js b/ais-structure/src/modules/vizcard/vizCard.route.js index 7d40677..0437ff5 100644 --- a/ais-structure/src/modules/vizcard/vizCard.route.js +++ b/ais-structure/src/modules/vizcard/vizCard.route.js @@ -3,7 +3,6 @@ var cfg = require('../../config/config.js').get(env); module.exports = function (app) { var vizcardCtrl = app.modules.vizcard.vizCardCtrl; - var postVizcardCtrl = app.modules.vizcard.postVizCardCtrl; app.get(cfg.service.CMF.GET_VIZCard_URL[0], vizcardCtrl.vizcard -- libgit2 0.21.2