update post customer and get customer

Nattapon Wongpaet
1 parent 8d1d6eaf
Showing 5 changed files with 47 additions and 35 deletions Show diff stats
ais-structure/src/modules/customer/customer.ctrl.js
ais-structure/src/modules/customer/postCustomer.ctrl.js
ais-structure/src/modules/helper/connection.js
ais-structure/src/modules/helper/log.js
ais-structure/src/modules/vizcard/vizCard.ctrl.js
@@ -23,9 +23,10 @@ exports.customer = async function (req, res, next) {
     }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);
+        // console.log(Object.keys(result))
+        log.logDetail.addInput(d01,sendCmd,"Response",result,result.response);
         if(typeof result.err === 'undefined'){
             // console.log(result.response);
             var resultObj = result.response;
@@ -35,17 +36,17 @@ exports.customer = async function (req, res, next) {
                 {
                     stats.receiveRestResponse(d01,"GET",sendCmd,"Success");
                     var response = responseMsg.success(req,getCmd,resultObj);
-                    log.addSuccessSummary(sacf,sendCmd,response);
+                    log.addSuccessSummary(d01,sendCmd,response);
                 }else
                 {
                     stats.receiveRestResponse(d01,"GET",sendCmd,"Data Not Found");
                     var response = responseMsg.error(req,getCmd,40300);
-                    log.addErrorSummary(sacf,sendCmd,response);
+                    log.addErrorSummary(d01,sendCmd,response);
                 }
             }
         } else {
             response = responseMsg.direct(req,getCmd,result.response);
-            log.addErrorSummary(sacf,sendCmd,response);
+            log.addErrorSummary(d01,sendCmd,response);
         }
     }
  
@@ -76,10 +77,10 @@ function validator(req,api)
         }
  
     if(err.length > 0)    
-        stats.receiveRequest(req.method,api,false);    
+        stats.receiveBadRequest(req.method,api);    
     else
-        stats.receiveRequest(req.method,api,true);
-
+        stats.receiveRequest(req.method,api);
+    
     return err;
 }
  
@@ -2,14 +2,19 @@ var stats = require(&#39;../helper/stats.js&#39;);
 var validatorHelper = require('../helper/validator.js');
 var connection = require('../helper/connection.js');
 var responseMsg = require('../helper/responseMsg.js');
+var log = require('../helper/log.js');
  
 exports.postCustomer = async function (req, res, next){
     var getCmd = "Customer";
     var sendCmd = "Customer";
+    var sacf = "SACF";
+    var d01 = "D01";
+
+    log.startlog(getCmd,req);
+    log.logDetail.addInput(sacf,getCmd,"Request",req,req.body);
  
     var err = validator(req,getCmd);
  
-
     if(err.length > 0)
     {
         console.log(err);
@@ -27,30 +32,38 @@ exports.postCustomer = async function (req, res, next){
             dateCreated     : req.body.dateCreated
         };
  
-
         const result = await connection.requestJsonToD01(objectData,sendCmd,"POST");
-
+        log.logDetail.addInput(d01,sendCmd,"Response",result,result.response);
         if(typeof result.err === 'undefined'){
             // console.log(result.response.body);
             var resultObj = result.response;
-            if(resultObj.resultCode.startsWith("40"))
+            if(resultObj.resultCode.startsWith("2"))
             {
-                if(resultObj.resultCode != "40401")
-                    resultObj.resultCode = "50000";    
-                               
-               
+                stats.receiveRestResponse(d01,"POST",sendCmd,"Success");
+                var response = responseMsg.direct(req,getCmd,resultObj,{customerId:objectData.customerId});
+                log.addSuccessSummary(d01,sendCmd,response);
+            } else {
+                if(resultObj.resultCode != "40401"){
+                    resultObj.resultCode = "50000";
+                }
+                stats.receiveRestResponse(d01,"GET",sendCmd,"Error");
+                var response = responseMsg.direct(req,getCmd,resultObj);
+                log.addErrorSummary(d01,sendCmd,response);
             }
-            
-            var response = responseMsg.direct(req,getCmd,resultObj,{customerId:objectData.customerId});
         } else {
             response = responseMsg.direct(req,getCmd,result.response);
+            log.addErrorSummary(d01,sendCmd,response);
         }
     }
  
-    if(!response)
+    if(!response){
         var response = responseMsg.error(req,getCmd,50000);
+        stats.receiveResponse(sacf,sendCmd,"Error");
+    }
  
+    log.logDetail.addOutput(sacf,getCmd,"Response",response,response); 
     res.status(200).json(response);
+    next();
 };
  
 function validator(req,api)
@@ -67,11 +80,10 @@ function validator(req,api)
     list.push([true,"body","emailAddress","string"]);
     var err = validatorHelper(req,list,api)
  
-    
-    if(err.length > 0)    
-        stats.reciveRequest(req.method,api,false);    
+    if(err.length > 0)
+        stats.receiveBadRequest(req.method,api);    
     else
-        stats.reciveRequest(req.method,api,true);
+        stats.receiveRequest(req.method,api);
  
     return err;
 }
 \ No newline at end of file
@@ -18,7 +18,7 @@ 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.addOutput(cfg.service.SACF.Name,cmd,"Request",params,soap);
  
     var result = await asyncRequest(params,cmd,cfg.service.SACF.Name);
  
@@ -57,6 +57,8 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
         timeout             : service[myMethod+"_"+cmd+"_Timeout"]*1000
     }
  
+    log.logDetail.addOutput(service.Name,cmd,"Request",params,params.body); 
+
     var result = {};
     result.response = {};
     result.response.resultData = [];
@@ -120,12 +122,12 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
             params.url = genUrl[0];
             delete params.body;
  
-            var result = await asyncRequest(params,cmd,service.Name);
+            var resultRes = await asyncRequest(params,cmd,service.Name);
  
             // console.log(result);
-            if(result.response)
+            if(resultRes.response)
             {
-                var data = JSON.parse(result.response.body);
+                var data = JSON.parse(resultRes.response.body);
                 result.response = data;
  
             }
@@ -139,7 +141,7 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
         var resultRes = await asyncRequest(params,cmd,service.Name);
  
         result.response = JSON.parse(resultRes.body);
-   
+
     }
  
     // console.log(result);
@@ -183,11 +185,7 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
             stats.receiveResponse(service.Name,cmd,"Error");
         }
  
-        
-
-        
     }
-        
  
     return result;
  
@@ -117,7 +117,8 @@ var addlogDetailData = function(inputType,node,cmd,type,rawData,data){
             var raw = {
                 body : rawData.body,
                 query : rawData.query,
-                params : rawData.params
+                params : rawData.params,
+                response : rawData.response
             };
         } else {
             var raw = { 
@@ -96,9 +96,9 @@ function validator(req,cmd)
  
     var err = validatorHelper(req,list);
     if(err.length > 0)    
-        stats.receiveRequest(req.method,cmd,false);    
+        stats.receiveBadRequest(req.method,cmd);    
     else
-        stats.receiveRequest(req.method,cmd,true);
+        stats.receiveRequest(req.method,cmd);
  
     return err;
 }
...	...	@@ -23,9 +23,10 @@ exports.customer = async function (req, res, next) {
23	23	}else
24	24	{
25	25	var objectData = req.query;
26		- log.logDetail.addOutput(d01,sendCmd,"Request",req.url,req.body);
	26	+
27	27	const result = await connection.requestJsonToD01(objectData,sendCmd,"GET");
28		- log.logDetail.addInput(d01,sendCmd,"Response",result,result.resultData);
	28	+ // console.log(Object.keys(result))
	29	+ log.logDetail.addInput(d01,sendCmd,"Response",result,result.response);
29	30	if(typeof result.err === 'undefined'){
30	31	// console.log(result.response);
31	32	var resultObj = result.response;
...	...	@@ -35,17 +36,17 @@ exports.customer = async function (req, res, next) {
35	36	{
36	37	stats.receiveRestResponse(d01,"GET",sendCmd,"Success");
37	38	var response = responseMsg.success(req,getCmd,resultObj);
38		- log.addSuccessSummary(sacf,sendCmd,response);
	39	+ log.addSuccessSummary(d01,sendCmd,response);
39	40	}else
40	41	{
41	42	stats.receiveRestResponse(d01,"GET",sendCmd,"Data Not Found");
42	43	var response = responseMsg.error(req,getCmd,40300);
43		- log.addErrorSummary(sacf,sendCmd,response);
	44	+ log.addErrorSummary(d01,sendCmd,response);
44	45	}
45	46	}
46	47	} else {
47	48	response = responseMsg.direct(req,getCmd,result.response);
48		- log.addErrorSummary(sacf,sendCmd,response);
	49	+ log.addErrorSummary(d01,sendCmd,response);
49	50	}
50	51	}
51	52
...	...	@@ -76,10 +77,10 @@ function validator(req,api)
76	77	}
77	78
78	79	if(err.length > 0)
79		- stats.receiveRequest(req.method,api,false);
	80	+ stats.receiveBadRequest(req.method,api);
80	81	else
81		- stats.receiveRequest(req.method,api,true);
82		-
	82	+ stats.receiveRequest(req.method,api);
	83	+
83	84	return err;
84	85	}
85	86
...	...
...	...	@@ -2,14 +2,19 @@ var stats = require('../helper/stats.js');
2	2	var validatorHelper = require('../helper/validator.js');
3	3	var connection = require('../helper/connection.js');
4	4	var responseMsg = require('../helper/responseMsg.js');
	5	+var log = require('../helper/log.js');
5	6
6	7	exports.postCustomer = async function (req, res, next){
7	8	var getCmd = "Customer";
8	9	var sendCmd = "Customer";
	10	+ var sacf = "SACF";
	11	+ var d01 = "D01";
	12	+
	13	+ log.startlog(getCmd,req);
	14	+ log.logDetail.addInput(sacf,getCmd,"Request",req,req.body);
9	15
10	16	var err = validator(req,getCmd);
11	17
12		-
13	18	if(err.length > 0)
14	19	{
15	20	console.log(err);
...	...	@@ -27,30 +32,38 @@ exports.postCustomer = async function (req, res, next){
27	32	dateCreated : req.body.dateCreated
28	33	};
29	34
30		-
31	35	const result = await connection.requestJsonToD01(objectData,sendCmd,"POST");
32		-
	36	+ log.logDetail.addInput(d01,sendCmd,"Response",result,result.response);
33	37	if(typeof result.err === 'undefined'){
34	38	// console.log(result.response.body);
35	39	var resultObj = result.response;
36		- if(resultObj.resultCode.startsWith("40"))
	40	+ if(resultObj.resultCode.startsWith("2"))
37	41	{
38		- if(resultObj.resultCode != "40401")
39		- resultObj.resultCode = "50000";
40		-
41		-
	42	+ stats.receiveRestResponse(d01,"POST",sendCmd,"Success");
	43	+ var response = responseMsg.direct(req,getCmd,resultObj,{customerId:objectData.customerId});
	44	+ log.addSuccessSummary(d01,sendCmd,response);
	45	+ } else {
	46	+ if(resultObj.resultCode != "40401"){
	47	+ resultObj.resultCode = "50000";
	48	+ }
	49	+ stats.receiveRestResponse(d01,"GET",sendCmd,"Error");
	50	+ var response = responseMsg.direct(req,getCmd,resultObj);
	51	+ log.addErrorSummary(d01,sendCmd,response);
42	52	}
43		-
44		- var response = responseMsg.direct(req,getCmd,resultObj,{customerId:objectData.customerId});
45	53	} else {
46	54	response = responseMsg.direct(req,getCmd,result.response);
	55	+ log.addErrorSummary(d01,sendCmd,response);
47	56	}
48	57	}
49	58
50		- if(!response)
	59	+ if(!response){
51	60	var response = responseMsg.error(req,getCmd,50000);
	61	+ stats.receiveResponse(sacf,sendCmd,"Error");
	62	+ }
52	63
	64	+ log.logDetail.addOutput(sacf,getCmd,"Response",response,response);
53	65	res.status(200).json(response);
	66	+ next();
54	67	};
55	68
56	69	function validator(req,api)
...	...	@@ -67,11 +80,10 @@ function validator(req,api)
67	80	list.push([true,"body","emailAddress","string"]);
68	81	var err = validatorHelper(req,list,api)
69	82
70		-
71		- if(err.length > 0)
72		- stats.reciveRequest(req.method,api,false);
	83	+ if(err.length > 0)
	84	+ stats.receiveBadRequest(req.method,api);
73	85	else
74		- stats.reciveRequest(req.method,api,true);
	86	+ stats.receiveRequest(req.method,api);
75	87
76	88	return err;
77	89	}
78	90	\ No newline at end of file
...	...
...	...	@@ -18,7 +18,7 @@ connection.requestSoapToSACF = async function (soap,cmd,myMethod) {
18	18	}
19	19
20	20	stats.sendSACFRequest(cfg.service.SACF.Name,cmd)
21		- log.logDetail.addOutput(cfg.service.SACF.Name,cmd,"Request",params.body,soap);
	21	+ log.logDetail.addOutput(cfg.service.SACF.Name,cmd,"Request",params,soap);
22	22
23	23	var result = await asyncRequest(params,cmd,cfg.service.SACF.Name);
24	24
...	...	@@ -57,6 +57,8 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
57	57	timeout : service[myMethod+"_"+cmd+"_Timeout"]*1000
58	58	}
59	59
	60	+ log.logDetail.addOutput(service.Name,cmd,"Request",params,params.body);
	61	+
60	62	var result = {};
61	63	result.response = {};
62	64	result.response.resultData = [];
...	...	@@ -120,12 +122,12 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
120	122	params.url = genUrl[0];
121	123	delete params.body;
122	124
123		- var result = await asyncRequest(params,cmd,service.Name);
	125	+ var resultRes = await asyncRequest(params,cmd,service.Name);
124	126
125	127	// console.log(result);
126		- if(result.response)
	128	+ if(resultRes.response)
127	129	{
128		- var data = JSON.parse(result.response.body);
	130	+ var data = JSON.parse(resultRes.response.body);
129	131	result.response = data;
130	132
131	133	}
...	...	@@ -139,7 +141,7 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
139	141	var resultRes = await asyncRequest(params,cmd,service.Name);
140	142
141	143	result.response = JSON.parse(resultRes.body);
142		-
	144	+
143	145	}
144	146
145	147	// console.log(result);
...	...	@@ -183,11 +185,7 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
183	185	stats.receiveResponse(service.Name,cmd,"Error");
184	186	}
185	187
186		-
187		-
188		-
189	188	}
190		-
191	189
192	190	return result;
193	191
...	...
...	...	@@ -117,7 +117,8 @@ var addlogDetailData = function(inputType,node,cmd,type,rawData,data){
117	117	var raw = {
118	118	body : rawData.body,
119	119	query : rawData.query,
120		- params : rawData.params
	120	+ params : rawData.params,
	121	+ response : rawData.response
121	122	};
122	123	} else {
123	124	var raw = {
...	...
...	...	@@ -96,9 +96,9 @@ function validator(req,cmd)
96	96
97	97	var err = validatorHelper(req,list);
98	98	if(err.length > 0)
99		- stats.receiveRequest(req.method,cmd,false);
	99	+ stats.receiveBadRequest(req.method,cmd);
100	100	else
101		- stats.receiveRequest(req.method,cmd,true);
	101	+ stats.receiveRequest(req.method,cmd);
102	102
103	103	return err;
104	104	}
...	...