update get vizcard get customer

Nattapon Wongpaet
1 parent 53004544
Showing 7 changed files with 125 additions and 57 deletions Show diff stats
ais-structure/.vscode/launch.json
ais-structure/src/modules/customer/customer.ctrl.js
ais-structure/src/modules/helper/connection.js
ais-structure/src/modules/helper/log.js
ais-structure/src/modules/helper/messageSOAP.js
ais-structure/src/modules/helper/stats.js
ais-structure/src/modules/vizcard/vizCard.ctrl.js
@@ -0,0 +1,20 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "program": "${workspaceFolder}/index.js"
+        },
+        {
+            "type": "node",
+            "request": "attach",
+            "name": "Attach by Process ID",
+            "processId": "${command:PickProcess}"
+        }
+    ]
+}
 \ No newline at end of file
@@ -7,21 +7,25 @@ var log = require(&#39;../helper/log.js&#39;);
 exports.customer = async function (req, res, next) {    
     var getCmd = "Customer";
     var sendCmd = "Customer";
+    var sacf = "SACF";
+    var d01 = "D01"
     log.startlog(getCmd,req);
-    log.logDetail.addInput("Client",getCmd,"Request",req);
+    log.logDetail.addInput(sacf,getCmd,"Request",req,req.body);
     var err = validator(req,getCmd);
     if(err.length > 0)
     {
-        console.log(err);
+        log.log(err,'error');
         var response = responseMsg.error(req,getCmd,40300);
         // res.status(200).json(response);
     }else
     {        
         var objectData = req.query;
+        log.logDetail.addOutput(d01,sendCmd,"Request",req.url,req.body); 
         const result = await connection.requestJsonToD01(objectData,sendCmd,"GET");
+        log.logDetail.addInput(d01,sendCmd,"Response",result,result.resultData);
         if(typeof result.err === 'undefined'){
             // console.log(result.response);
             var resultObj = result.response;
@@ -30,22 +34,25 @@ exports.customer = async function (req, res, next) {
                 if(resultObj.resultData && resultObj.resultData.length>0)
                 {
                     var response = responseMsg.success(req,getCmd,resultObj);
+                    log.addSuccessSummary(sacf,sendCmd,response);
                 }else
                 {
                     var response = responseMsg.error(req,getCmd,40300);
+                    log.addErrorSummary(sacf,sendCmd,response);
                 }
             }
         } else {
             response = responseMsg.direct(req,getCmd,result.response);
+            log.addErrorSummary(sacf,sendCmd,response);
         }
     }
-    if(!response)
+    if(!response){
         var response = responseMsg.error(req,getCmd,50000);
+        stats.receiveResponse(sacf,sendCmd,"Error");
+    }
-    log.logDetail.addOutput("Client",getCmd,"Response",response,response); 
-    // log.logDetail.write();
-    log.logSummary();
+    log.logDetail.addOutput(sacf,getCmd,"Response",response,response); 
     res.status(200).json(response);
     next();
 };
@@ -67,9 +74,9 @@ function validator(req,api)
         }
     if(err.length > 0)    
-        stats.reciveRequest(req.method,api,false);    
+        stats.receiveRequest(req.method,api,false);    
     else
-        stats.reciveRequest(req.method,api,true);
+        stats.receiveRequest(req.method,api,true);
     return err;
 }
@@ -18,11 +18,34 @@ connection.requestSoapToSACF = async function (soap,cmd,myMethod) {
     }
     stats.sendSACFRequest(cfg.service.SACF.Name,cmd)
-    log.logDetail.addOutput(cfg.service.SACF.Name,cmd,"Request",params.body,soap); 
-    log.logDetail.write();
+    log.logDetail.addOutput(cfg.service.SACF.Name,cmd,"Request",params.body,soap);
-    return asyncRequest(params,cmd,cfg.service.SACF.Name);
+    var result = await asyncRequest(params,cmd,cfg.service.SACF.Name);
+
+    if(result.err)
+    {
+        result.response = {};
+        result.response.resultCode = "50000";
+
+        //ETIMEDOUT = timeout
+        //ECONNREFUSED = servercode
+
+        if(result.err.code == 'ETIMEDOUT'){
+            result.response.resultCode = "50003";
+            result.response.resultDescription = "Timeout";
+        } else if(result.err.code == 'ECONNREFUSED'){
+            result.response.resultCode = "50002";
+            result.response.resultDescription = "Reject";
+        } else {
+            result.response.resultCode = "50000";
+            result.response.resultDescription = "System error";
+        }
+        stats.receiveResponse(cfg.service.SACF.Name,cmd,"Error");
+    }
+
+    return result;
 };
+
 connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
     var service = cfg.service.D01;
@@ -157,7 +180,7 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
         if(result.response.resultCode == "40300"){
             stats.receiveBadRestResponse(service.Name,params.method,cmd);
         } else {
-            stats.reciveResponse(service.Name,cmd,"Error");
+            stats.receiveResponse(service.Name,cmd,"Error");
         }
@@ -184,7 +207,7 @@ async function parallelRequest(multiParams,cmd,node)
     for(var i=0;i<res.length;i++)
     {
         if(!res[i].err)
-            stats.reciveResponse(node,cmd,"Success");
+            stats.receiveResponse(node,cmd,"Success");
     }
@@ -208,7 +231,7 @@ function asyncRequest (params = {},cmd,node) {
                 });
             } else {
-                // stats.reciveResponse(node,cmd,"Success");
+                // stats.receiveResponse(node,cmd,"Success");
                 resolve({
                     'body'      : body,
                     'response'  : response
@@ -101,7 +101,7 @@ logger.logSummary = function (response)
             log.addErrorBlock(row.node,row.cmd,row.resultCode,row.resultDesc);
         }
     }
-    
+
     if(response){
         log.end(response.resultCode,response.developerMessage)
     } else {
@@ -120,7 +120,7 @@ var addlogDetailData = function(inputType,node,cmd,type,rawData,data){
                 params : rawData.params
             };
         } else {
-            var raw = {
+            var raw = { 
             };
         }
@@ -144,20 +144,24 @@ var addlogDetailData = function(inputType,node,cmd,type,rawData,data){
             data : data
         };
+        var log = logg.detail(start.session, start.cmd, start.identity);
+        log.addInput( detail.input.node, detail.input.cmd, detail.input.type, detail.input.rawData, detail.input.data );
+        log.addOutput( detail.output.node, detail.output.cmd, detail.output.type, detail.output.rawData, detail.output.data );
+        log.end();
         // console.log(detail.output);
     }
 }
 var logDetailData = {
     addInput : function(node,cmd,type,rawData,data){addlogDetailData('input',node,cmd,type,rawData,data)},
-    addOutput : function(node,cmd,type,rawData,data){addlogDetailData('output',node,cmd,type,rawData,data)},
-    write : function ()
-    {
-        var log = logg.detail(start.session, start.cmd, start.identity);
-        log.addInput( detail.input.node, detail.input.cmd, detail.input.type, detail.input.rawData, detail.input.data );
-        log.addOutput( detail.output.node, detail.output.cmd, detail.output.type, detail.output.rawData, detail.output.data );
-        log.end();
-    }
+    addOutput : function(node,cmd,type,rawData,data){addlogDetailData('output',node,cmd,type,rawData,data)}
+    // write : function ()
+    // {
+    //     var log = logg.detail(start.session, start.cmd, start.identity);
+    //     log.addInput( detail.input.node, detail.input.cmd, detail.input.type, detail.input.rawData, detail.input.data );
+    //     log.addOutput( detail.output.node, detail.output.cmd, detail.output.type, detail.output.rawData, detail.output.data );
+    //     log.end();
+    // }
 };
 logger.logDetail = logDetailData;
@@ -37,11 +37,12 @@ soap.soapToArray = function(req,resultSoap)
         // console.log(resultSet);       
-        
+        var rawDataArr = [];
         for(var i=0;i<resultSet.length;i++)
         {            
             var data = {}
+            var rawData = {}
             for(var key in resultSet[i]){
                 var keyObj = capitalizeFirstLetter(key.replace('tem:',''))
                 // console.log(keyObj+' : '+resultSet[i][key]['_text']);
@@ -52,13 +53,13 @@ soap.soapToArray = function(req,resultSoap)
                 } else {
                     data[keyObj] = resultSet[i][key]['_text'];
                 }
+                rawData[keyObj] = resultSet[i][key]['_text'];
             }
+            rawDataArr.push(rawData);
             returnData.push(data);
         }
-        console.log(resultSet)
-
-        return { returnData : returnData, rawDataJson : resultSet};
+        return { returnData : returnData, rawDataJson : rawDataArr};
 };
 function getBodySOAP(objectData)
@@ -10,21 +10,21 @@ stat.sendSACFRequest = function (toNode,cmd){
     writeStats(nodeName+" Send "+toNode+" OutRedirect SPW_"+cmd+" Request");
 };
-stat.reciveSACFResponse = function (fromNode,cmd,result){
-    writeStats(nodeName+" Recive "+fromNode+" OutRedirect SPW_"+cmd+" Response "+result);
+stat.receiveSACFResponse = function (fromNode,cmd,result){
+    writeStats(nodeName+" Receive "+fromNode+" OutRedirect SPW_"+cmd+" Response "+result);
 };
-stat.reciveSACFBadResponse = function (fromNode,cmd){
-    writeStats(nodeName+" Recive "+fromNode+" Bad OutRedirect SPW_"+cmd+" Response");
+stat.receiveSACFBadResponse = function (fromNode,cmd){
+    writeStats(nodeName+" Receive "+fromNode+" Bad OutRedirect SPW_"+cmd+" Response");
 };
 //client => CMF
-stat.reciveRequest = function (method,cmd){
-    writeStats(nodeName+" Recive "+method+" "+cmd+" Request");
+stat.receiveRequest = function (method,cmd){
+    writeStats(nodeName+" Receive "+method+" "+cmd+" Request");
 };
-stat.reciveBadRequest = function (method,cmd){
-    writeStats(nodeName+" Recive Bad "+method+" "+cmd+" Request");
+stat.receiveBadRequest = function (method,cmd){
+    writeStats(nodeName+" Receive Bad "+method+" "+cmd+" Request");
 };
 stat.sendResponse = function (method,cmd,result){
@@ -49,12 +49,12 @@ stat.sendRequest = function (toNode,cmd){
     writeStats(nodeName+" Send "+toNode+" "+cmd+" Request");
 };
-stat.reciveResponse = function (fromNode,cmd,result){
-    writeStats(nodeName+" Recive "+fromNode+" "+cmd+" Response "+result);
+stat.receiveResponse = function (fromNode,cmd,result){
+    writeStats(nodeName+" Receive "+fromNode+" "+cmd+" Response "+result);
 };
-stat.reciveBadResponse = function (fromNode,cmd,result){
-    writeStats(nodeName+" Recive "+fromNode+" Bad "+cmd+" Response ");
+stat.receiveBadResponse = function (fromNode,cmd,result){
+    writeStats(nodeName+" Receive "+fromNode+" Bad "+cmd+" Response ");
 };
@@ -19,9 +19,9 @@ exports.vizcard = async function (req, res, next) {
     if(err.length > 0)
     {
-        log.log(err); 
+        log.log(err,'error'); 
         var response = responseMsg.error(req,getCmd,40300);
-        res.status(200).json(response);
+        // res.status(200).json(response);
     }else
     {        
@@ -41,30 +41,43 @@ exports.vizcard = async function (req, res, next) {
         // console.log(result.err)
         if(typeof result.err === 'undefined'){  
-            stats.reciveSACFResponse(sacf,sendCmd,"Success");
-            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'];
+            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,sendCmd,response);
+                // log.addErrorSummary("ABCD","EFGH",{resultCode : '50000',developerMessage : "error"});
+              }
+              catch(error) {
+                result.response.resultCode = "50000";
+                result.response.resultDescription = "Bad Response";
-            var resultSet = messageSOAP.soapToArray(req,resultSoap);
-            var response = responseMsg.success(req,getCmd,{resultData:resultSet.returnData,rowCount:resultSet.returnData.length});
+                stats.receiveSACFBadResponse(sacf,sendCmd);
+                log.addErrorSummary(sacf,sendCmd,response);
-            log.addSuccessSummary(sacf,sendCmd,response);
-            // log.addErrorSummary("ABCD","EFGH",{resultCode : '50000',developerMessage : "error"});
+                response = responseMsg.direct(req,getCmd,result.response);
+                var resultSet = {rawDataJson : ""}
+              }
+        } else {
+            response = responseMsg.direct(req,getCmd,result.response);
+            var resultSet = {rawDataJson : ""}
         }
-        log.logDetail.addInput(sacf,getCmd,"Response",result,resultSet.rawDataJson);
+        log.logDetail.addInput(sacf,sendCmd,"Response",result,resultSet.rawDataJson);
         if(!response){
             var response = responseMsg.error(req,getCmd,50000);
-            stats.reciveResponse(sacf,"SPW_"+sendCmd,"Error");
+            stats.receiveSACFResponse(sacf,sendCmd,"Error");
         }
-        log.logDetail.addOutput(sacf,sendCmd,"Response",response,response); 
-        log.logDetail.write();
-        log.logSummary(response);
+        log.logDetail.addOutput(sacf,getCmd,"Response",response,response); 
         res.status(200).json(response);
         next();
     }
@@ -83,9 +96,9 @@ function validator(req,cmd)
     var err = validatorHelper(req,list);
     if(err.length > 0)    
-        stats.reciveRequest(req.method,cmd,false);    
+        stats.receiveRequest(req.method,cmd,false);    
     else
-        stats.reciveRequest(req.method,cmd,true);
+        stats.receiveRequest(req.method,cmd,true);
     return err;
 }
	@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
		1	+{
		2	+ // Use IntelliSense to learn about possible attributes.
		3	+ // Hover to view descriptions of existing attributes.
		4	+ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
		5	+ "version": "0.2.0",
		6	+ "configurations": [
		7	+ {
		8	+ "type": "node",
		9	+ "request": "launch",
		10	+ "name": "Launch Program",
		11	+ "program": "${workspaceFolder}/index.js"
		12	+ },
		13	+ {
		14	+ "type": "node",
		15	+ "request": "attach",
		16	+ "name": "Attach by Process ID",
		17	+ "processId": "${command:PickProcess}"
		18	+ }
		19	+ ]
		20	+}
0	\ No newline at end of file	21	\ No newline at end of file