Commit c8ff79f126202a2f73ca1fa0d18ccb7730376ca2

Authored by Nattapon Wongpaet
2 parents bc0dad7c 13de8832
Exists in master and in 1 other branch develop

Merge branch 'master' of http://git.sourcecode.co.th/nattaponw/mockup-api

# Conflicts:
#	d01.js
Showing 3 changed files with 22 additions and 4 deletions   Show diff stats
@@ -366,6 +366,11 @@ app.post('/api/v1/gender', require('./d01').postGender); @@ -366,6 +366,11 @@ app.post('/api/v1/gender', require('./d01').postGender);
366 app.put('/api/v1/gender', require('./d01').putGender); 366 app.put('/api/v1/gender', require('./d01').putGender);
367 app.delete('/api/v1/gender', require('./d01').deleteGender); 367 app.delete('/api/v1/gender', require('./d01').deleteGender);
368 368
  369 +app.get('/api/v1/address_type', require('./d01').getAddressType);
  370 +app.post('/api/v1/address_type', require('./d01').postAddressType);
  371 +app.put('/api/v1/address_type', require('./d01').putAddressType);
  372 +app.delete('/api/v1/address_type', require('./d01').deleteAddressType);
  373 +
369 app.post('/auth/v3.1/oauth/token', require('./admd').oauthToken); 374 app.post('/auth/v3.1/oauth/token', require('./admd').oauthToken);
370 app.post('/auth/v3.1/logout', require('./admd').logout); 375 app.post('/auth/v3.1/logout', require('./admd').logout);
371 376
@@ -148,12 +148,25 @@ module.exports.postMemberLink = async (req, res) => { @@ -148,12 +148,25 @@ module.exports.postMemberLink = async (req, res) => {
148 console.log('params', req.params); 148 console.log('params', req.params);
149 console.log('body', req.body); 149 console.log('body', req.body);
150 150
151 - let response = {  
152 - "resultCode": "50000",  
153 - "resultDescription": "System error" 151 + let response;
  152 + if(req.body.memberId == "memberId2") {
  153 + response = {
  154 + "resultCode": "20000",
  155 + "resultDescription": "Success"
  156 + }
  157 + } else {
  158 + response = {
  159 + "resultCode": "20000",
  160 + "resultDescription": "Success"
  161 + }
  162 +
154 } 163 }
155 164
156 res.send(response) 165 res.send(response)
  166 +
  167 +
  168 +
  169 +
157 } 170 }
158 171
159 module.exports.putMemberLink = async (req, res) => { 172 module.exports.putMemberLink = async (req, res) => {
@@ -37,5 +37,5 @@ module.exports.cancelPackage = async (req, res) => { @@ -37,5 +37,5 @@ module.exports.cancelPackage = async (req, res) => {
37 } 37 }
38 38
39 39
40 - res.status(502).send(response) 40 + res.status(200).send(response)
41 } 41 }