Merge 05a70b6 into 2b6acef

akhilome · Jan 28, 2019 · 24ab82f · 24ab82f
2 parents 2b6acef + 05a70b6
commit 24ab82f
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/server/controllers/orderController.js b/server/controllers/orderController.js
@@ -42,7 +42,9 @@ class OrderController {
     }
 
     try {
-      const allOrders = (await pool.query('SELECT orders.id, orders.items, orders.price, users.name, orders.date, orders.status FROM orders JOIN users ON orders.author = users.id')).rows;
+      const allOrders = (await pool.query(
+        'SELECT orders.id, orders.items, orders.price, users.name, orders.date, orders.status FROM orders JOIN users ON orders.author = users.id',
+      )).rows;
 
       const formattedOrders = orderFormatter(allOrders);
       const targetOrder = formattedOrders.find(order => order.id === Number(id));
@@ -73,8 +75,8 @@ class OrderController {
 
     try {
       await pool.query(dbInsertQuery, [JSON.stringify(foodItems), foodItemsTotalPrice, req.userId]);
-      const allOrders = (await pool.query(dbSelectQuery));
-      const newOrder = (orderFormatter(allOrders.rows))[allOrders.rowCount - 1];
+      const allOrders = await pool.query(dbSelectQuery);
+      const newOrder = orderFormatter(allOrders.rows)[allOrders.rowCount - 1];
 
       return res.status(201).json({
         status: 'success',
@@ -97,11 +99,14 @@ class OrderController {
     if (!Number(id)) return res.status(400).json({ status: 'error', message: 'invalid order id provided' });
 
     try {
-      const orderExists = (await pool.query('SELECT * FROM orders WHERE id=$1', [Number(id)])).rowCount;
+      const orderExists = (await pool.query('SELECT * FROM orders WHERE id=$1', [Number(id)]))
+        .rowCount;
       if (!orderExists) return res.status(404).json({ status: 'error', message: 'no order with that id exists' });
 
       await pool.query('UPDATE orders SET status=$1 WHERE id=$2', [req.status, Number(id)]);
-      const updatedOrders = (await pool.query('SELECT orders.id, orders.items, orders.price, users.name, orders.date, orders.status FROM orders JOIN users ON orders.author = users.id')).rows;
+      const updatedOrders = (await pool.query(
+        'SELECT orders.id, orders.items, orders.price, users.name, orders.date, orders.status FROM orders JOIN users ON orders.author = users.id',
+      )).rows;
 
       const formattedOrders = orderFormatter(updatedOrders);
       const targetOrder = formattedOrders.find(order => order.id === Number(id));
@@ -128,19 +133,19 @@ class OrderController {
     if (Number(id) !== req.userId) {
       return res.status(403).json({
         status: 'error',
-        message: 'you\'re not allowed to do that',
+        message: "you're not allowed to do that",
       });
     }
 
     try {
       const userOrders = (await pool.query('SELECT * FROM orders WHERE author=$1', [id])).rows;
-      const formattedUserOrders = userOrders
-        .map(order => ({
-          items: JSON.parse(order.items),
-          price: order.price,
-          date: order.date,
-          status: order.status,
-        }));
+      const formattedUserOrders = userOrders.map(order => ({
+        id: order.id,
+        items: JSON.parse(order.items),
+        price: order.price,
+        date: order.date,
+        status: order.status,
+      }));
       return res.status(200).json({
         status: 'success',
         message: 'orders fetched successfully',