Nattapon Wongpaet / SPW

Download as
Browse Code ยป

Commit a0638777c4b502e5e54cfaf1c401d954e661f3e3

Authored by Nattapon Wongpaet
1 parent ad2fa4ed
Exists in master and in 1 other branch dev

add try catch and response message

Showing 4 changed files with 73 additions and 53 deletions   Show diff stats
ais-structure/src/modules/customer/customer.ctrl.js
  Diff comments   View file @a063877
... ... @@ -53,16 +53,16 @@ exports.customer = async function (req, res, next) {
53 53 {
54 54 stats.receiveRestResponse(d01,method,sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
55 55 var response = responseMsg.error(req,getCmd,40401);
56   - log.addErrorSummary(req,d01,method+"_"+sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.resultCode,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
  56 + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage);
57 57 }
58 58 } else if(resultObj.resultCode.startsWith("404")){
59 59 stats.receiveRestResponse(d01,method,sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
60 60 var response = responseMsg.direct(req,getCmd,resultObj);
61   - log.addErrorSummary(req,d01,method+"_"+sendCmd,resultObj.resultCode,resultObj.developerMessage);
  61 + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage);
62 62 } else if(resultObj.resultCode.startsWith("5")){
63 63 stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR);
64 64 var response = responseMsg.direct(req,getCmd,resultObj);
65   - log.addErrorSummary(req,d01,method+"_"+sendCmd,resultObj.resultCode,resultObj.developerMessage);
  65 + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage);
66 66 } else {
67 67 stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR);
68 68 var response = responseMsg.error(req,getCmd,50000);
... ...
ais-structure/src/modules/customer/postCustomer.ctrl.js
  Diff comments   View file @a063877
... ... @@ -51,11 +51,11 @@ exports.postCustomer = async function (req, res, next){
51 51 } else if(resultObj.resultCode.startsWith("404")){
52 52 stats.receiveRestResponse(d01,method,sendCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
53 53 var response = responseMsg.direct(req,getCmd,resultObj);
54   - log.addErrorSummary(req,d01,method+"_"+sendCmd,resultObj.resultCode,resultObj.developerMessage);
  54 + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage);
55 55 } else if(resultObj.resultCode.startsWith("5")){
56 56 stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR);
57 57 var response = responseMsg.direct(req,getCmd,resultObj);
58   - log.addErrorSummary(req,d01,method+"_"+sendCmd,resultObj.resultCode,resultObj.developerMessage);
  58 + log.addErrorSummary(req,d01,method+"_"+sendCmd,response.resultCode,response.developerMessage);
59 59 } else {
60 60 stats.receiveRestResponse(d01,method,sendCmd,constant.ERROR);
61 61 var response = responseMsg.error(req,getCmd,50000);
... ...
ais-structure/src/modules/membercard/getMembership.ctrl.js
  Diff comments   View file @a063877
... ... @@ -65,28 +65,39 @@ exports.getMembership = async function (req, res, next) {
65 65 stats.receiveRestResponse(d01,method,sendMemCmd,constant.SUCCESS);
66 66 log.logDetail.addInput(req,d01,method+"_"+sendMemCmd,constant.RESPONSE,resultMemberCard,resultMemberCard.response);
67 67 log.addSuccessSummary(req,d01,method+"_"+sendMemCmd,resultMemberCardObj.resultCode,resultMemberCardObj.resultDescription);
68   -
69   - for(var i = 0; i < resultObj.resultData.length; i++){
70   - for(var j = 0; j < resultMemberCardObj.resultData.length; j++){
71   - if(resultMemberCardObj.resultData[j].cardOwnerIdList.includes(resultObj.resultData[i].customerId)){
72   - resultObj.resultData[i] = Object.assign(resultObj.resultData[i],{cardId : resultMemberCardObj.resultData[j].cardId});
  68 +
  69 + try{
  70 + for(var i = 0; i < resultObj.resultData.length; i++){
  71 + for(var j = 0; j < resultMemberCardObj.resultData.length; j++){
  72 + if(resultMemberCardObj.resultData[j].cardOwnerIdList.includes(resultObj.resultData[i].customerId)){
  73 + resultObj.resultData[i] = Object.assign(resultObj.resultData[i],{cardId : resultMemberCardObj.resultData[j].cardId});
  74 + }
73 75 }
74 76 }
  77 + var response = responseMsg.success(req,getCmd,resultObj);
75 78 }
76   - var response = responseMsg.success(req,getCmd,resultObj);
  79 + catch(err){
  80 +
  81 + log.log(err);
  82 +
  83 + stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR);
  84 + var response = responseMsg.error(req,getCmd,50000);
  85 + }
  86 +
  87 +
77 88 } else {
78 89 stats.receiveRestResponse(d01,method,sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
79 90 var response = responseMsg.error(req,getCmd,40401);
80   - log.addErrorSummary(req,d01,method+"_"+sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.resultCode,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
  91 + log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage);
81 92 }
82 93 } else if(resultObj.resultCode.startsWith("404")){
83 94 stats.receiveRestResponse(d01,method,sendCusCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
84 95 var response = responseMsg.direct(req,getCmd,resultObj);
85   - log.addErrorSummary(req,d01,method+"_"+sendCusCmd,resultObj.resultCode,resultObj.developerMessage);
  96 + log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage);
86 97 } else if(resultObj.resultCode.startsWith("5")){
87 98 stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR);
88 99 var response = responseMsg.direct(req,getCmd,resultObj);
89   - log.addErrorSummary(req,d01,method+"_"+sendCusCmd,resultObj.resultCode,resultObj.developerMessage);
  100 + log.addErrorSummary(req,d01,method+"_"+sendCusCmd,response.resultCode,response.developerMessage);
90 101 } else {
91 102 stats.receiveRestResponse(d01,method,sendCusCmd,constant.ERROR);
92 103 var response = responseMsg.error(req,getCmd,50000);
... ... @@ -106,11 +117,11 @@ exports.getMembership = async function (req, res, next) {
106 117 } else if(resultObj.resultCode.startsWith("404")){
107 118 stats.receiveRestResponse(d01,method,sendMemCmd,constant.ERROR);
108 119 var response = responseMsg.direct(req,getCmd,resultObj);
109   - log.addErrorSummary(req,d01,method+"_"+sendMemCmd,resultObj.resultCode,resultObj.developerMessage);
  120 + log.addErrorSummary(req,d01,method+"_"+sendMemCmd,response.resultCode,response.developerMessage);
110 121 } else if(resultObj.resultCode.startsWith("5")){
111 122 stats.receiveRestResponse(d01,method,sendMemCmd,constant.ERROR);
112 123 var response = responseMsg.direct(req,getCmd,resultObj);
113   - log.addErrorSummary(req,d01,method+"_"+sendMemCmd,resultObj.resultCode,resultObj.developerMessage);
  124 + log.addErrorSummary(req,d01,method+"_"+sendMemCmd,response.resultCode,response.developerMessage);
114 125 } else {
115 126 stats.receiveRestResponse(d01,method,sendMemCmd,constant.ERROR);
116 127 var response = responseMsg.error(req,getCmd,50000);
... ...
ais-structure/src/modules/membercard/postMembership.ctrl.js
  Diff comments   View file @a063877
... ... @@ -87,55 +87,64 @@ exports.postMembership = async function (req, res, next){
87 87 }
88 88 }
89 89  
90   - if(typeof result.err === 'undefined'){
91   - var resultObj = result.response;
92   - if(resultObj.resultCode.startsWith("2")){
93   - if(resultObj.resultData && resultObj.resultData.length>0){
94   -
95   - stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.SUCCESS);
96   - log.addSuccessSummary(req,d01,getMethod+"_"+sendMemberCardCmd,resultObj.resultCode,resultObj.resultDescription);
97   -
98   - var todo = await checkOwnerCard(resultObj.resultData,objectData);
99   - if(todo){
  90 + try {
  91 + if(typeof result.err === 'undefined'){
  92 + var resultObj = result.response;
  93 + if(resultObj.resultCode.startsWith("2")){
  94 + if(resultObj.resultData && resultObj.resultData.length>0){
  95 +
  96 + stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.SUCCESS);
  97 + log.addSuccessSummary(req,d01,getMethod+"_"+sendMemberCardCmd,resultObj.resultCode,resultObj.resultDescription);
  98 +
  99 + var todo = await checkOwnerCard(resultObj.resultData,objectData);
  100 + if(todo){
  101 + var getCustomer = await getCustomerD01(req, objDataGetCustomer);
  102 + var response = await getCustomerHandler(req, getCustomer, resultObj, objDataMembership);
  103 + } else {
  104 + stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.SUCCESS);
  105 + var response = responseMsg.direct(req,getCmd,constant.RESPONSECONN.MESSAGE.EXCEED);
  106 + log.addSuccessSummary(req,d01, getMethod+"_"+sendMemberCardCmd, response.resultCode, response.developerMessage);
  107 + }
  108 +
  109 + } else { //data not found
  110 +
  111 + stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
  112 + log.addErrorSummary(req,d01,getMethod+"_"+sendMemberCardCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.resultCode,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
  113 +
  114 + //get customer
  115 +
100 116 var getCustomer = await getCustomerD01(req, objDataGetCustomer);
101 117 var response = await getCustomerHandler(req, getCustomer, resultObj, objDataMembership);
102   - } else {
103   - stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.SUCCESS);
104   - var response = responseMsg.direct(req,getCmd,constant.RESPONSECONN.MESSAGE.EXCEED);
105   - log.addSuccessSummary(req,d01, getMethod+"_"+sendMemberCardCmd, response.resultCode, response.developerMessage);
106 118 }
107   -
108   - } else { //data not found
109   -
  119 + } else if(resultObj.resultCode.startsWith("404")){ //data not found
  120 +
110 121 stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
111 122 log.addErrorSummary(req,d01,getMethod+"_"+sendMemberCardCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.resultCode,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
112   -
  123 +
113 124 //get customer
114   -
115 125 var getCustomer = await getCustomerD01(req, objDataGetCustomer);
116 126 var response = await getCustomerHandler(req, getCustomer, resultObj, objDataMembership);
  127 +
  128 + } else if(resultObj.resultCode.startsWith("5")){
  129 + stats.receiveRestResponse(d01, getMethod, sendMemberCardCmd, constant.ERROR);
  130 + var response = responseMsg.direct(req, getCmd, resultObj);
  131 + log.addErrorSummary(req,d01, getMethod+"_"+sendMemberCardCmd, response.resultCode, response.developerMessage);
  132 + } else {
  133 + stats.receiveRestResponse(d01, getMethod, sendMemberCardCmd, constant.ERROR);
  134 + var response = responseMsg.error(req, getCmd, 50000);
117 135 }
118   - } else if(resultObj.resultCode.startsWith("404")){ //data not found
119   -
120   - stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
121   - log.addErrorSummary(req,d01,getMethod+"_"+sendMemberCardCmd,constant.RESPONSERESULT.DATA_NOT_FOUND.resultCode,constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
122   -
123   - //get customer
124   - var getCustomer = await getCustomerD01(req, objDataGetCustomer);
125   - var response = await getCustomerHandler(req, getCustomer, resultObj, objDataMembership);
126   -
127   - } else if(resultObj.resultCode.startsWith("5")){
128   - stats.receiveRestResponse(d01, getMethod, sendMemberCardCmd, constant.ERROR);
129   - var response = responseMsg.direct(req, getCmd, resultObj);
130   - log.addErrorSummary(req,d01, getMethod+"_"+sendMemberCardCmd, resultObj.resultCode, resultObj.developerMessage);
131 136 } else {
132   - stats.receiveRestResponse(d01, getMethod, sendMemberCardCmd, constant.ERROR);
133   - var response = responseMsg.error(req, getCmd, 50000);
  137 + stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.ERROR);
  138 + var response = responseMsg.error(req,getCmd,50000);
134 139 }
135   - } else {
  140 + } catch (err) {
  141 +
  142 + log.log(err);
  143 +
136 144 stats.receiveRestResponse(d01,getMethod,sendMemberCardCmd,constant.ERROR);
137 145 var response = responseMsg.error(req,getCmd,50000);
138 146 }
  147 +
139 148 }
140 149  
141 150 log.logDetail.addOutput(req,req.body.clientName, postMethod+"_"+getCmd, constant.RESPONSE, response, response);
... ... @@ -290,7 +299,7 @@ async function getCustomerHandler(req, getCustomer, getMemberCard, objDataMember
290 299 } else {
291 300 stats.receiveRestResponse(d01, getMethod, sendCustomerCmd, constant.RESPONSERESULT.DATA_NOT_FOUND.resultDescription);
292 301 var response = responseMsg.error(req, getCmd, 40401);
293   - log.addErrorSummary(req,d01, getMethod+"_"+sendCustomerCmd, constant.RESPONSERESULT.DATA_NOT_FOUND.resultCode, constant.RESPONSERESULT.DATA_NOT_FOUND.developerMessage);
  302 + log.addErrorSummary(req,d01, getMethod+"_"+sendCustomerCmd, response.resultCode, response.developerMessage);
294 303 }
295 304 } else if(getCustomer.isDirect){
296 305 stats.receiveRestResponse(d01, getMethod, sendCustomerCmd, constant.ERROR);
... ... @@ -314,7 +323,7 @@ async function postMemberCardHandler(req, memberCard){
314 323 } else if(memberCard.isDirect){
315 324 stats.receiveRestResponse(d01, postMethod, sendMemberCardCmd, constant.ERROR);
316 325 var response = responseMsg.direct(req, getCmd, memberCard.response);
317   - log.addErrorSummary(req,d01, postMethod+"_"+sendMemberCardCmd, memberCard.response.resultCode, memberCard.response.developerMessage);
  326 + log.addErrorSummary(req,d01, postMethod+"_"+sendMemberCardCmd, response.resultCode, response.developerMessage);
318 327 } else {
319 328 stats.receiveRestResponse(d01, postMethod, sendMemberCardCmd, constant.ERROR);
320 329 var response = responseMsg.error(req, getCmd, 50000);
... ...