tried to resolve some of the errors

faizanx168 · faizanx168 · commit 1619300d5206 · 2023-11-10T16:25:49.000-05:00
diff --git a/server/config/data/data.json b/server/config/data/data.json
@@ -7,10 +7,12 @@
     "price": 150.0,
     "size": 10.5,
     "color": "White",
-    "stockquantity": 100,
+    "stock_quantity": 100,
     "category": "Basketball",
-    "targetaudience": "Men",
-    "img_url": "https://static.nike.com/a/images/t_PDP_1728_v1/f_auto,q_auto:eco/bf80c9bb-3c07-4e5a-ba3f-677cc1889e4d/air-force-1-low-retro-mens-shoes-H7r1WF.png"
+    "target_audience": "Men",
+    "image_url": [
+      "https://static.nike.com/a/images/t_PDP_1728_v1/f_auto,q_auto:eco/bf80c9bb-3c07-4e5a-ba3f-677cc1889e4d/air-force-1-low-retro-mens-shoes-H7r1WF.png"
+    ]
   },
   {
     "id": 2,
@@ -20,10 +22,12 @@
     "price": 130.0,
     "size": 10.5,
     "color": "Black",
-    "stockquantity": 80,
+    "stock_quantity": 80,
     "category": "Basketball",
-    "targetaudience": "Men",
-    "img_url": "https://static.nike.com/a/images/t_PDP_1728_v1/f_auto,q_auto:eco,u_126ab356-44d8-4a06-89b4-fcdcc8df0245,c_scale,fl_relative,w_1.0,h_1.0,fl_layer_apply/58928cb8-74c0-4ad3-882a-4bfa65bab908/luka-2-basketball-shoes-vcXFrk.png"
+    "target_audience": "Men",
+    "image_url": [
+      "https://static.nike.com/a/images/t_PDP_1728_v1/f_auto,q_auto:eco,u_126ab356-44d8-4a06-89b4-fcdcc8df0245,c_scale,fl_relative,w_1.0,h_1.0,fl_layer_apply/58928cb8-74c0-4ad3-882a-4bfa65bab908/luka-2-basketball-shoes-vcXFrk.png"
+    ]
   },
   {
     "id": 3,
@@ -33,9 +37,11 @@
     "price": 200.0,
     "size": 10.5,
     "color": "Silver",
-    "stockquantity": 120,
+    "stock_quantity": 120,
     "category": "Basketball",
-    "targetaudience": "Men",
-    "img_url": "https://static.nike.com/a/images/t_PDP_1728_v1/f_auto,q_auto:eco/02fbc834-6752-4778-9a95-1973de02b0b9/lebron-xxi-akoya-basketball-shoes-lnQSsH.png"
+    "target_audience": "Men",
+    "image_url": [
+      "https://static.nike.com/a/images/t_PDP_1728_v1/f_auto,q_auto:eco/02fbc834-6752-4778-9a95-1973de02b0b9/lebron-xxi-akoya-basketball-shoes-lnQSsH.png"
+    ]
   }
 ]
diff --git a/server/config/reset.js b/server/config/reset.js
@@ -10,22 +10,22 @@ const sneakersFile = fs.readFileSync(
   path.join(dirname(currentPath), "../config/data/data.json")
 );
 const sneakersData = JSON.parse(sneakersFile);
-
 const createSneakersTable = async () => {
   const createSneakersTableQuery = `
-    CREATE TABLE IF NOT EXISTS sneakers (
-      id serial PRIMARY KEY,
-      name varchar(100) NOT NULL,
-      brand varchar(100) NOT NULL,
-      description text NOT NULL,
-      price money NOT NULL,
-      size numeric(7, 2) NOT NULL,
-      color varchar(50) NOT NULL,
-      stockquantity integer NOT NULL,
-      category varchar(50) NOT NULL,
-      targetaudience varchar(50) NOT NULL
-    );
+  CREATE TABLE IF NOT EXISTS sneakers (
+    id serial PRIMARY KEY,
+    name varchar(100) NOT NULL,
+    brand varchar(100) NOT NULL,
+    description text NOT NULL,
+    price money NOT NULL,
+    size numeric(7, 2) NOT NULL,
+    color varchar(50) NOT NULL,
+    stock_quantity integer NOT NULL,
+    category varchar(50) NOT NULL,
+    target_audience varchar(50) NOT NULL
+  );
   `;
+  // console.log(sneakersData);
 
   try {
     const res = await pool.query(createSneakersTableQuery);
@@ -38,10 +38,10 @@ const createSneakersTable = async () => {
 const createImagesTable = async () => {
   const createImagesTableQuery = `
       CREATE TABLE IF NOT EXISTS images (
-        imageid serial PRIMARY KEY,
-        productid integer NOT NULL,
-        imageurl text NOT NULL,
-        FOREIGN KEY(productid) REFERENCES sneakers(id)
+        id serial PRIMARY KEY,
+        product_id integer NOT NULL,
+        image_url text NOT NULL,
+        FOREIGN KEY(product_id) REFERENCES sneakers(id)
       );
     `;
 
@@ -56,9 +56,9 @@ const createImagesTable = async () => {
 const seedSneakersTable = async () => {
   await createSneakersTable();
 
-  sneakersData.forEach((sneaker) => {
+  await sneakersData.forEach((sneaker) => {
     const insertQuery = {
-      text: "INSERT INTO sneakers (name, brand, description, price, size, color, stockquantity, category, targetaudience) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
+      text: "INSERT INTO sneakers (name, brand, description, price, size, color, stock_quantity, category, target_audience) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
     };
 
     const values = [
@@ -68,9 +68,9 @@ const seedSneakersTable = async () => {
       sneaker.price,
       sneaker.size,
       sneaker.color,
-      sneaker.stockquantity,
+      sneaker.stock_quantity,
       sneaker.category,
-      sneaker.targetaudience,
+      sneaker.target_audience,
     ];
 
     try {
@@ -88,10 +88,10 @@ const seedImagesTable = async () => {
 
   sneakersData.forEach((sneaker) => {
     const insertImageQuery = {
-      text: "INSERT INTO images (productid, imageurl) VALUES ($1, $2)",
+      text: "INSERT INTO images (product_id, image_url) VALUES ($1, $2)",
     };
 
-    const imageValues = [sneaker.id, sneaker.img_url];
+    const imageValues = [sneaker.id, sneaker.image_url[0]];
 
     try {
       pool.query(insertImageQuery, imageValues);
@@ -101,15 +101,16 @@ const seedImagesTable = async () => {
     }
   });
 };
+
 const createReviewsTable = async () => {
   const createReviewsTableQuery = `
       CREATE TABLE IF NOT EXISTS reviews (
-        reviewid serial PRIMARY KEY,
-        productid integer NOT NULL,
-        userid integer NOT NULL,
+        review_id serial PRIMARY KEY,
+        product_id integer NOT NULL,
+        user_id integer NOT NULL,
         rating integer NOT NULL,
-        reviewtext text NOT NULL,
-        reviewdate date NOT NULL
+        review_text text NOT NULL,
+        review_date date NOT NULL
       );
     `;
 
@@ -122,12 +123,13 @@ const createReviewsTable = async () => {
 };
 const createUsersTable = async () => {
   const createUsersTableQuery = `
-    CREATE TABLE IF NOT EXISTS user (
+    CREATE TABLE IF NOT EXISTS users (
       id serial PRIMARY KEY,
-      googleid integer NOT NULL,
+      google_id integer UNIQUE NOT NULL,
       username varchar(100) NOT NULL,
       avatarurl varchar(500) NOT NULL,
-      accesstoken varchar(500) NOT NULL
+      access_token varchar(500) NOT NULL,
+      is_admin boolean NOT NULL
     );
   `;
 
@@ -141,15 +143,15 @@ const createUsersTable = async () => {
 
 const createUserAddressTable = async () => {
   const createUserAddressTableQuery = `
-      CREATE TABLE IF NOT EXISTS useraddress (
+      CREATE TABLE IF NOT EXISTS user_address (
         id serial PRIMARY KEY,
-        userid integer NOT NULL,
+        user_id integer NOT NULL,
         address varchar(255) NOT NULL,
         city varchar(100) NOT NULL,
-        postalcode varchar(10) NOT NULL,
+        postal_code varchar(10) NOT NULL,
         country varchar(100) NOT NULL,
         phone varchar(20) NOT NULL,
-        FOREIGN KEY(userid) REFERENCES user(id)
+        FOREIGN KEY(userid) REFERENCES users(id)
       );
     `;
 
diff --git a/server/controllers/reviews.js b/server/controllers/reviews.js
@@ -6,7 +6,7 @@ const createReview = async (req, res) => {
     const { userid, rating, reviewtext, reviewdate } = req.body;
 
     const results = await pool.query(
-      `INSERT INTO reviews (productid, userid, rating, reviewtext, reviewdate)
+      `INSERT INTO reviews (product_id, user_id, rating, review_text, review_date)
       VALUES($1, $2, $3, $4, $5) 
       RETURNING *`,
       [productid, userid, rating, reviewtext, reviewdate]
@@ -32,7 +32,7 @@ const getProductReviews = async (req, res) => {
   try {
     const productid = parseInt(req.params.productid);
     const results = await pool.query(
-      "SELECT * FROM reviews WHERE productid = $1",
+      "SELECT * FROM reviews WHERE product_id = $1",
       [productid]
     );
     res.status(200).json(results.rows);
@@ -47,8 +47,8 @@ const updateReview = async (req, res) => {
     const { rating, reviewtext, reviewdate } = req.body;
     const results = await pool.query(
       `UPDATE reviews
-      SET rating = $1, reviewtext = $2, reviewdate = $3
-      WHERE reviewid = $4`,
+      SET rating = $1, review_text = $2, review_date = $3
+      WHERE review_id = $4`,
       [rating, reviewtext, reviewdate, reviewid]
     );
     res.status(200).json(results.rows[0]);
@@ -61,7 +61,7 @@ const deleteReview = async (req, res) => {
   try {
     const reviewid = parseInt(req.params.reviewid);
     const results = await pool.query(
-      "DELETE FROM reviews WHERE reviewid = $1",
+      "DELETE FROM reviews WHERE review_id = $1",
       [reviewid]
     );
     res.status(200).json(results.rows[0]);
diff --git a/server/controllers/sneakers.js b/server/controllers/sneakers.js
@@ -1,5 +1,4 @@
 import { pool } from "../config/database.js";
-
 const createSneaker = async (req, res) => {
   try {
     const {
@@ -16,7 +15,7 @@ const createSneaker = async (req, res) => {
     } = req.body;
 
     const sneakerResult = await pool.query(
-      `INSERT INTO sneakers (name, brand, description, price, size, color, stockquantity, category, targetaudience)
+      `INSERT INTO sneakers (name, brand, description, price, size, color, stock_quantity, category, target_audience)
         VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9) 
         RETURNING id`,
       [
@@ -35,12 +34,12 @@ const createSneaker = async (req, res) => {
     const productId = sneakerResult.rows[0].id;
 
     // Assume imageUrls is an array of image URLs associated with the sneakers
-    const imageUrls = req.body.img_url || [];
+    const imageUrls = img_url || [];
 
     // Insert image URLs into the images table
     const imageInsertPromises = imageUrls.map(async (imageUrl) => {
       await pool.query(
-        `INSERT INTO images (productid, imageurl)
+        `INSERT INTO images (product_id, image_url)
           VALUES($1, $2)`,
         [productId, imageUrl]
       );
@@ -59,17 +58,25 @@ const createSneaker = async (req, res) => {
 
 const getSneakers = async (req, res) => {
   try {
-    const results = await pool.query("SELECT * FROM sneakers ORDER BY id ASC");
-    const sneakers = results.rows;
-
-    // Fetch and attach images for each sneaker
-    for (const sneaker of sneakers) {
-      const imagesResult = await pool.query(
-        "SELECT imageurl FROM images WHERE productid = $1",
-        [sneaker.id]
-      );
-      sneaker.images = imagesResult.rows.map((row) => row.imageurl);
-    }
+    const results = await pool.query(
+      "SELECT s.*, i.image_url FROM sneakers s LEFT JOIN images i ON s.id = i.product_id ORDER BY s.id ASC"
+    );
+
+    const sneakers = [];
+
+    // Group results by sneaker id
+    const groupedResults = results.rows.reduce((acc, row) => {
+      if (!acc[row.id]) {
+        acc[row.id] = { ...row, images: [] };
+        sneakers.push(acc[row.id]);
+      }
+
+      if (row.image_url) {
+        acc[row.id].images.push(row.image_url);
+      }
+
+      return acc;
+    }, {});
 
     res.status(200).json(sneakers);
   } catch (error) {
@@ -81,25 +88,26 @@ const getSneakers = async (req, res) => {
 const getSneaker = async (req, res) => {
   try {
     const id = parseInt(req.params.id);
-    const sneakerResult = await pool.query(
-      "SELECT * FROM sneakers WHERE id = $1",
+    const results = await pool.query(
+      "SELECT s.*, i.image_url FROM sneakers s LEFT JOIN images i ON s.id = i.productid WHERE s.id = $1",
       [id]
     );
 
-    if (sneakerResult.rows.length === 0) {
+    if (results.rows.length === 0) {
       res.status(404).json({ error: "Sneaker not found" });
-    } else {
-      const sneaker = sneakerResult.rows[0];
+      return;
+    }
 
-      // Fetch and attach images for the sneaker
-      const imagesResult = await pool.query(
-        "SELECT imageurl FROM images WHERE productid = $1",
-        [sneaker.id]
-      );
-      sneaker.images = imagesResult.rows.map((row) => row.imageurl);
+    const sneaker = { ...results.rows[0], images: [] };
 
-      res.status(200).json(sneaker);
+    // Add images to the sneaker object
+    for (const row of results.rows) {
+      if (row.image_url) {
+        sneaker.images.push(row.image_url);
+      }
     }
+
+    res.status(200).json(sneaker);
   } catch (error) {
     console.error(error);
     res.status(500).json({ error: "Internal Server Error" });
@@ -124,7 +132,7 @@ const updateSneaker = async (req, res) => {
     // Update sneaker details
     const updatedSneakerResult = await pool.query(
       `UPDATE sneakers
-        SET name = $1, brand = $2, description = $3, price = $4, size = $5, color = $6, stockquantity = $7, category = $8, targetaudience = $9
+        SET name = $1, brand = $2, description = $3, price = $4, size = $5, color = $6, stock_quantity = $7, category = $8, target_audience = $9
         WHERE id = $10
         RETURNING *`,
       [
@@ -149,13 +157,13 @@ const updateSneaker = async (req, res) => {
     const updatedSneaker = updatedSneakerResult.rows[0];
 
     // Delete existing images for the sneaker
-    await pool.query("DELETE FROM images WHERE productid = $1", [id]);
+    await pool.query("DELETE FROM images WHERE product_id = $1", [id]);
 
     // Insert new images for the sneaker
     if (img_url && img_url.length > 0) {
       const imageValues = img_url.map((img_url) => [id, img_url]);
       await pool.query(
-        "INSERT INTO images (productid, imageurl) VALUES $1:raw",
+        "INSERT INTO images (product_id, image_url) VALUES $1:raw",
         [imageValues]
       );
     }
@@ -185,7 +193,7 @@ const deleteSneaker = async (req, res) => {
     const deletedSneaker = deletedSneakerResult.rows[0];
 
     // Delete associated images
-    await pool.query("DELETE FROM images WHERE productid = $1", [id]);
+    await pool.query("DELETE FROM images WHERE product_id = $1", [id]);
 
     res.status(200).json({ message: "Sneaker deleted successfully" });
   } catch (error) {
diff --git a/server/routes/order.js b/server/routes/order.js
@@ -2,3 +2,5 @@ import express from "express";
 import { createOrderFromCart } from "../controllers/order";
 const router = express.Router();
 router.post("/createOrder", createOrderFromCart);
+
+export default router;
