Nattapon Wongpaet / SPW

Download as
Browse Code »

Commit 3d36a443fb15e734736db230e7f1502784940887

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

add constant

Showing 4 changed files with 49 additions and 14 deletions   Show diff stats
ais-structure/src/modules/customer/customer.ctrl.js
  Diff comments   View file @3d36a44
@@ -3,6 +3,7 @@ var validatorHelper = require('../helper/validator.js'); @@ -3,6 +3,7 @@ var validatorHelper = require('../helper/validator.js');
3 var connection = require('../helper/connection.js'); 3 var connection = require('../helper/connection.js');
4 var responseMsg = require('../helper/responseMsg.js'); 4 var responseMsg = require('../helper/responseMsg.js');
5 var log = require('../helper/log.js'); 5 var log = require('../helper/log.js');
  6 +var constant = require('../helper/constants.js')
6 7
7 exports.customer = async function (req, res, next) { 8 exports.customer = async function (req, res, next) {
8 var getCmd = "Customer"; 9 var getCmd = "Customer";
@@ -11,7 +12,7 @@ exports.customer = async function (req, res, next) { @@ -11,7 +12,7 @@ exports.customer = async function (req, res, next) {
11 var d01 = "D01" 12 var d01 = "D01"
12 13
13 log.startlog(getCmd,req); 14 log.startlog(getCmd,req);
14 - log.logDetail.addInput(sacf,getCmd,"Request",req,req.body); 15 + log.logDetail.addInput(sacf,getCmd,constant.REQUEST,req,req.body);
15 16
16 var err = validator(req,getCmd); 17 var err = validator(req,getCmd);
17 18
@@ -24,9 +25,9 @@ exports.customer = async function (req, res, next) { @@ -24,9 +25,9 @@ exports.customer = async function (req, res, next) {
24 { 25 {
25 var objectData = req.query; 26 var objectData = req.query;
26 27
27 - const result = await connection.requestJsonToD01(objectData,sendCmd,"GET"); 28 + const result = await connection.requestJsonToD01(objectData,sendCmd,constant.METHOD.GET);
28 // console.log(Object.keys(result)) 29 // console.log(Object.keys(result))
29 - log.logDetail.addInput(d01,sendCmd,"Response",result,result.response); 30 + log.logDetail.addInput(d01,sendCmd,constant.RESPONSE,result,result.response);
30 if(typeof result.err === 'undefined'){ 31 if(typeof result.err === 'undefined'){
31 // console.log(result.response); 32 // console.log(result.response);
32 var resultObj = result.response; 33 var resultObj = result.response;
@@ -34,12 +35,12 @@ exports.customer = async function (req, res, next) { @@ -34,12 +35,12 @@ exports.customer = async function (req, res, next) {
34 { 35 {
35 if(resultObj.resultData && resultObj.resultData.length>0) 36 if(resultObj.resultData && resultObj.resultData.length>0)
36 { 37 {
37 - stats.receiveRestResponse(d01,"GET",sendCmd,"Success"); 38 + stats.receiveRestResponse(d01,constant.METHOD.GET,sendCmd,"Success");
38 var response = responseMsg.success(req,getCmd,resultObj); 39 var response = responseMsg.success(req,getCmd,resultObj);
39 log.addSuccessSummary(d01,sendCmd,response); 40 log.addSuccessSummary(d01,sendCmd,response);
40 }else 41 }else
41 { 42 {
42 - stats.receiveRestResponse(d01,"GET",sendCmd,"Data Not Found"); 43 + stats.receiveRestResponse(d01,constant.METHOD.GET,sendCmd,"Data Not Found");
43 var response = responseMsg.error(req,getCmd,40300); 44 var response = responseMsg.error(req,getCmd,40300);
44 log.addErrorSummary(d01,sendCmd,response); 45 log.addErrorSummary(d01,sendCmd,response);
45 } 46 }
@@ -55,7 +56,7 @@ exports.customer = async function (req, res, next) { @@ -55,7 +56,7 @@ exports.customer = async function (req, res, next) {
55 stats.receiveResponse(sacf,sendCmd,"Error"); 56 stats.receiveResponse(sacf,sendCmd,"Error");
56 } 57 }
57 58
58 - log.logDetail.addOutput(sacf,getCmd,"Response",response,response); 59 + log.logDetail.addOutput(sacf,getCmd,constant.RESPONSE,response,response);
59 res.status(200).json(response); 60 res.status(200).json(response);
60 next(); 61 next();
61 }; 62 };
ais-structure/src/modules/customer/postCustomer.ctrl.js
  Diff comments   View file @3d36a44
@@ -3,6 +3,7 @@ var validatorHelper = require('../helper/validator.js'); @@ -3,6 +3,7 @@ var validatorHelper = require('../helper/validator.js');
3 var connection = require('../helper/connection.js'); 3 var connection = require('../helper/connection.js');
4 var responseMsg = require('../helper/responseMsg.js'); 4 var responseMsg = require('../helper/responseMsg.js');
5 var log = require('../helper/log.js'); 5 var log = require('../helper/log.js');
  6 +var constant = require('../helper/constants.js')
6 7
7 exports.postCustomer = async function (req, res, next){ 8 exports.postCustomer = async function (req, res, next){
8 var getCmd = "Customer"; 9 var getCmd = "Customer";
@@ -11,7 +12,7 @@ exports.postCustomer = async function (req, res, next){ @@ -11,7 +12,7 @@ exports.postCustomer = async function (req, res, next){
11 var d01 = "D01"; 12 var d01 = "D01";
12 13
13 log.startlog(getCmd,req); 14 log.startlog(getCmd,req);
14 - log.logDetail.addInput(sacf,getCmd,"Request",req,req.body); 15 + log.logDetail.addInput(sacf,getCmd,constant.REQUEST,req,req.body);
15 16
16 var err = validator(req,getCmd); 17 var err = validator(req,getCmd);
17 18
@@ -33,20 +34,20 @@ exports.postCustomer = async function (req, res, next){ @@ -33,20 +34,20 @@ exports.postCustomer = async function (req, res, next){
33 }; 34 };
34 35
35 const result = await connection.requestJsonToD01(objectData,sendCmd,"POST"); 36 const result = await connection.requestJsonToD01(objectData,sendCmd,"POST");
36 - log.logDetail.addInput(d01,sendCmd,"Response",result,result.response); 37 + log.logDetail.addInput(d01,sendCmd,constant.RESPONSE,result,result.response);
37 if(typeof result.err === 'undefined'){ 38 if(typeof result.err === 'undefined'){
38 // console.log(result.response.body); 39 // console.log(result.response.body);
39 var resultObj = result.response; 40 var resultObj = result.response;
40 if(resultObj.resultCode.startsWith("2")) 41 if(resultObj.resultCode.startsWith("2"))
41 { 42 {
42 - stats.receiveRestResponse(d01,"POST",sendCmd,"Success"); 43 + stats.receiveRestResponse(d01,constant.METHOD.POST,sendCmd,"Success");
43 var response = responseMsg.direct(req,getCmd,resultObj,{customerId:objectData.customerId}); 44 var response = responseMsg.direct(req,getCmd,resultObj,{customerId:objectData.customerId});
44 log.addSuccessSummary(d01,sendCmd,response); 45 log.addSuccessSummary(d01,sendCmd,response);
45 } else { 46 } else {
46 if(resultObj.resultCode != "40401"){ 47 if(resultObj.resultCode != "40401"){
47 resultObj.resultCode = "50000"; 48 resultObj.resultCode = "50000";
48 } 49 }
49 - stats.receiveRestResponse(d01,"GET",sendCmd,"Error"); 50 + stats.receiveRestResponse(d01,constant.METHOD.POST,sendCmd,"Error");
50 var response = responseMsg.direct(req,getCmd,resultObj); 51 var response = responseMsg.direct(req,getCmd,resultObj);
51 log.addErrorSummary(d01,sendCmd,response); 52 log.addErrorSummary(d01,sendCmd,response);
52 } 53 }
@@ -61,7 +62,7 @@ exports.postCustomer = async function (req, res, next){ @@ -61,7 +62,7 @@ exports.postCustomer = async function (req, res, next){
61 stats.receiveResponse(sacf,sendCmd,"Error"); 62 stats.receiveResponse(sacf,sendCmd,"Error");
62 } 63 }
63 64
64 - log.logDetail.addOutput(sacf,getCmd,"Response",response,response); 65 + log.logDetail.addOutput(sacf,getCmd,constant.RESPONSE,response,response);
65 res.status(200).json(response); 66 res.status(200).json(response);
66 next(); 67 next();
67 }; 68 };
ais-structure/src/modules/helper/constants.js 0 → 100644
  Diff comments   View file @3d36a44
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
  1 +module.exports = Object.freeze({
  2 + REQUEST: 'Request',
  3 + RESPONSE: 'Response',
  4 + METHOD:{
  5 + GET : 'GET',
  6 + POST : 'POST',
  7 + PUT : 'PUT',
  8 + DELETE : 'DELETE'
  9 + },
  10 + RESPONSERESULT:{
  11 + SUCCESS:{
  12 + resultCode : '20000',
  13 + resultDescription : 'Success'
  14 + },
  15 + MISSING_INVALID:{
  16 + resultCode : '40300',
  17 + resultDescription : 'Missing or invalid parameter'
  18 + },
  19 + DATA_NOT_FOUND:{
  20 + resultCode : '40401',
  21 + resultDescription : 'Data Not Found'
  22 + },
  23 + DATA_EXIST:{
  24 + resultCode : '40301',
  25 + resultDescription : 'Data Exist'
  26 + },
  27 + ERROR:{
  28 + resultCode : '50000',
  29 + resultDescription : 'System error'
  30 + }
  31 + }
  32 +});
0 \ No newline at end of file 33 \ No newline at end of file
ais-structure/src/modules/vizcard/vizCard.ctrl.js
  Diff comments   View file @3d36a44
@@ -6,6 +6,7 @@ var validatorHelper = require('../helper/validator.js'); @@ -6,6 +6,7 @@ var validatorHelper = require('../helper/validator.js');
6 var connection = require('../helper/connection.js'); 6 var connection = require('../helper/connection.js');
7 var responseMsg = require('../helper/responseMsg.js'); 7 var responseMsg = require('../helper/responseMsg.js');
8 var log = require('../helper/log.js'); 8 var log = require('../helper/log.js');
  9 +var constant = require('../helper/constants.js')
9 10
10 exports.vizcard = async function (req, res, next) { 11 exports.vizcard = async function (req, res, next) {
11 var getCmd = "VIZCard"; 12 var getCmd = "VIZCard";
@@ -13,7 +14,7 @@ exports.vizcard = async function (req, res, next) { @@ -13,7 +14,7 @@ exports.vizcard = async function (req, res, next) {
13 var sacf = "SACF" 14 var sacf = "SACF"
14 15
15 log.startlog(getCmd,req); 16 log.startlog(getCmd,req);
16 - log.logDetail.addInput(sacf,getCmd,"Request",req,req.body); 17 + log.logDetail.addInput(sacf,getCmd,constant.REQUEST,req,req.body);
17 18
18 var err = validator(req,getCmd); 19 var err = validator(req,getCmd);
19 20
@@ -70,14 +71,14 @@ exports.vizcard = async function (req, res, next) { @@ -70,14 +71,14 @@ exports.vizcard = async function (req, res, next) {
70 var resultSet = {rawDataJson : ""} 71 var resultSet = {rawDataJson : ""}
71 } 72 }
72 73
73 - log.logDetail.addInput(sacf,sendCmd,"Response",result,resultSet.rawDataJson); 74 + log.logDetail.addInput(sacf,sendCmd,constant.RESPONSE,result,resultSet.rawDataJson);
74 75
75 if(!response){ 76 if(!response){
76 var response = responseMsg.error(req,getCmd,50000); 77 var response = responseMsg.error(req,getCmd,50000);
77 stats.receiveSACFResponse(sacf,sendCmd,"Error"); 78 stats.receiveSACFResponse(sacf,sendCmd,"Error");
78 } 79 }
79 80
80 - log.logDetail.addOutput(sacf,getCmd,"Response",response,response); 81 + log.logDetail.addOutput(sacf,getCmd,constant.RESPONSE,response,response);
81 res.status(200).json(response); 82 res.status(200).json(response);
82 next(); 83 next();
83 } 84 }