diff --git a/ais-structure/src/modules/customer/customer.ctrl.js b/ais-structure/src/modules/customer/customer.ctrl.js index b5990e8..632eea1 100644 --- a/ais-structure/src/modules/customer/customer.ctrl.js +++ b/ais-structure/src/modules/customer/customer.ctrl.js @@ -13,13 +13,13 @@ exports.customer = async function (req, res, next) { console.log(req.params); if(req.params.customerId){ - var customerId = req.params.customerId + var customerId = req.params.customerId; } else if(req.params.userData && req.params.userType){ - var customerId = 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(req,method+"_"+getCmd,req.query.commandId,customerId); log.logDetail.addInput(req,req.query.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body); diff --git a/ais-structure/src/modules/helper/connection.js b/ais-structure/src/modules/helper/connection.js index 8ff0c1d..1aba9eb 100644 --- a/ais-structure/src/modules/helper/connection.js +++ b/ais-structure/src/modules/helper/connection.js @@ -59,7 +59,7 @@ connection.requestSoapToSACF = async function (req,soap,cmd,myMethod) { } }; -connection.requestJsonToD01 = async function (req,obj,cmd,myMethod) { +connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { try { log.log("Connect to D01") @@ -185,12 +185,12 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod) { } } else if(params.method == constants.METHOD.PUT) { - + params.url = getUrlFilter(params.url,filter); params.body = JSON.stringify(params.body); var resultRes = await asyncRequest(params,objectData,funStats); - + if(resultRes.response){ result.response = JSON.parse(resultRes.body); } else { @@ -214,6 +214,7 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod) { } catch(err) { log.log(err); + console.log(err); var result = { response : constants.RESPONSECONN.MESSAGE.ERROR @@ -296,6 +297,25 @@ function asyncRequest (params = {},objectData,funStat) { }); }; +function getUrlFilter(url,filter){ + var returnData = []; + var myfilter = "" + + for(var i in filter){ + myfilter += myfilter+"("+i+"="+filter[i]+")" + } + + var myUrl = url+"?filter="+myfilter + + // var myUrl = url+"?filter=("+filter.base+")"; + + returnData.push(myUrl); + for(var i=0;i