Nattapon Wongpaet / SPW

Download as
Browse Code ยป

Commit 5300454412e5f54cccc95e19b4cc60b193b8780a

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

update customer

Showing 7 changed files with 62 additions and 12 deletions   Show diff stats
ais-structure/src/modules/customer/customer.ctrl.js
  Diff comments   View file @5300454
... ... @@ -35,6 +35,8 @@ exports.customer = async function (req, res, next) {
35 35 var response = responseMsg.error(req,getCmd,40300);
36 36 }
37 37 }
  38 + } else {
  39 + response = responseMsg.direct(req,getCmd,result.response);
38 40 }
39 41 }
40 42  
... ...
ais-structure/src/modules/customer/postCustomer.ctrl.js
  Diff comments   View file @5300454
... ... @@ -42,11 +42,13 @@ exports.postCustomer = async function (req, res, next){
42 42 }
43 43  
44 44 var response = responseMsg.direct(req,getCmd,resultObj,{customerId:objectData.customerId});
  45 + } else {
  46 + response = responseMsg.direct(req,getCmd,result.response);
45 47 }
46 48 }
47 49  
48 50 if(!response)
49   - var response = responseMsg.error(req,getCmd,5000);
  51 + var response = responseMsg.error(req,getCmd,50000);
50 52  
51 53 res.status(200).json(response);
52 54 };
... ...
ais-structure/src/modules/helper/connection.js
  Diff comments   View file @5300454
... ... @@ -38,6 +38,8 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
38 38 result.response = {};
39 39 result.response.resultData = [];
40 40  
  41 + stats.sendRestRequest(service.Name,myMethod,cmd);
  42 +
41 43 if(params.method == "GET")
42 44 {
43 45 var genUrl = getUrl(params,service[myMethod+"_Limit"]);
... ... @@ -122,10 +124,10 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
122 124 if(result.response)
123 125 {
124 126 if(!result.response.resultCode)
125   - result.err = "Miss resultCode";
  127 + result.err = "Missing resultCode";
126 128  
127 129 if(!result.response.resultDescription)
128   - result.err = "Miss resultDescription";
  130 + result.err = "Missing resultDescription";
129 131 }
130 132  
131 133 if(result.err)
... ... @@ -133,7 +135,34 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
133 135 result.response = {};
134 136 result.response.resultCode = "50000";
135 137  
136   - // stats.reciveResponse(service.Name,cmd,"Error");
  138 + //ETIMEDOUT = timeout
  139 + //ECONNREFUSED = servercode
  140 +
  141 + if(result.err.code == 'ETIMEDOUT'){
  142 + result.response.resultCode = "50003";
  143 + result.response.resultDescription = "Timeout";
  144 + } else if(result.err.code == 'ECONNREFUSED'){
  145 + result.response.resultCode = "50002";
  146 + result.response.resultDescription = "Reject";
  147 + } else {
  148 + if(result.err.indexOf("Missing") != -1){
  149 + result.response.resultCode = "40300";
  150 + result.response.resultDescription = result.err;
  151 + } else {
  152 + result.response.resultCode = "50000";
  153 + result.response.resultDescription = "System error";
  154 + }
  155 + }
  156 +
  157 + if(result.response.resultCode == "40300"){
  158 + stats.receiveBadRestResponse(service.Name,params.method,cmd);
  159 + } else {
  160 + stats.reciveResponse(service.Name,cmd,"Error");
  161 + }
  162 +
  163 +
  164 +
  165 +
137 166 }
138 167  
139 168  
... ...
ais-structure/src/modules/helper/log.js
  Diff comments   View file @5300454
... ... @@ -101,7 +101,12 @@ logger.logSummary = function (response)
101 101 log.addErrorBlock(row.node,row.cmd,row.resultCode,row.resultDesc);
102 102 }
103 103 }
104   - log.end(response.resultCode,response.developerMessage)
  104 +
  105 + if(response){
  106 + log.end(response.resultCode,response.developerMessage)
  107 + } else {
  108 + log.end()
  109 + }
105 110 }
106 111  
107 112 var addlogDetailData = function(inputType,node,cmd,type,rawData,data){
... ...
ais-structure/src/modules/helper/messageSOAP.js
  Diff comments   View file @5300454
... ... @@ -56,8 +56,9 @@ soap.soapToArray = function(req,resultSoap)
56 56 returnData.push(data);
57 57 }
58 58  
59   - return returnData;
  59 + console.log(resultSet)
60 60  
  61 + return { returnData : returnData, rawDataJson : resultSet};
61 62 };
62 63  
63 64 function getBodySOAP(objectData)
... ...
ais-structure/src/modules/helper/stats.js
  Diff comments   View file @5300454
... ... @@ -10,12 +10,12 @@ stat.sendSACFRequest = function (toNode,cmd){
10 10 writeStats(nodeName+" Send "+toNode+" OutRedirect SPW_"+cmd+" Request");
11 11 };
12 12  
13   -stat.reciveSACFResponse = function (toNode,cmd,result){
14   - writeStats(nodeName+" Recive "+toNode+" OutRedirect SPW_"+cmd+" Response "+result);
  13 +stat.reciveSACFResponse = function (fromNode,cmd,result){
  14 + writeStats(nodeName+" Recive "+fromNode+" OutRedirect SPW_"+cmd+" Response "+result);
15 15 };
16 16  
17   -stat.reciveSACFBadResponse = function (toNode,cmd){
18   - writeStats(nodeName+" Recive "+toNode+" Bad OutRedirect SPW_"+cmd+" Response");
  17 +stat.reciveSACFBadResponse = function (fromNode,cmd){
  18 + writeStats(nodeName+" Recive "+fromNode+" Bad OutRedirect SPW_"+cmd+" Response");
19 19 };
20 20  
21 21 //client => CMF
... ... @@ -32,7 +32,17 @@ stat.sendResponse = function (method,cmd,result){
32 32 };
33 33  
34 34 //CMF => other server [in REST api]
  35 +stat.sendRestRequest = function (toNode,method,cmd){
  36 + writeStats(nodeName+" Send "+toNode+" "+method+" "+cmd+" Request");
  37 +};
  38 +
  39 +stat.receiveRestResponse = function (fromNode,method,cmd,result){
  40 + writeStats(nodeName+" Receive "+fromNode+" "+method+" "+cmd+" Response "+result);
  41 +};
35 42  
  43 +stat.receiveBadRestResponse = function (fromNode,method,cmd){
  44 + writeStats(nodeName+" Receive "+fromNode+" Bad "+method+" "+cmd+" Response");
  45 +};
36 46  
37 47 //CMF => other server
38 48 stat.sendRequest = function (toNode,cmd){
... ...
ais-structure/src/modules/vizcard/vizCard.ctrl.js
  Diff comments   View file @5300454
... ... @@ -38,7 +38,6 @@ exports.vizcard = async function (req, res, next) {
38 38 };
39 39  
40 40 const result = await connection.requestSoapToSACF(objectData,sendCmd,"POST");
41   - log.logDetail.addInput(sacf,getCmd,"Response",result,result.body);
42 41 // console.log(result.err)
43 42  
44 43 if(typeof result.err === 'undefined'){
... ... @@ -49,12 +48,14 @@ exports.vizcard = async function (req, res, next) {
49 48 resultSoap = resultSoap['soap:Envelope']['soap:Body']['tem:SearchCustomerResponse']['tem:SearchCustomerResult']['tem:CustomerSearchResult'];
50 49  
51 50 var resultSet = messageSOAP.soapToArray(req,resultSoap);
52   - var response = responseMsg.success(req,getCmd,{resultData:resultSet,rowCount:resultSet.length});
  51 + var response = responseMsg.success(req,getCmd,{resultData:resultSet.returnData,rowCount:resultSet.returnData.length});
53 52  
54 53 log.addSuccessSummary(sacf,sendCmd,response);
55 54 // log.addErrorSummary("ABCD","EFGH",{resultCode : '50000',developerMessage : "error"});
56 55  
57 56 }
  57 +
  58 + log.logDetail.addInput(sacf,getCmd,"Response",result,resultSet.rawDataJson);
58 59  
59 60 if(!response){
60 61 var response = responseMsg.error(req,getCmd,50000);
... ...