change 'GET' request not to use body data

nusmoney_backend/bin/www

@@ -12,7 +12,7 @@ var http = require('http');
  * Get port from environment and store in Express.
  */
 
-var port = normalizePort(process.env.PORT || '3000');
+var port = normalizePort(process.env.PORT || '7000');
 app.set('port', port);
 
 /**

nusmoney_backend/routes/users.js

@@ -2,11 +2,6 @@ const express = require('express');
 const router = express.Router();
 const connection = require("../connection");
 
-/* GET users listing. */
-/* router.get('/', function(req, res, next) {
-  res.send('respond with a resource');
-}); */
-
 /* 
 AddUser()
  POST route for /users 
@@ -33,54 +28,30 @@ router.post("/", (request, response) => {
   });
 });
 
-// ShowUser()
+// GetUserById()
-// GET route for /users query (AddUser)
+// GET route for /users query
+// use query parameter as GET don't allow body when using fetch() function
 router.get("/", (request, response) => {
-  console.log(request.body);
   //
-    strQuery = "SELECT * FROM users";
+  let sql = "SELECT * FROM users ";
-  if (request.body.limit > 0) {
+
-      strQuery += ` LIMIT ${request.body.limit}`
+  if (request.query.name != null){
+    sql += `WHERE name = '${request.query.name}'`;
+  }
+  else if (request.query.id != null) {
+    sql += `WHERE user_id = ${request.query.id}`;
   }
 
-  connection.query(strQuery, 
+  if (request.query.limit > 0){
-  (err, result) => {
+    sql += ` LIMIT ${request.query.limit}`;
-      if (err) {
+  }
-          response.send("Some error occur");
-      }
-      else {
-          response.send(result);
-      }    
-  });
-});
 
-// GetUserById()
+  console.log(sql);
-// GET route for /users/id query
-// with body = { "id": 2 }
-router.get("/id", (request, response) => {
-  console.log(request.body);
-  //
-  connection.query(`SELECT * FROM users WHERE user_id = ${request.body.id}`, 
-  (err, result) => {
-      if (err) {
-          response.send("Some id error occur");
-      }
-      else {
-          response.send(result);
-      }    
-  });
-});
 
-// GetUserByName()
+  connection.query(sql, 
-// GET route for /users/id query
-// with body = { "name": "John" }
-router.get("/name", (request, response) => {
-  console.log(request.body);
-  //
-  connection.query(`SELECT * FROM users WHERE name = '${request.body.name}'`, 
   (err, result) => {
       if (err) {
-          response.send("Some name error occur");
+          response.send("Some id error occur");
       }
       else {
           response.send(result);
@@ -89,13 +60,12 @@ router.get("/name", (request, response) => {
 });
 
 // UpdateUserName()
-// PUT route for /users/id query
+// PUT route for /users?id=xx query
-// with body = { "id": 599 }
+// with body = { "name" = "..." }
-router.put("/name", (request, response) => {
+router.put("/", (request, response) => {
-  console.log(request.body);
   //
   connection.query(`UPDATE users SET name = '${request.body.name}'
-  WHERE user_id = ${request.body.id}`, 
+  WHERE user_id = ${request.query.id}`, 
   (err, result) => {
       if (err) {
           response.send("user id error occur");
@@ -108,14 +78,17 @@ router.put("/name", (request, response) => {
 
 // DeleteUser()
 // DELETE route for /users query
-// with body = { "id": 599 }
+// 
-router.delete("/", (request, response) => {
+router.delete("/:id", (request, response) => {
-  console.log(request.body);
   //
-  connection.query(`DELETE FROM users WHERE user_id = '${request.body.id}'`, 
+  let sql = `DELETE FROM users WHERE user_id = ${request.params.id}`;
+  console.log(sql);
+  //
+  connection.query(sql, 
   (err, result) => {
       if (err) {
-          response.send("user id error occur");
+          console.log(err.sqlMessage);
+          response.send("delete user id error occur");
       }
       else {
           response.send(result);