From 449b0a7cc4e6b5a0ba789cca3787f7a6544c34e5 Mon Sep 17 00:00:00 2001
From: Nattapon Wongpaet <sc.nattaponw@gmail.com>
Date: Fri, 24 Aug 2018 13:33:49 +0700
Subject: [PATCH] fix bug vizcard

---
 ais-structure/src/modules/helper/connection.js    | 36 +++++++-----------------------------
 ais-structure/src/modules/helper/constants.js     |  7 ++++++-
 ais-structure/src/modules/vizcard/vizCard.ctrl.js | 15 +++++++--------
 3 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/ais-structure/src/modules/helper/connection.js b/ais-structure/src/modules/helper/connection.js
index 1b75bdd..eb3dc69 100644
--- a/ais-structure/src/modules/helper/connection.js
+++ b/ais-structure/src/modules/helper/connection.js
@@ -42,28 +42,6 @@ connection.requestSoapToSACF = async function (soap,cmd,myMethod) {
 
     var result = await asyncRequest(params,objectData,funStats);
 
-    // if(result.err)
-    // {
-    //     // result.response = {};
-    //     // result.response.resultCode = constants.RESPONSERESULT.ERROR;
-
-        
-    //     if(result.err.code == constants.RESPONSECONN.STATS.ETIMEDOUT){
-    //         result.response = constants.RESPONSECONN.MESSAGE.ETIMEDOUT;
-    //         // result.response.resultCode = "50003";
-    //         // result.response.resultDescription = "Timeout";
-    //     } else if(result.err.code == constants.RESPONSECONN.STATS.ECONNREFUSED){
-    //         result.response = constants.RESPONSECONN.MESSAGE.ECONNREFUSED;
-    //         // result.response.resultCode = "50002";
-    //         // result.response.resultDescription = "Reject";
-    //     } else {
-    //         result.response = constants.RESPONSECONN.MESSAGE.ERROR;
-    //         // result.response.resultCode = "50000";
-    //         // result.response.resultDescription = "System error";
-    //     }
-    //     stats.receiveResponse(service.Name,cmd,constants.ERROR);
-    // }
-
     return checkResponse(result,funStats);
 };
 
@@ -107,11 +85,10 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
 
     if(params.method == constants.METHOD.GET)
     {
-        var genUrl = getUrl(params,service[myMethod+"_Limit"]);
-        // genUrl.push(genUrl[0].replace("8080","8081"));        
+        var genUrl = getUrl(params,service["searchRecordLimit"]);   
         if(genUrl.length > 1)
         {
-            // console.log("multi Send");
+            console.log("multi Send");
             var multiSend = [];
             for(var i=0;i<genUrl.length;i++)
                 multiSend.push({url:genUrl[i],method:params.method});
@@ -470,6 +447,7 @@ function checkResponse(result,funStats)
 {
     if(result.err)
     {
+        log.log(result.err,'error');
         if(result.err.code == constants.RESPONSECONN.STATS.ETIMEDOUT){
             result.response = constants.RESPONSECONN.MESSAGE.ETIMEDOUT;
             // result.response.resultCode = "50003";
@@ -478,19 +456,19 @@ function checkResponse(result,funStats)
             result.response = constants.RESPONSECONN.MESSAGE.ECONNREFUSED;
             // result.response.resultCode = "50002";
             // result.response.resultDescription = "Reject";
+        } else if(result.err.code == constants.RESPONSECONN.STATS.ESOCKETTIMEDOUT){
+            result.response = constants.RESPONSECONN.MESSAGE.ESOCKETTIMEDOUT;
         } else {
-
-            if(result.err.indexOf(constants.RESPONSECONN.STATS.MISSING) != -1){
+            if(result.err.resultDescription && result.err.resultDescription.indexOf(constants.RESPONSECONN.STATS.MISSING) != -1){
                 result.response.resultCode = constants.RESPONSERESULT.MISSING_INVALID.resultCode;
                 result.response.resultDescription = result.err;
             } else {
                 result.response = constants.RESPONSECONN.MESSAGE.ERROR;
             }
         }
+        funStats.error(result.response)
     }
 
-    funStats.error(result.response)
-
     return result;
 }
 
diff --git a/ais-structure/src/modules/helper/constants.js b/ais-structure/src/modules/helper/constants.js
index 370285c..1dc5e61 100644
--- a/ais-structure/src/modules/helper/constants.js
+++ b/ais-structure/src/modules/helper/constants.js
@@ -14,7 +14,8 @@ module.exports = Object.freeze({
         STATS:{
             ETIMEDOUT:'ETIMEDOUT',
             ECONNREFUSED : 'ECONNREFUSED',
-            MISSING : 'Missing',
+            ESOCKETTIMEDOUT : 'ESOCKETTIMEDOUT',
+            MISSING : 'Missing'
         },
         MESSAGE:{
             ETIMEDOUT:{
@@ -25,6 +26,10 @@ module.exports = Object.freeze({
                 resultCode : '50002',
                 resultDescription : 'Reject'
             },
+            ESOCKETTIMEDOUT:{
+                resultCode : '50003',
+                resultDescription : 'Timeout'
+            },
             ERROR:{
                 resultCode : '50000',
                 resultDescription : 'System error'
diff --git a/ais-structure/src/modules/vizcard/vizCard.ctrl.js b/ais-structure/src/modules/vizcard/vizCard.ctrl.js
index 415b007..2a27226 100644
--- a/ais-structure/src/modules/vizcard/vizCard.ctrl.js
+++ b/ais-structure/src/modules/vizcard/vizCard.ctrl.js
@@ -14,8 +14,9 @@ exports.vizcard = async function (req, res, next) {
     var sacf = "SACF";
     var method = constant.METHOD.GET;
 
-    var customerId = req.query.clientName+"@"+req.query.commandId;
-
+    if(req.query.clientName && req.query.commandId){
+        var customerId = req.query.clientName+"@"+req.query.commandId;
+    }
     log.startlog(method+"_"+getCmd,req.query.commandId,customerId);
     log.logDetail.addInput(req.query.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body);
     
@@ -59,18 +60,16 @@ exports.vizcard = async function (req, res, next) {
                 log.addSuccessSummary(sacf,method+"_"+sendCmd,response.resultCode,response.developerMessage);
             }
             catch(error) {
-                result.response = constant.RESPONSERESULT.ERROR
-
+                log.log(error,'error')
                 stats.receiveSACFBadResponse(sacf,sendCmd);
-                response = responseMsg.direct(req,getCmd,result.response);
+                response = responseMsg.error(req,getCmd,50000);
                 log.addErrorSummary(sacf,method+"_"+sendCmd,response.resultCode,response.developerMessage);
-
                 var resultSet = {rawDataJson : ""}
             }
             
         } else {
             stats.receiveSACFResponse(sacf,sendCmd,"Error");
-            response = responseMsg.direct(req,getCmd,result.response);
+            response = responseMsg.error(req,getCmd,50000);
             // log.addErrorSummary(sacf,method+"_"+sendCmd,response.resultCode,response.developerMessage);
             var resultSet = {rawDataJson : ""}
         }
@@ -88,7 +87,7 @@ exports.vizcard = async function (req, res, next) {
 function validator(req,cmd)
 {
     var list = [];
-    list.push([true,"queryStr","commandId","int"]);
+    list.push([true,"queryStr","commandId","string"]);
     list.push([true,"queryStr","clientName","string"]);
     // list.push([true,"queryStr","lastName","string"]);
     // list.push([true,"queryStr","emailAddress","string"]);
--
libgit2 0.21.2