Nattapon Wongpaet / SPW

Download as
Browse Code ยป

Commit b77690fa1eb4866acae99effb3a4a62d840d0604

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

update post customermembership

Showing 6 changed files with 35 additions and 16 deletions   Show diff stats
ais-structure/src/modules/customer/customer.ctrl.js
  Diff comments   View file @b77690f
@@ -24,7 +24,7 @@ exports.customer = async function (req, res, next) { @@ -24,7 +24,7 @@ exports.customer = async function (req, res, next) {
24 log.startlog(req,method+"_"+getCmd,req.query.commandId,customerId); 24 log.startlog(req,method+"_"+getCmd,req.query.commandId,customerId);
25 log.logDetail.addInput(req,req.query.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body); 25 log.logDetail.addInput(req,req.query.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body);
26 26
27 - var err = validator(req,getCmd); 27 + var err = await validator(req,getCmd);
28 28
29 if(err.length > 0) 29 if(err.length > 0)
30 { 30 {
ais-structure/src/modules/customer/postCustomer.ctrl.js
  Diff comments   View file @b77690f
@@ -18,7 +18,7 @@ exports.postCustomer = async function (req, res, next){ @@ -18,7 +18,7 @@ exports.postCustomer = async function (req, res, next){
18 log.startlog(req,method+"_"+getCmd,req.body.commandId,customerId); 18 log.startlog(req,method+"_"+getCmd,req.body.commandId,customerId);
19 log.logDetail.addInput(req,req.body.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body); 19 log.logDetail.addInput(req,req.body.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body);
20 20
21 - var err = validator(req,getCmd); 21 + var err = await validator(req,getCmd);
22 22
23 if(err.length > 0) 23 if(err.length > 0)
24 { 24 {
ais-structure/src/modules/helper/connection.js
  Diff comments   View file @b77690f
@@ -106,7 +106,13 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { @@ -106,7 +106,13 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) {
106 106
107 if(params.method == constants.METHOD.GET) 107 if(params.method == constants.METHOD.GET)
108 { 108 {
109 - var genUrl = getUrl(params,service["searchRecordLimit"]); 109 + if(filter && filter == "or"){
  110 + var genUrl = getOrUrl(params);
  111 + }
  112 + else{
  113 + var genUrl = getUrl(params,service["searchRecordLimit"]);
  114 + }
  115 +
110 if(genUrl.length > 1) 116 if(genUrl.length > 1)
111 { 117 {
112 console.log("multi Send"); 118 console.log("multi Send");
@@ -137,7 +143,7 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { @@ -137,7 +143,7 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) {
137 143
138 dataRes[i].data = data.resultData; 144 dataRes[i].data = data.resultData;
139 // console.log(dataRes[i].data); 145 // console.log(dataRes[i].data);
140 - 146 +
141 } 147 }
142 148
143 } 149 }
@@ -325,8 +331,6 @@ function getUrlFilter(url,filter){ @@ -325,8 +331,6 @@ function getUrlFilter(url,filter){
325 // var myUrl = url+"?filter=("+filter.base+")"; 331 // var myUrl = url+"?filter=("+filter.base+")";
326 332
327 returnData.push(myUrl); 333 returnData.push(myUrl);
328 - for(var i=0;i<returnData.length;i++)  
329 - log.log("URL "+[i+1]+" : "+returnData[i]);  
330 334
331 return myUrl; 335 return myUrl;
332 } 336 }
@@ -437,6 +441,22 @@ function getUrl(params,limit) @@ -437,6 +441,22 @@ function getUrl(params,limit)
437 return returnData; 441 return returnData;
438 } 442 }
439 443
  444 +function getOrUrl(params){
  445 + var returnData = [];
  446 + var url = params.url;
  447 + var filter = "";
  448 +
  449 + for(var i in params.body){
  450 + filter = filter + "(" +i+ "=" +params.body[i]+ ")"
  451 + }
  452 +
  453 + url = url + "filter(|" + filter + ")";
  454 +
  455 + returnData.push(url);
  456 +
  457 + return returnData;
  458 +}
  459 +
440 function getFields(fields,first) 460 function getFields(fields,first)
441 { 461 {
442 var returnData; 462 var returnData;
ais-structure/src/modules/membercard/getMembership.ctrl.js
  Diff comments   View file @b77690f
@@ -26,7 +26,7 @@ exports.getMembership = async function (req, res, next) { @@ -26,7 +26,7 @@ exports.getMembership = async function (req, res, next) {
26 log.startlog(req,method+"_"+getCmd,req.query.commandId,customerId); 26 log.startlog(req,method+"_"+getCmd,req.query.commandId,customerId);
27 log.logDetail.addInput(req,req.query.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body); 27 log.logDetail.addInput(req,req.query.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body);
28 28
29 - var err = validator(req,getCmd); 29 + var err = await validator(req,getCmd);
30 30
31 if(err.length > 0) 31 if(err.length > 0)
32 { 32 {
@@ -59,11 +59,11 @@ exports.getMembership = async function (req, res, next) { @@ -59,11 +59,11 @@ exports.getMembership = async function (req, res, next) {
59 59
60 //Get MemberCard handler 60 //Get MemberCard handler
61 if(typeof resultMemberCard.err === 'undefined'){ 61 if(typeof resultMemberCard.err === 'undefined'){
62 - if(resultObj.resultCode.startsWith("2")){  
63 - if(resultObj.resultData && resultObj.resultData.length>0){ 62 + var resultMemberCardObj = resultMemberCard.response;
  63 + if(resultMemberCardObj.resultCode.startsWith("2")){
  64 + if(resultMemberCardObj.resultData && resultMemberCardObj.resultData.length>0){
64 stats.receiveRestResponse(d01,method,sendMemCmd,constant.SUCCESS); 65 stats.receiveRestResponse(d01,method,sendMemCmd,constant.SUCCESS);
65 - log.logDetail.addInput(req,d01,method+"_"+sendCusCmd,constant.RESPONSE,resultMemberCard,resultMemberCard.response);  
66 - var resultMemberCardObj = resultMemberCard.response; 66 + log.logDetail.addInput(req,d01,method+"_"+sendMemCmd,constant.RESPONSE,resultMemberCard,resultMemberCard.response);
67 log.addSuccessSummary(req,d01,method+"_"+sendMemCmd,resultMemberCardObj.resultCode,resultMemberCardObj.resultDescription); 67 log.addSuccessSummary(req,d01,method+"_"+sendMemCmd,resultMemberCardObj.resultCode,resultMemberCardObj.resultDescription);
68 68
69 for(var i = 0; i < resultObj.resultData.length; i++){ 69 for(var i = 0; i < resultObj.resultData.length; i++){
ais-structure/src/modules/membercard/postMembership.ctrl.js
  Diff comments   View file @b77690f
@@ -29,7 +29,7 @@ exports.postMembership = async function (req, res, next){ @@ -29,7 +29,7 @@ exports.postMembership = async function (req, res, next){
29 log.startlog(req,postMethod+"_"+getCmd, req.body.commandId, customerId); 29 log.startlog(req,postMethod+"_"+getCmd, req.body.commandId, customerId);
30 log.logDetail.addInput(req,req.body.clientName, postMethod+"_"+getCmd, constant.REQUEST, req, req.body); 30 log.logDetail.addInput(req,req.body.clientName, postMethod+"_"+getCmd, constant.REQUEST, req, req.body);
31 31
32 - var err = validator(req, getCmd); 32 + var err = await validator(req, getCmd);
33 33
34 if(err.length > 0) 34 if(err.length > 0)
35 { 35 {
@@ -41,12 +41,11 @@ exports.postMembership = async function (req, res, next){ @@ -41,12 +41,11 @@ exports.postMembership = async function (req, res, next){
41 41
42 var objectData = { 42 var objectData = {
43 cardId : req.body.cardId, 43 cardId : req.body.cardId,
44 - cardOwnerIdList : customerId  
45 - // _flag : "or" 44 + cardOwnerIdList : customerId,
46 } 45 }
47 46
48 //GET Customer with cardId and cardOwnerIdList 47 //GET Customer with cardId and cardOwnerIdList
49 - const result = await connection.requestJsonToD01(req,objectData, sendMemberCardCmd, getMethod); 48 + const result = await connection.requestJsonToD01(req,objectData, sendMemberCardCmd, getMethod, "or");
50 log.logDetail.addInput(req,d01, getMethod+"_"+sendMemberCardCmd, constant.RESPONSE, result, result.response); 49 log.logDetail.addInput(req,d01, getMethod+"_"+sendMemberCardCmd, constant.RESPONSE, result, result.response);
51 50
52 var objDataGetCustomer = { 51 var objDataGetCustomer = {
ais-structure/src/modules/vizcard/vizCard.ctrl.js
  Diff comments   View file @b77690f
@@ -20,7 +20,7 @@ exports.vizcard = async function (req, res, next) { @@ -20,7 +20,7 @@ exports.vizcard = async function (req, res, next) {
20 log.startlog(req,method+"_"+getCmd,req.query.commandId,customerId); 20 log.startlog(req,method+"_"+getCmd,req.query.commandId,customerId);
21 log.logDetail.addInput(req,req.query.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body); 21 log.logDetail.addInput(req,req.query.clientName,method+"_"+getCmd,constant.REQUEST,req,req.body);
22 22
23 - var err = validator(req,getCmd); 23 + var err = await validator(req,getCmd);
24 24
25 if(err.length > 0) 25 if(err.length > 0)
26 { 26 {