Nattapon Wongpaet / SPW

Download as
Browse Code ยป

Commit 4bcb9ffaed98320632582911b24a178a12edf5be

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

update log vizcard

Showing 2 changed files with 25 additions and 22 deletions   Show diff stats
ais-structure/src/modules/helper/log.js
  Diff comments   View file @4bcb9ff
@@ -47,35 +47,35 @@ logger.log = function (msg,type) @@ -47,35 +47,35 @@ logger.log = function (msg,type)
47 console.log(msg); 47 console.log(msg);
48 } 48 }
49 49
50 -logger.startlog = function (cmdData,rawData) 50 +logger.startlog = function (cmdData,session,identity)
51 { 51 {
52 start = { 52 start = {
53 - session : "Session", 53 + session : session,
54 cmd : cmdData, 54 cmd : cmdData,
55 - identity : "Identity" 55 + identity : identity
56 }; 56 };
57 } 57 }
58 58
59 -logger.addSuccessSummary = function (nodeData,cmdData,resultData) 59 +logger.addSuccessSummary = function (nodeData,cmdData,resultCode,developerMessage)
60 { 60 {
61 summary = { 61 summary = {
62 node : nodeData, 62 node : nodeData,
63 cmd : cmdData, 63 cmd : cmdData,
64 - resultCode : resultData.resultCode,  
65 - resultDesc : resultData.developerMessage, 64 + resultCode : resultCode,
  65 + resultDesc : developerMessage,
66 type : "success" 66 type : "success"
67 }; 67 };
68 summaryList.push(summary); 68 summaryList.push(summary);
69 // console.log(summary); 69 // console.log(summary);
70 } 70 }
71 71
72 -logger.addErrorSummary = function (nodeData,cmdData,resultData) 72 +logger.addErrorSummary = function (nodeData,cmdData,resultCode,developerMessage)
73 { 73 {
74 summary = { 74 summary = {
75 node : nodeData, 75 node : nodeData,
76 cmd : cmdData, 76 cmd : cmdData,
77 - resultCode : resultData.resultCode,  
78 - resultDesc : resultData.developerMessage, 77 + resultCode : resultCode,
  78 + resultDesc : developerMessage,
79 type : "error" 79 type : "error"
80 }; 80 };
81 summaryList.push(summary); 81 summaryList.push(summary);
ais-structure/src/modules/vizcard/vizCard.ctrl.js
  Diff comments   View file @4bcb9ff
@@ -10,22 +10,24 @@ var constant = require('../helper/constants.js') @@ -10,22 +10,24 @@ var constant = require('../helper/constants.js')
10 10
11 exports.vizcard = async function (req, res, next) { 11 exports.vizcard = async function (req, res, next) {
12 var getCmd = "VIZCard"; 12 var getCmd = "VIZCard";
13 - var sendCmd = "SearchCustomer"  
14 - var sacf = "SACF" 13 + var sendCmd = "SearchCustomer";
  14 + var sacf = "SACF";
  15 + var method = constant.METHOD.GET;
15 16
16 - log.startlog(getCmd,req);  
17 - log.logDetail.addInput(sacf,getCmd,constant.REQUEST,req,req.body); 17 + log.startlog(method+"_"+getCmd,req.query.commandId,null);
  18 + log.logDetail.addInput(sacf,method+"_"+getCmd,constant.REQUEST,req,req.body);
18 19
19 var err = validator(req,getCmd); 20 var err = validator(req,getCmd);
20 21
21 if(err.length > 0) 22 if(err.length > 0)
22 { 23 {
  24 + log.addErrorSummary(req.query.clientName,method+"_"+getCmd,"null","Fail");
23 log.log(err,'error'); 25 log.log(err,'error');
24 var response = responseMsg.error(req,getCmd,40300); 26 var response = responseMsg.error(req,getCmd,40300);
25 // res.status(200).json(response); 27 // res.status(200).json(response);
26 }else 28 }else
27 { 29 {
28 - 30 + log.addSuccessSummary(req.query.clientName,method+"_"+getCmd,"null","Success");
29 var objectData = { 31 var objectData = {
30 Username : "axviz", 32 Username : "axviz",
31 Password : "1234", 33 Password : "1234",
@@ -53,21 +55,22 @@ exports.vizcard = async function (req, res, next) { @@ -53,21 +55,22 @@ exports.vizcard = async function (req, res, next) {
53 stats.receiveSACFResponse(sacf,sendCmd,"Success"); 55 stats.receiveSACFResponse(sacf,sendCmd,"Success");
54 var response = responseMsg.success(req,getCmd,{resultData:resultSet.returnData,rowCount:resultSet.returnData.length}); 56 var response = responseMsg.success(req,getCmd,{resultData:resultSet.returnData,rowCount:resultSet.returnData.length});
55 57
56 - log.addSuccessSummary(sacf,sendCmd,response);  
57 - // log.addErrorSummary("ABCD","EFGH",{resultCode : '50000',developerMessage : "error"});  
58 - }  
59 - catch(error) { 58 + log.addSuccessSummary(sacf,method+"_"+sendCmd,response.resultCode,response.developerMessage);
  59 + }
  60 + catch(error) {
60 result.response = constant.RESPONSERESULT.ERROR 61 result.response = constant.RESPONSERESULT.ERROR
61 62
62 stats.receiveSACFBadResponse(sacf,sendCmd); 63 stats.receiveSACFBadResponse(sacf,sendCmd);
63 response = responseMsg.direct(req,getCmd,result.response); 64 response = responseMsg.direct(req,getCmd,result.response);
64 - log.addErrorSummary(sacf,sendCmd,response); 65 + log.addErrorSummary(sacf,method+"_"+sendCmd,response.resultCode,response.developerMessage);
65 66
66 var resultSet = {rawDataJson : ""} 67 var resultSet = {rawDataJson : ""}
67 - } 68 + }
68 69
69 } else { 70 } else {
  71 + stats.receiveSACFResponse(sacf,sendCmd,"Error");
70 response = responseMsg.direct(req,getCmd,result.response); 72 response = responseMsg.direct(req,getCmd,result.response);
  73 + log.addErrorSummary(sacf,method+"_"+sendCmd,response.resultCode,response.developerMessage);
71 var resultSet = {rawDataJson : ""} 74 var resultSet = {rawDataJson : ""}
72 } 75 }
73 76
@@ -88,8 +91,8 @@ exports.vizcard = async function (req, res, next) { @@ -88,8 +91,8 @@ exports.vizcard = async function (req, res, next) {
88 function validator(req,cmd) 91 function validator(req,cmd)
89 { 92 {
90 var list = []; 93 var list = [];
91 - // list.push([true,"queryStr","commandId","int"]);  
92 - // list.push([true,"queryStr","firstName","string"]); 94 + list.push([true,"queryStr","commandId","int"]);
  95 + list.push([true,"queryStr","clientName","string"]);
93 // list.push([true,"queryStr","lastName","string"]); 96 // list.push([true,"queryStr","lastName","string"]);
94 // list.push([true,"queryStr","emailAddress","string"]); 97 // list.push([true,"queryStr","emailAddress","string"]);
95 // list.push([true,"queryStr","mobileNo","string"]); 98 // list.push([true,"queryStr","mobileNo","string"]);