Commit 887b2ec59b15a85db115fdc68c8035b7ca103b32
1 parent
adfdbbeb
Exists in
master
and in
1 other branch
update put customer
Showing
7 changed files
with
248 additions
and
146 deletions
Show diff stats
ais-structure/src/modules/customer/customer.ctrl.js
| @@ -1,107 +0,0 @@ | @@ -1,107 +0,0 @@ | ||
| 1 | -var stats = require('../helper/stats.js'); | ||
| 2 | -var validatorHelper = require('../helper/validator.js'); | ||
| 3 | -var connection = require('../helper/connection.js'); | ||
| 4 | -var responseMsg = require('../helper/responseMsg.js'); | ||
| 5 | -var log = require('../helper/log.js'); | ||
| 6 | -var constant = require('../helper/constants.js') | ||
| 7 | - | ||
| 8 | -exports.customer = async function (req, res, next) { | ||
| 9 | - var getCmd = "Customer"; | ||
| 10 | - var sendCmd = "Customer"; | ||
| 11 | - var d01 = "D01" | ||
| 12 | - var method = constant.METHOD.GET | ||
| 13 | - console.log(req.params); | ||
| 14 | - | ||
| 15 | - if(req.params.customerId){ | ||
| 16 | - var customerId = req.params.customerId; | ||
| 17 | - } else if(req.params.userData && req.params.userType){ | ||
| 18 | - var customerId = req.params.userData+"@"+req.params.userType; | ||
| 19 | - } else if(req.query.clientName && req.query.commandId){ | ||
| 20 | - var customerId = req.query.clientName+"@"+req.query.commandId; | ||
| 21 | - } | ||
| 22 | - | ||
| 23 | - | ||
| 24 | - log.startlog(req,method+"_"+getCmd,req.query.commandId,customerId); | ||
| 25 | - log.logDetail.addInput(req,req.query.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body); | ||
| 26 | - | ||
| 27 | - var err = await validator(req,getCmd); | ||
| 28 | - | ||
| 29 | - if(err.length > 0) | ||
| 30 | - { | ||
| 31 | - log.addErrorSummary(req,req.query.clientName,method+"_"+getCmd,"null",constant.FAIL); | ||
| 32 | - log.log(err,'error'); | ||
| 33 | - var response = responseMsg.error(req,getCmd,40300); | ||
| 34 | - // res.status(200).json(response); | ||
| 35 | - }else | ||
| 36 | - { | ||
| 37 | - log.addSuccessSummary(req,req.query.clientName,method+"_"+getCmd,"null",constant.SUCCESS); | ||
| 38 | - var objectData = Object.assign(req.query,req.params); | ||
| 39 | - const result = await connection.requestJsonToD01(req,objectData,sendCmd,method); | ||
| 40 | - // console.log(Object.keys(result)) | ||
| 41 | - log.logDetail.addInput(req,d01,method+"_"+sendCmd,constant.RESPONSE,result,result.response); | ||
| 42 | - if(typeof result.err === 'undefined'){ | ||
| 43 | - // console.log(result.response); | ||
| 44 | - var resultObj = result.response; | ||
| 45 | - if(resultObj.resultCode.startsWith("2")) | ||
| 46 | - { | ||
| 47 | - if(resultObj.resultData && resultObj.resultData.length>0) | ||
| 48 | - { | ||
| 49 | - stats.receiveRestResponse(d01,method,sendCmd,constant.SUCCESS); | ||
| 50 | - var response = responseMsg.success(req,getCmd,resultObj); | ||
| 51 | - log.addSuccessSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 52 | - }else | ||
| 53 | - { | ||
| 54 | - stats.receiveRestResponse(d01,method,sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | ||
| 55 | - var response = responseMsg.error(req,getCmd,40401); | ||
| 56 | - log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 57 | - } | ||
| 58 | - } else if(resultObj.resultCode.startsWith("404")){ | ||
| 59 | - stats.receiveRestResponse(d01,method,sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | ||
| 60 | - var response = responseMsg.direct(req,getCmd,resultObj); | ||
| 61 | - log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 62 | - } else if(resultObj.resultCode.startsWith("5")){ | ||
| 63 | - stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); | ||
| 64 | - var response = responseMsg.direct(req,getCmd,resultObj); | ||
| 65 | - log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 66 | - } else { | ||
| 67 | - stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); | ||
| 68 | - var response = responseMsg.error(req,getCmd,50000); | ||
| 69 | - } | ||
| 70 | - } else { | ||
| 71 | - stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); | ||
| 72 | - var response = responseMsg.error(req,getCmd,50000); | ||
| 73 | - // log.addErrorSummary(d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 74 | - } | ||
| 75 | - } | ||
| 76 | - | ||
| 77 | - log.logDetail.addOutput(req,req.query.clientName,method+"_"+getCmd,constant.RESPONSE,response,response); | ||
| 78 | - res.status(200).json(response); | ||
| 79 | - next(); | ||
| 80 | -}; | ||
| 81 | - | ||
| 82 | - | ||
| 83 | -function validator(req,api) | ||
| 84 | -{ | ||
| 85 | - var list = []; | ||
| 86 | - list.push([true,"queryStr","commandId","String"]); | ||
| 87 | - list.push([true,"queryStr","clientName","String"]); | ||
| 88 | - var err = validatorHelper(req,list,api) | ||
| 89 | - | ||
| 90 | - // if((typeof req.query["userType"] !== 'undefined') && (typeof req.query["userData"] === 'undefined')) | ||
| 91 | - // { | ||
| 92 | - // var errDes = { | ||
| 93 | - // Param : "userData", | ||
| 94 | - // Reason : "Missing" | ||
| 95 | - // } | ||
| 96 | - // err.push(errDes); | ||
| 97 | - // } | ||
| 98 | - | ||
| 99 | - if(err.length > 0) | ||
| 100 | - stats.receiveBadRequest(req.method,api); | ||
| 101 | - else | ||
| 102 | - stats.receiveRequest(req.method,api); | ||
| 103 | - | ||
| 104 | - return err; | ||
| 105 | -} | ||
| 106 | - | ||
| 107 | - |
ais-structure/src/modules/customer/customer.route.js
| @@ -2,7 +2,7 @@ var env = process.env.NODE_ENV || 'development'; | @@ -2,7 +2,7 @@ var env = process.env.NODE_ENV || 'development'; | ||
| 2 | var cfg = require('../../config/config.js').get(env); | 2 | var cfg = require('../../config/config.js').get(env); |
| 3 | 3 | ||
| 4 | module.exports = function (app) { | 4 | module.exports = function (app) { |
| 5 | - var customerCtrl = app.modules.customer.customerCtrl; | 5 | + var customerCtrl = app.modules.customer.getCustomerCtrl; |
| 6 | var postCustomerCtrl = app.modules.customer.postCustomerCtrl; | 6 | var postCustomerCtrl = app.modules.customer.postCustomerCtrl; |
| 7 | 7 | ||
| 8 | // app.get(cfg.service.CMF.GET_Customer_URL[0], | 8 | // app.get(cfg.service.CMF.GET_Customer_URL[0], |
| @@ -0,0 +1,107 @@ | @@ -0,0 +1,107 @@ | ||
| 1 | +var stats = require('../helper/stats.js'); | ||
| 2 | +var validatorHelper = require('../helper/validator.js'); | ||
| 3 | +var connection = require('../helper/connection.js'); | ||
| 4 | +var responseMsg = require('../helper/responseMsg.js'); | ||
| 5 | +var log = require('../helper/log.js'); | ||
| 6 | +var constant = require('../helper/constants.js') | ||
| 7 | + | ||
| 8 | +exports.getCustomer = async function (req, res, next) { | ||
| 9 | + var getCmd = "Customer"; | ||
| 10 | + var sendCmd = "Customer"; | ||
| 11 | + var d01 = "D01" | ||
| 12 | + var method = constant.METHOD.GET | ||
| 13 | + console.log(req.params); | ||
| 14 | + | ||
| 15 | + if(req.params.customerId){ | ||
| 16 | + var customerId = req.params.customerId; | ||
| 17 | + } else if(req.params.userData && req.params.userType){ | ||
| 18 | + var customerId = req.params.userData+"@"+req.params.userType; | ||
| 19 | + } else if(req.query.clientName && req.query.commandId){ | ||
| 20 | + var customerId = req.query.clientName+"@"+req.query.commandId; | ||
| 21 | + } | ||
| 22 | + | ||
| 23 | + | ||
| 24 | + log.startlog(req,method+"_"+getCmd,req.query.commandId,customerId); | ||
| 25 | + log.logDetail.addInput(req,req.query.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body); | ||
| 26 | + | ||
| 27 | + var err = await validator(req,getCmd); | ||
| 28 | + | ||
| 29 | + if(err.length > 0) | ||
| 30 | + { | ||
| 31 | + log.addErrorSummary(req,req.query.clientName,method+"_"+getCmd,"null",constant.FAIL); | ||
| 32 | + log.log(err,'error'); | ||
| 33 | + var response = responseMsg.error(req,getCmd,40300); | ||
| 34 | + // res.status(200).json(response); | ||
| 35 | + }else | ||
| 36 | + { | ||
| 37 | + log.addSuccessSummary(req,req.query.clientName,method+"_"+getCmd,"null",constant.SUCCESS); | ||
| 38 | + var objectData = Object.assign(req.query,req.params); | ||
| 39 | + const result = await connection.requestJsonToD01(req,objectData,sendCmd,method); | ||
| 40 | + // console.log(Object.keys(result)) | ||
| 41 | + log.logDetail.addInput(req,d01,method+"_"+sendCmd,constant.RESPONSE,result,result.response); | ||
| 42 | + if(typeof result.err === 'undefined'){ | ||
| 43 | + // console.log(result.response); | ||
| 44 | + var resultObj = result.response; | ||
| 45 | + if(resultObj.resultCode.startsWith("2")) | ||
| 46 | + { | ||
| 47 | + if(resultObj.resultData && resultObj.resultData.length>0) | ||
| 48 | + { | ||
| 49 | + stats.receiveRestResponse(d01,method,sendCmd,constant.SUCCESS); | ||
| 50 | + var response = responseMsg.success(req,getCmd,resultObj); | ||
| 51 | + log.addSuccessSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 52 | + }else | ||
| 53 | + { | ||
| 54 | + stats.receiveRestResponse(d01,method,sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | ||
| 55 | + var response = responseMsg.error(req,getCmd,40401); | ||
| 56 | + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 57 | + } | ||
| 58 | + } else if(resultObj.resultCode.startsWith("404")){ | ||
| 59 | + stats.receiveRestResponse(d01,method,sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | ||
| 60 | + var response = responseMsg.direct(req,getCmd,resultObj); | ||
| 61 | + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 62 | + } else if(resultObj.resultCode.startsWith("5")){ | ||
| 63 | + stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); | ||
| 64 | + var response = responseMsg.direct(req,getCmd,resultObj); | ||
| 65 | + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 66 | + } else { | ||
| 67 | + stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); | ||
| 68 | + var response = responseMsg.error(req,getCmd,50000); | ||
| 69 | + } | ||
| 70 | + } else { | ||
| 71 | + stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); | ||
| 72 | + var response = responseMsg.error(req,getCmd,50000); | ||
| 73 | + // log.addErrorSummary(d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 74 | + } | ||
| 75 | + } | ||
| 76 | + | ||
| 77 | + log.logDetail.addOutput(req,req.query.clientName,method+"_"+getCmd,constant.RESPONSE,response,response); | ||
| 78 | + res.status(200).json(response); | ||
| 79 | + next(); | ||
| 80 | +}; | ||
| 81 | + | ||
| 82 | + | ||
| 83 | +function validator(req,api) | ||
| 84 | +{ | ||
| 85 | + var list = []; | ||
| 86 | + list.push([true,"queryStr","commandId","String"]); | ||
| 87 | + list.push([true,"queryStr","clientName","String"]); | ||
| 88 | + var err = validatorHelper(req,list,api) | ||
| 89 | + | ||
| 90 | + // if((typeof req.query["userType"] !== 'undefined') && (typeof req.query["userData"] === 'undefined')) | ||
| 91 | + // { | ||
| 92 | + // var errDes = { | ||
| 93 | + // Param : "userData", | ||
| 94 | + // Reason : "Missing" | ||
| 95 | + // } | ||
| 96 | + // err.push(errDes); | ||
| 97 | + // } | ||
| 98 | + | ||
| 99 | + if(err.length > 0) | ||
| 100 | + stats.receiveBadRequest(req.method,api); | ||
| 101 | + else | ||
| 102 | + stats.receiveRequest(req.method,api); | ||
| 103 | + | ||
| 104 | + return err; | ||
| 105 | +} | ||
| 106 | + | ||
| 107 | + |
| @@ -0,0 +1,91 @@ | @@ -0,0 +1,91 @@ | ||
| 1 | +var stats = require('../helper/stats.js'); | ||
| 2 | +var validatorHelper = require('../helper/validator.js'); | ||
| 3 | +var connection = require('../helper/connection.js'); | ||
| 4 | +var responseMsg = require('../helper/responseMsg.js'); | ||
| 5 | +var log = require('../helper/log.js'); | ||
| 6 | +var constant = require('../helper/constants.js') | ||
| 7 | + | ||
| 8 | +exports.putCustomer = async function (req, res, next){ | ||
| 9 | + var getCmd = "Customer"; | ||
| 10 | + var sendCmd = "Customer"; | ||
| 11 | + var d01 = "D01"; | ||
| 12 | + var method = constant.METHOD.PUT; | ||
| 13 | + | ||
| 14 | + log.startlog(req,method+"_"+getCmd,req.body.commandId,req.body.commandId); | ||
| 15 | + log.logDetail.addInput(req,req.body.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body); | ||
| 16 | + | ||
| 17 | + var err = await validator(req,getCmd); | ||
| 18 | + | ||
| 19 | + if(err.length > 0) | ||
| 20 | + { | ||
| 21 | + log.addErrorSummary(req,req.body.clientName,method+"_"+getCmd,"null",constant.FAIL); | ||
| 22 | + console.log(err); | ||
| 23 | + var response = responseMsg.error(req,getCmd,40300); | ||
| 24 | + }else | ||
| 25 | + { | ||
| 26 | + log.addSuccessSummary(req,req.body.clientName,method+"_"+getCmd,"null",constant.SUCCESS); | ||
| 27 | + | ||
| 28 | + if(req.params.customerId){ | ||
| 29 | + var filter = { | ||
| 30 | + customerId : req.params.customerId | ||
| 31 | + } | ||
| 32 | + } else { | ||
| 33 | + var filter = { | ||
| 34 | + userType : req.params.userType, | ||
| 35 | + userData : req.params.userData | ||
| 36 | + } | ||
| 37 | + } | ||
| 38 | + | ||
| 39 | + const result = await connection.requestJsonToD01(req,req.body.customerData,sendCmd,method,filter); | ||
| 40 | + // log.logDetail.addInput(req,d01,method+"_"+sendCmd,constant.RESPONSE,result,result.response); | ||
| 41 | + if(typeof result.err === 'undefined'){ | ||
| 42 | + // console.log(result.response.body); | ||
| 43 | + var resultObj = result.response; | ||
| 44 | + if(resultObj.resultCode.startsWith("2")){ | ||
| 45 | + // stats.receiveRestResponse(d01,method,sendCmd,constant.SUCCESS); | ||
| 46 | + var response = responseMsg.direct(req,getCmd,resultObj); | ||
| 47 | + // log.addSuccessSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 48 | + } else if(resultObj.resultCode.startsWith("404")){ | ||
| 49 | + // stats.receiveRestResponse(d01,method,sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | ||
| 50 | + var response = responseMsg.direct(req,getCmd,resultObj); | ||
| 51 | + // log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 52 | + } else if(resultObj.resultCode.startsWith("5")){ | ||
| 53 | + // stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); | ||
| 54 | + var response = responseMsg.direct(req,getCmd,resultObj); | ||
| 55 | + // log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | ||
| 56 | + } else { | ||
| 57 | + // stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); | ||
| 58 | + var response = responseMsg.error(req,getCmd,50000); | ||
| 59 | + } | ||
| 60 | + } else { | ||
| 61 | + // stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR); | ||
| 62 | + var response = responseMsg.error(req,getCmd,50000); | ||
| 63 | + } | ||
| 64 | + } | ||
| 65 | + | ||
| 66 | + log.logDetail.addOutput(req,req.body.clientName,method+"_"+getCmd,constant.RESPONSE,response,response); | ||
| 67 | + res.status(200).json(response); | ||
| 68 | + next(); | ||
| 69 | +}; | ||
| 70 | + | ||
| 71 | +function validator(req,api) | ||
| 72 | +{ | ||
| 73 | + // console.log(req.body); | ||
| 74 | + var list = []; | ||
| 75 | + list.push([true,"body","commandId","string"]); | ||
| 76 | + list.push([true,"body","clientName","string"]); | ||
| 77 | + // list.push([true,"body","user.userType","string"]); | ||
| 78 | + // list.push([true,"body","user.userData","string"]); | ||
| 79 | + // list.push([true,"body","firstName","string"]); | ||
| 80 | + // list.push([true,"body","lastName","string"]); | ||
| 81 | + // list.push([true,"body","mobile","string"]); | ||
| 82 | + // list.push([true,"body","emailAddress","string"]); | ||
| 83 | + var err = validatorHelper(req,list,api) | ||
| 84 | + | ||
| 85 | + if(err.length > 0) | ||
| 86 | + stats.receiveBadRequest(req.method,api); | ||
| 87 | + else | ||
| 88 | + stats.receiveRequest(req.method,api); | ||
| 89 | + | ||
| 90 | + return err; | ||
| 91 | +} | ||
| 0 | \ No newline at end of file | 92 | \ No newline at end of file |
ais-structure/src/modules/helper/connection.js
| @@ -135,6 +135,8 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { | @@ -135,6 +135,8 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { | ||
| 135 | try | 135 | try |
| 136 | { | 136 | { |
| 137 | var result = JSON.parse(resultObj.body); | 137 | var result = JSON.parse(resultObj.body); |
| 138 | + | ||
| 139 | + log.log('ResponseData : ' + resultObj.body); | ||
| 138 | 140 | ||
| 139 | if(!result.resultCode || !result.resultDescription) | 141 | if(!result.resultCode || !result.resultDescription) |
| 140 | { | 142 | { |
| @@ -156,26 +158,31 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { | @@ -156,26 +158,31 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { | ||
| 156 | log.logDetail.addInput(req,service.Name,myMethod+"_"+cmd,constants.RESPONSE,resultObj,result); | 158 | log.logDetail.addInput(req,service.Name,myMethod+"_"+cmd,constants.RESPONSE,resultObj,result); |
| 157 | if(result.resultCode.startsWith("2")) | 159 | if(result.resultCode.startsWith("2")) |
| 158 | { | 160 | { |
| 159 | - if(result.resultData && result.resultData.length>0) | ||
| 160 | - { | 161 | + if(myMethod == constants.METHOD.GET){ |
| 162 | + if(result.resultData && result.resultData.length>0) | ||
| 163 | + { | ||
| 164 | + stats.receiveRestResponse(service.Name,myMethod,cmd,constants.SUCCESS); | ||
| 165 | + log.addSuccessSummary(req,service.Name,myMethod+"_"+cmd,result.resultCode,constants.SUCCESS); | ||
| 166 | + }else | ||
| 167 | + { | ||
| 168 | + stats.receiveRestResponse(service.Name,myMethod,cmd,constants.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | ||
| 169 | + log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,constants.RESPONSERESULT.DATA_NOT_FOUND.resultCode,constants.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | ||
| 170 | + } | ||
| 171 | + } else { | ||
| 161 | stats.receiveRestResponse(service.Name,myMethod,cmd,constants.SUCCESS); | 172 | stats.receiveRestResponse(service.Name,myMethod,cmd,constants.SUCCESS); |
| 162 | log.addSuccessSummary(req,service.Name,myMethod+"_"+cmd,result.resultCode,constants.SUCCESS); | 173 | log.addSuccessSummary(req,service.Name,myMethod+"_"+cmd,result.resultCode,constants.SUCCESS); |
| 163 | - }else | ||
| 164 | - { | ||
| 165 | - stats.receiveRestResponse(service.Name,myMethod,cmd,constants.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | ||
| 166 | - log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,constants.RESPONSERESULT.DATA_NOT_FOUND.resultCode,constants.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | ||
| 167 | } | 174 | } |
| 168 | 175 | ||
| 169 | returnData.retry = false; | 176 | returnData.retry = false; |
| 170 | returnData.response = response; | 177 | returnData.response = response; |
| 171 | - returnData.err = response.resultDescription; | 178 | + // returnData.err = response.resultDescription; |
| 172 | } else if(result.resultCode.startsWith("404")){ | 179 | } else if(result.resultCode.startsWith("404")){ |
| 173 | stats.receiveRestResponse(service.Name,myMethod,cmd,constants.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | 180 | stats.receiveRestResponse(service.Name,myMethod,cmd,constants.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); |
| 174 | log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,result.resultCode,result.developerMessage); | 181 | log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,result.resultCode,result.developerMessage); |
| 175 | 182 | ||
| 176 | returnData.retry = false; | 183 | returnData.retry = false; |
| 177 | returnData.response = response; | 184 | returnData.response = response; |
| 178 | - returnData.err = response.resultDescription; | 185 | + // returnData.err = response.resultDescription; |
| 179 | } else if(result.resultCode.startsWith("5")){ | 186 | } else if(result.resultCode.startsWith("5")){ |
| 180 | stats.receiveRestResponse(service.Name,myMethod,cmd,constants.ERROR); | 187 | stats.receiveRestResponse(service.Name,myMethod,cmd,constants.ERROR); |
| 181 | log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,result.resultCode,result.developerMessage); | 188 | log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,result.resultCode,result.developerMessage); |
| @@ -183,7 +190,7 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { | @@ -183,7 +190,7 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { | ||
| 183 | 190 | ||
| 184 | returnData.retry = true; | 191 | returnData.retry = true; |
| 185 | returnData.response = response; | 192 | returnData.response = response; |
| 186 | - returnData.err = response.resultDescription; | 193 | + // returnData.err = response.resultDescription; |
| 187 | } else { | 194 | } else { |
| 188 | stats.receiveRestResponse(service.Name,myMethod,cmd,constants.ERROR); | 195 | stats.receiveRestResponse(service.Name,myMethod,cmd,constants.ERROR); |
| 189 | log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,result.resultCode,result.developerMessage); | 196 | log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,result.resultCode,result.developerMessage); |
| @@ -191,7 +198,7 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { | @@ -191,7 +198,7 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { | ||
| 191 | 198 | ||
| 192 | returnData.retry = true; | 199 | returnData.retry = true; |
| 193 | returnData.response = response; | 200 | returnData.response = response; |
| 194 | - returnData.err = response.resultDescription; | 201 | + // returnData.err = response.resultDescription; |
| 195 | } | 202 | } |
| 196 | } | 203 | } |
| 197 | }catch(err) { | 204 | }catch(err) { |
| @@ -242,7 +249,8 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { | @@ -242,7 +249,8 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { | ||
| 242 | 249 | ||
| 243 | if(loopRes.response) | 250 | if(loopRes.response) |
| 244 | { | 251 | { |
| 245 | - var data = JSON.parse(loopRes.response.body); | 252 | + // var data = JSON.parse(loopRes.response); |
| 253 | + var data = loopRes.response; | ||
| 246 | dataRes[i] = {}; | 254 | dataRes[i] = {}; |
| 247 | 255 | ||
| 248 | if(!data.resultCode) | 256 | if(!data.resultCode) |
| @@ -435,6 +443,7 @@ function asyncRequest (params = {},objectData,funStat) { | @@ -435,6 +443,7 @@ function asyncRequest (params = {},objectData,funStat) { | ||
| 435 | 'response' : response, | 443 | 'response' : response, |
| 436 | 'err' : error | 444 | 'err' : error |
| 437 | }; | 445 | }; |
| 446 | + | ||
| 438 | var result = funStat.end(responseObj); | 447 | var result = funStat.end(responseObj); |
| 439 | 448 | ||
| 440 | if(result.retry) | 449 | if(result.retry) |
| @@ -459,10 +468,10 @@ function getUrlFilter(url,filter){ | @@ -459,10 +468,10 @@ function getUrlFilter(url,filter){ | ||
| 459 | var myfilter = "" | 468 | var myfilter = "" |
| 460 | 469 | ||
| 461 | for(var i in filter){ | 470 | for(var i in filter){ |
| 462 | - myfilter += myfilter+"("+i+"="+filter[i]+")" | 471 | + myfilter += "("+i+"="+filter[i]+")" |
| 463 | } | 472 | } |
| 464 | 473 | ||
| 465 | - var myUrl = url+"?filter="+myfilter | 474 | + var myUrl = url+"?filter=(&"+myfilter+")" |
| 466 | 475 | ||
| 467 | // var myUrl = url+"?filter=("+filter.base+")"; | 476 | // var myUrl = url+"?filter=("+filter.base+")"; |
| 468 | 477 |
ais-structure/src/modules/main.route.js
| @@ -80,9 +80,11 @@ module.exports = function (app) { | @@ -80,9 +80,11 @@ module.exports = function (app) { | ||
| 80 | var doAction = function(){ | 80 | var doAction = function(){ |
| 81 | 81 | ||
| 82 | if(objectData.method == constants.METHOD.GET) | 82 | if(objectData.method == constants.METHOD.GET) |
| 83 | - objectData.modules.customerCtrl.customer(objectData.req,objectData.res,objectData.next); | ||
| 84 | - else | 83 | + objectData.modules.getCustomerCtrl.getCustomer(objectData.req,objectData.res,objectData.next); |
| 84 | + else if(objectData.method == constants.METHOD.POST) | ||
| 85 | objectData.modules.postCustomerCtrl.postCustomer(objectData.req,objectData.res,objectData.next); | 85 | objectData.modules.postCustomerCtrl.postCustomer(objectData.req,objectData.res,objectData.next); |
| 86 | + else if(objectData.method == constants.METHOD.PUT) | ||
| 87 | + objectData.modules.putCustomerCtrl.putCustomer(objectData.req,objectData.res,objectData.next); | ||
| 86 | }; | 88 | }; |
| 87 | 89 | ||
| 88 | switch (objectData.splitPath.length) { | 90 | switch (objectData.splitPath.length) { |
ais-structure/src/modules/membercard/getMembership.ctrl.js
| @@ -39,7 +39,7 @@ exports.getMembership = async function (req, res, next) { | @@ -39,7 +39,7 @@ exports.getMembership = async function (req, res, next) { | ||
| 39 | var objectData = Object.assign(req.query,req.params); | 39 | var objectData = Object.assign(req.query,req.params); |
| 40 | 40 | ||
| 41 | const result = await connection.requestJsonToD01(req,objectData,sendCusCmd,method); | 41 | const result = await connection.requestJsonToD01(req,objectData,sendCusCmd,method); |
| 42 | - log.logDetail.addInput(req,d01,method+"_"+sendCusCmd,constant.RESPONSE,result,result.response); | 42 | + // log.logDetail.addInput(req,d01,method+"_"+sendCusCmd,constant.RESPONSE,result,result.response); |
| 43 | 43 | ||
| 44 | //Get Customer | 44 | //Get Customer |
| 45 | if(typeof result.err === 'undefined'){ | 45 | if(typeof result.err === 'undefined'){ |
| @@ -48,9 +48,9 @@ exports.getMembership = async function (req, res, next) { | @@ -48,9 +48,9 @@ exports.getMembership = async function (req, res, next) { | ||
| 48 | { | 48 | { |
| 49 | if(resultObj.resultData && resultObj.resultData.length>0) | 49 | if(resultObj.resultData && resultObj.resultData.length>0) |
| 50 | { | 50 | { |
| 51 | - log.addSuccessSummary(req,d01,method+"_"+sendCusCmd,resultObj.resultCode,resultObj.resultDescription); | 51 | + // log.addSuccessSummary(req,d01,method+"_"+sendCusCmd,resultObj.resultCode,resultObj.resultDescription); |
| 52 | var cusIdArr = []; | 52 | var cusIdArr = []; |
| 53 | - stats.receiveRestResponse(d01,method,sendCusCmd,constant.SUCCESS); | 53 | + // stats.receiveRestResponse(d01,method,sendCusCmd,constant.SUCCESS); |
| 54 | for(var i = 0; i < resultObj.resultData.length; i++){ | 54 | for(var i = 0; i < resultObj.resultData.length; i++){ |
| 55 | cusIdArr.push(resultObj.resultData[i].customerId) | 55 | cusIdArr.push(resultObj.resultData[i].customerId) |
| 56 | } | 56 | } |
| @@ -62,9 +62,9 @@ exports.getMembership = async function (req, res, next) { | @@ -62,9 +62,9 @@ exports.getMembership = async function (req, res, next) { | ||
| 62 | var resultMemberCardObj = resultMemberCard.response; | 62 | var resultMemberCardObj = resultMemberCard.response; |
| 63 | if(resultMemberCardObj.resultCode.startsWith("2")){ | 63 | if(resultMemberCardObj.resultCode.startsWith("2")){ |
| 64 | if(resultMemberCardObj.resultData && resultMemberCardObj.resultData.length>0){ | 64 | if(resultMemberCardObj.resultData && resultMemberCardObj.resultData.length>0){ |
| 65 | - stats.receiveRestResponse(d01,method,sendMemCmd,constant.SUCCESS); | ||
| 66 | - log.logDetail.addInput(req,d01,method+"_"+sendMemCmd,constant.RESPONSE,resultMemberCard,resultMemberCard.response); | ||
| 67 | - log.addSuccessSummary(req,d01,method+"_"+sendMemCmd,resultMemberCardObj.resultCode,resultMemberCardObj.resultDescription); | 65 | + // stats.receiveRestResponse(d01,method,sendMemCmd,constant.SUCCESS); |
| 66 | + // log.logDetail.addInput(req,d01,method+"_"+sendMemCmd,constant.RESPONSE,resultMemberCard,resultMemberCard.response); | ||
| 67 | + // log.addSuccessSummary(req,d01,method+"_"+sendMemCmd,resultMemberCardObj.resultCode,resultMemberCardObj.resultDescription); | ||
| 68 | 68 | ||
| 69 | try{ | 69 | try{ |
| 70 | for(var i = 0; i < resultObj.resultData.length; i++){ | 70 | for(var i = 0; i < resultObj.resultData.length; i++){ |
| @@ -80,54 +80,54 @@ exports.getMembership = async function (req, res, next) { | @@ -80,54 +80,54 @@ exports.getMembership = async function (req, res, next) { | ||
| 80 | 80 | ||
| 81 | log.log(err); | 81 | log.log(err); |
| 82 | 82 | ||
| 83 | - stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); | 83 | + // stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); |
| 84 | var response = responseMsg.error(req,getCmd,50000); | 84 | var response = responseMsg.error(req,getCmd,50000); |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | 87 | ||
| 88 | } else { | 88 | } else { |
| 89 | - stats.receiveRestResponse(d01,method,sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | 89 | + // stats.receiveRestResponse(d01,method,sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); |
| 90 | var response = responseMsg.error(req,getCmd,40401); | 90 | var response = responseMsg.error(req,getCmd,40401); |
| 91 | - log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage); | 91 | + // log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage); |
| 92 | } | 92 | } |
| 93 | } else if(resultObj.resultCode.startsWith("404")){ | 93 | } else if(resultObj.resultCode.startsWith("404")){ |
| 94 | - stats.receiveRestResponse(d01,method,sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | 94 | + // stats.receiveRestResponse(d01,method,sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); |
| 95 | var response = responseMsg.direct(req,getCmd,resultObj); | 95 | var response = responseMsg.direct(req,getCmd,resultObj); |
| 96 | - log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage); | 96 | + // log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage); |
| 97 | } else if(resultObj.resultCode.startsWith("5")){ | 97 | } else if(resultObj.resultCode.startsWith("5")){ |
| 98 | - stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); | 98 | + // stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); |
| 99 | var response = responseMsg.direct(req,getCmd,resultObj); | 99 | var response = responseMsg.direct(req,getCmd,resultObj); |
| 100 | - log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage); | 100 | + // log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage); |
| 101 | } else { | 101 | } else { |
| 102 | - stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); | 102 | + // stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); |
| 103 | var response = responseMsg.error(req,getCmd,50000); | 103 | var response = responseMsg.error(req,getCmd,50000); |
| 104 | } | 104 | } |
| 105 | } else { | 105 | } else { |
| 106 | - stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); | 106 | + // stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); |
| 107 | var response = responseMsg.error(req,getCmd,50000); | 107 | var response = responseMsg.error(req,getCmd,50000); |
| 108 | // log.addErrorSummary(d01,method+"_"+sendCusCmd,resultObj.resultCode,resultObj.developerMessage); | 108 | // log.addErrorSummary(d01,method+"_"+sendCusCmd,resultObj.resultCode,resultObj.developerMessage); |
| 109 | }//End get MemberCard | 109 | }//End get MemberCard |
| 110 | 110 | ||
| 111 | 111 | ||
| 112 | } else { | 112 | } else { |
| 113 | - stats.receiveRestResponse(d01,method,sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); | 113 | + // stats.receiveRestResponse(d01,method,sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage); |
| 114 | var response = responseMsg.error(req,getCmd,40300); | 114 | var response = responseMsg.error(req,getCmd,40300); |
| 115 | - log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage); | 115 | + // log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage); |
| 116 | } | 116 | } |
| 117 | } else if(resultObj.resultCode.startsWith("404")){ | 117 | } else if(resultObj.resultCode.startsWith("404")){ |
| 118 | - stats.receiveRestResponse(d01,method,sendMemCmd,constant.ERROR); | 118 | + // stats.receiveRestResponse(d01,method,sendMemCmd,constant.ERROR); |
| 119 | var response = responseMsg.direct(req,getCmd,resultObj); | 119 | var response = responseMsg.direct(req,getCmd,resultObj); |
| 120 | - log.addErrorSummary(req,d01,method+"_"+sendMemCmd,response.resultCode,response.developerMessage); | 120 | + // log.addErrorSummary(req,d01,method+"_"+sendMemCmd,response.resultCode,response.developerMessage); |
| 121 | } else if(resultObj.resultCode.startsWith("5")){ | 121 | } else if(resultObj.resultCode.startsWith("5")){ |
| 122 | - stats.receiveRestResponse(d01,method,sendMemCmd,constant.ERROR); | 122 | + // stats.receiveRestResponse(d01,method,sendMemCmd,constant.ERROR); |
| 123 | var response = responseMsg.direct(req,getCmd,resultObj); | 123 | var response = responseMsg.direct(req,getCmd,resultObj); |
| 124 | - log.addErrorSummary(req,d01,method+"_"+sendMemCmd,response.resultCode,response.developerMessage); | 124 | + // log.addErrorSummary(req,d01,method+"_"+sendMemCmd,response.resultCode,response.developerMessage); |
| 125 | } else { | 125 | } else { |
| 126 | - stats.receiveRestResponse(d01,method,sendMemCmd,constant.ERROR); | 126 | + // stats.receiveRestResponse(d01,method,sendMemCmd,constant.ERROR); |
| 127 | var response = responseMsg.error(req,getCmd,50000); | 127 | var response = responseMsg.error(req,getCmd,50000); |
| 128 | } | 128 | } |
| 129 | } else { | 129 | } else { |
| 130 | - stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); | 130 | + // stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR); |
| 131 | var response = responseMsg.error(req,getCmd,50000); | 131 | var response = responseMsg.error(req,getCmd,50000); |
| 132 | // log.addErrorSummary(d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); | 132 | // log.addErrorSummary(d01,method+"_"+sendCmd,response.resultCode,response.developerMessage); |
| 133 | } | 133 | } |