Nattapon Wongpaet / Hospital

Download as
Browse Code ยป

Commit 5a3cfae27d428891beec98e1ce18932352ff5fba

Authored by sumatek
1 parent 0b6272e0
Exists in master

update log

Showing 6 changed files with 102 additions and 51 deletions   Show diff stats
@@ -4,6 +4,7 @@ const app = express(); @@ -4,6 +4,7 @@ const app = express();
4 const conf = require('utils/config'); 4 const conf = require('utils/config');
5 const utils = require('utils/utils'); 5 const utils = require('utils/utils');
6 var log = require('./utils/log'); 6 var log = require('./utils/log');
  7 +var constants = require('./utils/constants');
7 8
8 var logg = require('commonlog-kb').init(conf.get("configlog"),app); 9 var logg = require('commonlog-kb').init(conf.get("configlog"),app);
9 10
@@ -143,7 +144,7 @@ app.use(function( req, res, next ) { @@ -143,7 +144,7 @@ app.use(function( req, res, next ) {
143 }); 144 });
144 145
145 app.use( function( req, res, next ) { 146 app.use( function( req, res, next ) {
146 - // log.startEC(req); 147 + log.startEC(req);
147 req = utils.findQueryString(req); 148 req = utils.findQueryString(req);
148 next(); 149 next();
149 }); 150 });
@@ -174,6 +175,17 @@ app.use( function( req, res, next ) { @@ -174,6 +175,17 @@ app.use( function( req, res, next ) {
174 175
175 }else 176 }else
176 { 177 {
  178 + var response = constants.RESPONSERESULT.UNKNOW;
  179 +
  180 + log.startlog(req,cmd,'session','identity');
  181 + log.detailRequestFE(req);
  182 + stat.receiveUnknow();
  183 + log.addErrorSummary(req,"Unknow",req.method+"_"+"Unknow",result)
  184 + res.status(200).json(response);
  185 + log.logSummary(req,response);
  186 +
  187 +
  188 +
177 // var response = responseMsg.unknow(req); 189 // var response = responseMsg.unknow(req);
178 190
179 // log.startlog(req,req.method+"_"+"Unknow","Unknow","Unknow"); 191 // log.startlog(req,req.method+"_"+"Unknow","Unknow","Unknow");
@@ -185,7 +197,7 @@ app.use( function( req, res, next ) { @@ -185,7 +197,7 @@ app.use( function( req, res, next ) {
185 // log.logSummary(req,response); 197 // log.logSummary(req,response);
186 } 198 }
187 199
188 - // log.endEC(req,res); 200 + log.endEC(req,res);
189 next(); 201 next();
190 } ); 202 } );
191 203
controllers/preference/index.js
  Diff comments   View file @5a3cfae
@@ -4,28 +4,43 @@ let connection = require("../../utils/mongoDB") @@ -4,28 +4,43 @@ let connection = require("../../utils/mongoDB")
4 var utils = require('../../utils/utils'); 4 var utils = require('../../utils/utils');
5 var stats = require('../../utils/stats'); 5 var stats = require('../../utils/stats');
6 var log = require('../../utils/log'); 6 var log = require('../../utils/log');
  7 +var constants = require('../../utils/constants');
7 8
8 9
  10 +var allow = ['general','holiday','shift','service','job','specialist','room'];
  11 +
  12 +router.get('/:collection',async function (req, res,next) {
  13 + var cmd = req.params.collection;
  14 +
  15 + var checkStart = start(req,cmd);
  16 + if(checkStart.err)
  17 + {
  18 + var result = checkStart.err;
  19 + end(req,"Unknow");
  20 +
  21 + }else
  22 + {
  23 + var collection = req.params.collection;
  24 +
  25 + var query = Object.assign(req.params, req.query);
  26 + var filter = await utils.getQueryFilter(query.filter);
  27 + var result = await connection.reqMongo(req,req.method,filter,collection)
  28 + end(req,cmd);
  29 + }
9 30
10 -router.get('/:collection',async function (req, res,next)  
11 -{  
12 - start(req)  
13 - var collection = req.params.collection;  
14 -  
15 - var query = Object.assign(req.params, req.query);  
16 - var filter = await utils.getQueryFilter(query.filter);  
17 - var result = await connection.reqMongo(req,req.method,filter,collection)  
18 31
19 - end(req);  
20 res.status(200).json(result); 32 res.status(200).json(result);
21 next(); 33 next();
22 }); 34 });
23 35
24 router.post('/:collection',async function (req, res,next) { 36 router.post('/:collection',async function (req, res,next) {
  37 + start(req)
25 var collection = req.params.collection; 38 var collection = req.params.collection;
26 39
27 var query = req.body; 40 var query = req.body;
28 var result = await connection.reqMongo(req,req.method,query,collection) 41 var result = await connection.reqMongo(req,req.method,query,collection)
  42 +
  43 + end(req);
29 res.status(200).json(result); 44 res.status(200).json(result);
30 next(); 45 next();
31 }); 46 });
@@ -42,16 +57,25 @@ router.post('/:collection',async function (req, res,next) { @@ -42,16 +57,25 @@ router.post('/:collection',async function (req, res,next) {
42 // res.status(200).json(result); 57 // res.status(200).json(result);
43 // }); 58 // });
44 59
45 -function start(req) {  
46 - var cmd = req.params.collection; 60 +function start(req,cmd) {
47 log.startlog(req,cmd,'session','identity'); 61 log.startlog(req,cmd,'session','identity');
48 - stats.receiveRequest(req.method,cmd);  
49 - log.detailRequestFE(req); 62 +
  63 + if(allow.indexOf(cmd) != -1)
  64 + {
  65 + stats.receiveRequest(req.method,cmd);
  66 + log.detailRequestFE(req);
  67 + return {};
  68 + }else
  69 + {
  70 + stats.receiveUnknow();
  71 + log.detailRequestFE(req);
  72 + return {err:constants.RESPONSERESULT.UNKNOW};
  73 +
  74 + }
50 }; 75 };
51 76
52 -function end(req) {  
53 - var collection = req.params.collection;  
54 - stats.sendResponse(req.method,collection); 77 +function end(req,cmd) {
  78 + stats.sendResponse(req.method,cmd);
55 log.detailResponseFE(req); 79 log.detailResponseFE(req);
56 }; 80 };
57 module.exports = router; 81 module.exports = router;
58 \ No newline at end of file 82 \ No newline at end of file
utils/constants.js
  Diff comments   View file @5a3cfae
@@ -60,31 +60,31 @@ module.exports = Object.freeze({ @@ -60,31 +60,31 @@ module.exports = Object.freeze({
60 RESPONSERESULT:{ 60 RESPONSERESULT:{
61 SUCCESS:{ 61 SUCCESS:{
62 resultCode : '20000', 62 resultCode : '20000',
63 - developerMessage : 'Success' 63 + resultDescription : 'Success'
64 }, 64 },
65 MISSING_INVALID:{ 65 MISSING_INVALID:{
66 resultCode : '40300', 66 resultCode : '40300',
67 - developerMessage : 'Missing or invalid parameter' 67 + resultDescription : 'Missing or invalid parameter'
68 }, 68 },
69 DATA_NOT_FOUND:{ 69 DATA_NOT_FOUND:{
70 resultCode : '40401', 70 resultCode : '40401',
71 - developerMessage : 'Data Not Found' 71 + resultDescription : 'Data Not Found'
72 }, 72 },
73 DATA_EXIST:{ 73 DATA_EXIST:{
74 resultCode : '40301', 74 resultCode : '40301',
75 - developerMessage : 'Data Exist' 75 + resultDescription : 'Data Exist'
76 }, 76 },
77 ERROR:{ 77 ERROR:{
78 resultCode : '50000', 78 resultCode : '50000',
79 - developerMessage : 'System error' 79 + resultDescription : 'System error'
80 }, 80 },
81 DENIED:{ 81 DENIED:{
82 resultCode : '40100', 82 resultCode : '40100',
83 - developerMessage : 'Access Denied' 83 + resultDescription : 'Access Denied'
84 }, 84 },
85 UNKNOW:{ 85 UNKNOW:{
86 - resultCode : '40400',  
87 - developerMessage : 'Unknown URL' 86 + resultCode : '50060',
  87 + resultDescription : 'Unknown URL'
88 } 88 }
89 } 89 }
90 }); 90 });
91 \ No newline at end of file 91 \ No newline at end of file
@@ -17,7 +17,7 @@ log4js.configure({ @@ -17,7 +17,7 @@ log4js.configure({
17 var logger4jDetail = log4js.getLogger(conf.projectName); 17 var logger4jDetail = log4js.getLogger(conf.projectName);
18 var logger = []; 18 var logger = [];
19 19
20 -var mapLog = {}; 20 +const mapLog = {};
21 21
22 logger.startlog = function (req,cmdData,session,identity) 22 logger.startlog = function (req,cmdData,session,identity)
23 { 23 {
@@ -28,7 +28,7 @@ logger.startlog = function (req,cmdData,session,identity) @@ -28,7 +28,7 @@ logger.startlog = function (req,cmdData,session,identity)
28 cmd : cmdData, 28 cmd : cmdData,
29 identity : utils.undefinedToNull(identity) 29 identity : utils.undefinedToNull(identity)
30 }; 30 };
31 - 31 +
32 mapLog[req.id].start = start; 32 mapLog[req.id].start = start;
33 } 33 }
34 34
@@ -156,7 +156,7 @@ logger.startEC = function(req) @@ -156,7 +156,7 @@ logger.startEC = function(req)
156 messageRes += newLine+"Time in : "+startTime.toISOString(); 156 messageRes += newLine+"Time in : "+startTime.toISOString();
157 messageRes += newLine 157 messageRes += newLine
158 158
159 - logg.debug(messageRes); 159 + // logg.debug(messageRes);
160 } 160 }
161 161
162 logger.endEC = function(req,res) 162 logger.endEC = function(req,res)
@@ -195,7 +195,7 @@ logger.endEC = function(req,res) @@ -195,7 +195,7 @@ logger.endEC = function(req,res)
195 195
196 196
197 197
198 - logg.debug(messageRes); 198 + // logg.debug(messageRes);
199 messageRes += newLine 199 messageRes += newLine
200 } 200 }
201 201
@@ -220,14 +220,14 @@ logger.detailResponseFE = function(req) @@ -220,14 +220,14 @@ logger.detailResponseFE = function(req)
220 logger4jDetail.info(logPrefix(req)+protocal+" "+method+" "+url+" Response to FE - body: "+body); 220 logger4jDetail.info(logPrefix(req)+protocal+" "+method+" "+url+" Response to FE - body: "+body);
221 } 221 }
222 222
223 -logger.detailSqlQuery = function(req,method,data) 223 +logger.detailSqlQuery = function(req,collection,data)
224 { 224 {
225 - logger4jDetail.info(logPrefix(req)+method+": "+JSON.stringify(data)); 225 + logger4jDetail.info(logPrefix(req)+"BE Send Mongo Collection: \""+collection+"\" Query: "+JSON.stringify(data));
226 } 226 }
227 227
228 -logger.detailSqlResult = function(req,method,data) 228 +logger.detailSqlResult = function(req,collection,data)
229 { 229 {
230 - logger4jDetail.info(logPrefix(req)+method+": "+JSON.stringify(data)); 230 + logger4jDetail.info(logPrefix(req)+"BE Receive Mongo Collection: \""+collection+"\" Result: "+JSON.stringify(data));
231 } 231 }
232 232
233 logger.detailRequestBE = function(req,data) 233 logger.detailRequestBE = function(req,data)
utils/mongoDB.js
  Diff comments   View file @5a3cfae
@@ -20,8 +20,8 @@ function mongoReq(req,url,database,method, query, collection){ @@ -20,8 +20,8 @@ function mongoReq(req,url,database,method, query, collection){
20 20
21 var nodeName = "MongoDB"; 21 var nodeName = "MongoDB";
22 var funStats = { 22 var funStats = {
23 - detailSqlQuery : function(query){log.detailSqlQuery(req,method,query);},  
24 - detailSqlResult : function(result, err){log.detailSqlResult(req,method,result || err);}, 23 + detailSqlQuery : function(query){log.detailSqlQuery(req,collection,query);},
  24 + detailSqlResult : function(result, err){log.detailSqlResult(req,collection,result || err);},
25 addSuccessSummary : function(result){log.addSuccessSummary(req,nodeName,collection,result);}, 25 addSuccessSummary : function(result){log.addSuccessSummary(req,nodeName,collection,result);},
26 addErrorSummary : function(result){log.addErrorSummary(req,nodeName,collection,result);} 26 addErrorSummary : function(result){log.addErrorSummary(req,nodeName,collection,result);}
27 }; 27 };
@@ -90,9 +90,16 @@ function checkResponse(result,err,funStats) @@ -90,9 +90,16 @@ function checkResponse(result,err,funStats)
90 } 90 }
91 else 91 else
92 { 92 {
93 - var returnData = constants.RESPONSECONN.MESSAGE.SUCCESS;  
94 - returnData.resultData = result;  
95 - funStats.addSuccessSummary(returnData); 93 + if(result.length > 1)
  94 + {
  95 + var returnData = constants.RESPONSERESULT.SUCCESS;
  96 + returnData.resultData = result;
  97 + funStats.addSuccessSummary(returnData);
  98 + }else
  99 + {
  100 + var returnData = constants.RESPONSERESULT.DATA_NOT_FOUND;
  101 + funStats.addErrorSummary(returnData);
  102 + }
96 } 103 }
97 104
98 return returnData 105 return returnData
utils/stats.js
  Diff comments   View file @5a3cfae
@@ -7,30 +7,38 @@ var stat = []; @@ -7,30 +7,38 @@ var stat = [];
7 7
8 8
9 //client and Node 9 //client and Node
10 -stat.receiveRequest = function (method,cmd,from){  
11 - writeStats(nodeName+" receive "+method+" "+cmd+" request from "+(from?from:"Client")); 10 +stat.receiveRequest = function (method,cmd){
  11 + writeStats(nodeName+" Receive "+method+" "+cmd+" Request");
12 }; 12 };
13 13
14 -stat.sendResponse = function (method,cmd,to){  
15 - writeStats(nodeName+" send "+method+" "+cmd+" response to "+(to?to:"Client")); 14 +stat.receiveBadRequest = function (method,cmd){
  15 + writeStats(nodeName+" Receive Bad "+method+" "+cmd+" Request");
  16 +};
  17 +
  18 +stat.sendResponse = function (method,cmd,result){
  19 + writeStats(nodeName+" Send "+method+" "+cmd+" Response "+(result?result:"Success"));
16 }; 20 };
17 21
18 //node and mongo 22 //node and mongo
19 -stat.sendQuery = function (cmd,to){  
20 - writeStats(nodeName+" send QUERY "+cmd+" request to "+(to?to:"MongoDB")); 23 +stat.sendQuery = function (collection){
  24 + writeStats(nodeName+" Send QUERY "+collection+" Request");
  25 +};
  26 +
  27 +stat.receiveBadQuery = function (collection){
  28 + writeStats(nodeName+" Receive Bad QUERY "+collection+" Response");
21 }; 29 };
22 30
23 -stat.receiveQuery = function (cmd,from){  
24 - writeStats(nodeName+" receive QUERY "+cmd+" response from "+(from?from:"MongoDB")); 31 +stat.receiveQuery = function (collection){
  32 + writeStats(nodeName+" Receive QUERY "+collection+" Response");
25 }; 33 };
26 34
27 //unknow 35 //unknow
28 -stat.receiveUnknow = function(message){  
29 - writeStats(nodeName+" Receive "+message+" "+constants.REQUEST); 36 +stat.receiveUnknow = function(){
  37 + writeStats(nodeName+" Receive Unknown Error Request");
30 }; 38 };
31 39
32 -stat.sendUnknow = function(message){  
33 - writeStats(nodeName+" Send "+message); 40 +stat.sendUnknow = function(){
  41 + writeStats(nodeName+" Send Unknown Error Response");
34 }; 42 };
35 43
36 function writeStats(string) { 44 function writeStats(string) {