update log

Nattapon Wongpaet
1 parent 095c6af4
Showing 4 changed files with 55 additions and 22 deletions Show diff stats
ais-structure/src/modules/helper/connection.js
ais-structure/src/modules/helper/log.js
ais-structure/src/modules/helper/stats.js
ais-structure/src/modules/vizcard/vizCard.ctrl.js
@@ -3,6 +3,7 @@ var cfg = require(&#39;../../config/config.js&#39;).get(env);
 var stats = require('../helper/stats.js'); 
 var request = require('request');
 var messageSOAP = require('../helper/messageSOAP.js'); 
+var log = require('../helper/log.js');
 var connection = [];
@@ -15,6 +16,9 @@ connection.requestSoapToSACF = async function (soap,cmd,myMethod) {
         method            : myMethod
     }
+    log.logDetail.addOutput(cfg.service.SACF.Name,cmd,"Request",params.body,soap); 
+    log.logDetail.write();
+
     return asyncRequest(params,cmd,cfg.service.SACF.Name);
 };
 connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
@@ -63,46 +63,67 @@ logger.startlog = function (cmdData,rawData)
     // console.log(start);
 }
-logger.addSummary = function (nodeData,cmdData,resultData)
+logger.addSuccessSummary = function (nodeData,cmdData,resultData)
 {
     summary = {
         node : nodeData,
         cmd : cmdData,
         resultCode : resultData.resultCode,
-        resultDesc : resultData.developerMessage        
+        resultDesc : resultData.developerMessage,
+        type : "success"      
     };
     summaryList.push(summary);
     // console.log(summary);
 }
-logger.logSummary = function ()
+logger.addErrorSummary = function (nodeData,cmdData,resultData)
+{
+    summary = {
+        node : nodeData,
+        cmd : cmdData,
+        resultCode : resultData.resultCode,
+        resultDesc : resultData.developerMessage,
+        type : "error"       
+    };
+    summaryList.push(summary);
+    // console.log(summary);
+}
+
+logger.logSummary = function (response)
 {
     var log = logg.summary(start.session,start.cmd,start.identity);
     var row;
     for (let index = 0; index < summaryList.length; index++) {
         row = summaryList[index];
-        log.addSuccessBlock(row.node,row.cmd,row.resultCode,row.resultDesc);
+        if(row.type === "success"){
+            log.addSuccessBlock(row.node,row.cmd,row.resultCode,row.resultDesc);
+        } else {
+            log.addErrorBlock(row.node,row.cmd,row.resultCode,row.resultDesc);
+        }
     }
-    log.end(row.resultCode,row.resultDesc)
+    log.end(response.resultCode,response.developerMessage)
 }
 var addlogDetailData = function(inputType,node,cmd,type,rawData,data){
     if(inputType == 'input')
     {
-        if(!data)
+        if(rawData)
         {
-            var data = {
+            var raw = {
                 body : rawData.body,
                 query : rawData.query,
                 params : rawData.params
             };
+        } else {
+            var raw = {
+            };
         }
         detail.input = {
             node : node,
             cmd : cmd,
             type : type,
-            rawData : data,
+            rawData : raw,
             data : data
         };
@@ -5,6 +5,7 @@ var log = require(&#39;../helper/log.js&#39;);
 var nodeName = cfg.app_name;
 var stat = [];
+// CMF => SACF
 stat.sendSACFRequest = function (toNode,cmd){
     writeStats(nodeName+" Send "+toNode+" OutRedirect SPW_"+cmd+" Request");
 };
@@ -17,6 +18,7 @@ stat.reciveSACFBadResponse = function (toNode,cmd){
     writeStats(nodeName+" Recive "+toNode+" Bad OutRedirect SPW_"+cmd+" Response");
 };
+//client => CMF
 stat.reciveRequest = function (method,cmd){
     writeStats(nodeName+" Recive "+method+" "+cmd+" Request");
 };
@@ -25,18 +27,28 @@ stat.reciveBadRequest = function (method,cmd){
     writeStats(nodeName+" Recive Bad "+method+" "+cmd+" Request");
 };
-stat.reciveResponse = function (fromNode,cmd,result){
-    writeStats(nodeName+" Recive "+fromNode+" "+cmd+" Response "+result);
+stat.sendResponse = function (method,cmd,result){
+    writeStats(nodeName+" Send "+method+" "+cmd+" Response "+result);
 };
+//CMF => other server [in REST api]
+
+
+//CMF => other server
 stat.sendRequest = function (toNode,cmd){
     writeStats(nodeName+" Send "+toNode+" "+cmd+" Request");
 };
-stat.sendResponse = function (method,cmd,result){
-    writeStats(nodeName+" Send "+method+" "+cmd+" Response "+result);
+stat.reciveResponse = function (fromNode,cmd,result){
+    writeStats(nodeName+" Recive "+fromNode+" "+cmd+" Response "+result);
 };
+stat.reciveBadResponse = function (fromNode,cmd,result){
+    writeStats(nodeName+" Recive "+fromNode+" Bad "+cmd+" Response ");
+};
+
+
+
 function writeStats(string) {
     log.log(string);
     log.stat(string);
@@ -13,16 +13,14 @@ exports.vizcard = async function (req, res, next) {
     var sacf = "SACF"
     log.startlog(getCmd,req);
-    log.logDetail.addInput(sacf,getCmd,"Request",req);
+    log.logDetail.addInput(sacf,getCmd,"Request",req,req.body);
     var err = validator(req,getCmd);
     if(err.length > 0)
     {
-        log.log(err);
-        
+        log.log(err); 
         var response = responseMsg.error(req,getCmd,40300);
-
         res.status(200).json(response);
     }else
     {        
@@ -39,8 +37,6 @@ exports.vizcard = async function (req, res, next) {
             moblieNo : req.query.moblieNo
         };
-        log.logDetail.addOutput(sacf,sendCmd,"Request",objectData,objectData); 
-        log.logDetail.write();
         const result = await connection.requestSoapToSACF(objectData,sendCmd,"POST");
         log.logDetail.addInput(sacf,getCmd,"Response",result,result.body);
         // console.log(result.err)
@@ -56,8 +52,8 @@ exports.vizcard = async function (req, res, next) {
             var response = responseMsg.success(req,getCmd,{resultData:resultSet,rowCount:resultSet.length});
             stats.reciveSACFResponse(sacf,sendCmd,"Success");
-            log.addSummary(sacf,sendCmd,response);
-            log.addSummary(sacf,sendCmd,response);
+            log.addSuccessSummary(sacf,sendCmd,response);
+            // log.addErrorSummary("ABCD","EFGH",{resultCode : '50000',developerMessage : "error"});
         }
@@ -66,9 +62,9 @@ exports.vizcard = async function (req, res, next) {
             stats.reciveResponse(sacf,"SPW_"+sendCmd,"Error");
         }
-        log.logDetail.addOutput(sacf,getCmd,"Response",response,response); 
+        log.logDetail.addOutput(sacf,getCmd,"Response",resultSet,response); 
         log.logDetail.write();
-        log.logSummary();
+        log.logSummary(response);
         res.status(200).json(response);
     }
 };