update fix bug url and log

sumatek
1 parent 72186717
Showing 2 changed files with 33 additions and 15 deletions Show diff stats
ais-structure/src/modules/helper/connection.js
ais-structure/src/modules/main.route.js
@@ -98,9 +98,7 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) {
         var result = {};
         result.response = {};
-        result.response.resultData = [];
-
-        
+        var resultData = [];        
         if(params.method == constants.METHOD.GET)
         {
@@ -132,7 +130,9 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) {
                             dataRes[i].err = "Miss resultDescription"
+                           
                         dataRes[i].data = data.resultData;
+                        // console.log(dataRes[i].data);
                     }
@@ -140,19 +140,21 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) {
                 for (var i = 0; i < multiSend.length; i++) {
-                    result.response.resultData = result.response.resultData.concat(dataRes[i].data);
+                    resultData = resultData.concat(dataRes[i].data);
                     if(dataRes[i].err)
                         result.err = dataRes[i].err;
+
+                        
                 }
                 if(!result.err)
                 {
                     result.response = constants.RESPONSECONN.MESSAGE.SUCCESS;
+                    result.response.resultData = resultData;
                     // result.response.resultCode = "20000";
                     // result.response.developerMessage = "Success";
                 }
-                
             }else
             {
                 // console.log("single Send");
@@ -237,10 +239,15 @@ async function parallelRequest(multiParams,objectData,funStat)
     // for(var i=0;i<res.length;i++)
     // {
     //     if(!res[i].err)
-    //         stats.receiveResponse(node,cmd,"Success");
+    //     {
+    //         console.log(res[i].body);
+    //     }
+    //     // stats.receiveResponse(node,cmd,"Success");
+    
     // }
+    
     return res;
 }
@@ -248,12 +255,15 @@ async function parallelRequest(multiParams,objectData,funStat)
 function asyncRequest (params = {},objectData,funStat) {
     // console.log(objectData);  
-    funStat.start();
+   
     // console.log("Start : "+new Date().toISOString());
     return new Promise((resolve, reject) => {
         request(params, function (error, response, body) {
+            funStat.start();
+            log.log("URL : "+params.url);
+
             if (error) {
                 if( objectData.maxRetry == objectData.curRetry-1)
@@ -287,6 +297,7 @@ function asyncRequest (params = {},objectData,funStat) {
             } else {
                 // stats.receiveResponse(node,cmd,"Success");
+                log.log("Response : "+body);
                 resolve({
                     'body'      : body,
                     'response'  : response
@@ -326,7 +337,7 @@ function getUrl(params,limit)
     };
-    // params.body = {};
+    params.body = {};
     // params.body.a = "aaa";
     // params.body.b = "bbb";
     // params.body.papa = [];
@@ -343,7 +354,9 @@ function getUrl(params,limit)
     // params.body.commandId.push("8");    
     // params.body.c = "ccc";
     // params.body.fields = "a,b,c,d";
-    // console.log(params.body);  
+    params.body.customerId = ["1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6","1b6a768e52e9a1e11518a1c6"];
+    limit = 100;
+    console.log(params.body);  
     if(params.body)
     {
         var first = true;
@@ -382,7 +395,7 @@ function getUrl(params,limit)
         }
-        var myUrl = url+"?filter=("+filter.base+")"+fields;
+        var myUrl = url+"?filter=:"+filter.base+":"+fields;
         var freeSpace = cfg.Uri_length - myUrl.length;
@@ -413,8 +426,8 @@ function getUrl(params,limit)
     // console.log(filter);
     // console.log(fields);
-    for(var i=0;i<returnData.length;i++)
-        log.log("URL "+[i+1]+" : "+returnData[i]);
+    // for(var i=0;i<returnData.length;i++)
+    //     log.log("URL "+[i+1]+" : "+returnData[i]);
     return returnData;
 }
@@ -484,7 +497,7 @@ function arrayUrl(arrUrl,url,filter,fields,freeSpace,arrData)
         {
             if(loopUrl != "")
             {
-                arrUrl.push(url+"?filter=("+filter+"(|"+loopUrl+")"+fields);
+                arrUrl.push(url+"?filter=("+filter+"(|"+loopUrl+"))"+fields);
                 loopUrl = arrData[i];
                 loopSpace = freeSpace - arrData[i].length;
@@ -503,7 +516,7 @@ function checkResponse(result,funStats)
 {
     if(result.err)
     {
-        log.log(result.err,'error');
+        log.log("Final Response : "+result.err,'error');
         if(result.err.code == constants.RESPONSECONN.STATS.ETIMEDOUT){
             result.response = constants.RESPONSECONN.MESSAGE.ETIMEDOUT;
             // result.response.resultCode = "50003";
@@ -524,7 +537,7 @@ function checkResponse(result,funStats)
         }
         funStats.error(result.response)
     }else
-       log.log(JSON.stringify(result));
+       log.log("Final Response : "+JSON.stringify(result));
     return result;
 }
@@ -49,6 +49,10 @@ module.exports = function (app) {
             default: next();
                 break;
         }
+
+
+        
+
     });
     function doVizcard(objectData)
@@ -72,6 +76,7 @@ module.exports = function (app) {
         // "/cmf/v1/customers/:userType/:userData",
         // "/cmf/v1/customers"
+        // console.log(objectData.modules);
         var doAction = function(){
             if(objectData.method == constants.METHOD.GET)