fixed the imports

Author: faizanx168

server/config/reset.js

@@ -163,8 +163,47 @@ const createUserAddressTable = async () => {
   }
 };
 
+const createOrdersTableQuery = async () => {
+  const createOrdersTableQuery = `
+  id serial PRIMARY KEY,
+  user_id integer NOT NULL,
+  order_date timestamp DEFAULT CURRENT_TIMESTAMP,
+  total_amount numeric(10, 2) NOT NULL,
+  status varchar(50) DEFAULT 'Pending',
+  FOREIGN KEY (user_id) REFERENCES users (id)
+  `;
+  try {
+    const res = await pool.query(createOrdersTableQuery);
+    console.log("🎉 Order table created successfully");
+  } catch (err) {
+    console.error("⚠️ error creating useraddress table", err);
+  }
+};
+
+const createOrderDetailTableQuery = async () => {
+  const createOrderDetailTableQuery = `
+CREATE TABLE IF NOT EXISTS order_details (
+  id serial PRIMARY KEY,
+  order_id integer NOT NULL,
+  sneaker_id integer NOT NULL,
+  quantity integer NOT NULL,
+  price_per_unit numeric(10, 2) NOT NULL,
+  total_price numeric(10, 2) NOT NULL,
+  FOREIGN KEY (order_id) REFERENCES orders (id),
+  FOREIGN KEY (sneaker_id) REFERENCES sneakers (id)
+);`;
+  try {
+    const res = await pool.query(createOrderDetailTableQuery);
+    console.log("🎉 OrderDetail table created successfully");
+  } catch (err) {
+    console.error("⚠️ error creating useraddress table", err);
+  }
+};
+
 seedSneakersTable();
 seedImagesTable();
 createReviewsTable();
 createUsersTable;
 createUserAddressTable();
+createOrdersTableQuery();
+createOrderDetailTableQuery();

server/controllers/order.js

@@ -1,43 +1,64 @@
 import { pool } from "../config/database.js";
 
-// Controller function to create an order from the user's cart
 export const createOrderFromCart = async (req, res) => {
   try {
     const userId = req.user ? req.user.id : null;
+
+    // Get the cart from the session
     const cart = req.session.cart || {};
 
+    // Check if the cart is empty
     if (Object.keys(cart).length === 0) {
       return res.status(400).json({ error: "Cart is empty" });
     }
+    let totalAmount = 0;
+
+    const cartItemIds = Object.keys(cart);
+    for (const cartItemId of cartItemIds) {
+      const sneakerId = parseInt(cartItemId);
+      const quantity = cart[cartItemId];
+      const sneakerDetails = await pool.query(
+        `SELECT price FROM sneakers WHERE id = $1`,
+        [sneakerId]
+      );
+
+      const pricePerUnit = sneakerDetails.rows[0].price;
+      const totalPrice = quantity * pricePerUnit;
 
-    // Step 1: Create the order
+      totalAmount += totalPrice;
+    }
     const orderResult = await pool.query(
-      `INSERT INTO orders (userid, createdat) VALUES ($1, NOW()) RETURNING id`,
-      [userId]
+      `INSERT INTO orders (user_id, order_date, total_amount, status)
+       VALUES ($1, NOW(), $2, 'Pending') RETURNING id`,
+      [userId, totalAmount]
     );
 
     const orderId = orderResult.rows[0].id;
 
-    // Step 2: Create order items for each item in the cart
-    const cartItemIds = Object.keys(cart);
-
     for (const cartItemId of cartItemIds) {
       const sneakerId = parseInt(cartItemId);
       const quantity = cart[cartItemId];
 
-      await pool.query(
-        `INSERT INTO orderitems (orderid, sneakerid, quantity, createdat)
-         VALUES ($1, $2, $3, NOW())`,
-        [orderId, sneakerId, quantity]
+      // Retrieve sneaker details
+      const sneakerDetails = await pool.query(
+        `SELECT price FROM sneakers WHERE id = $1`,
+        [sneakerId]
       );
 
-      // want to update stock quantities, calculate the total, etc.
-    }
+      const pricePerUnit = sneakerDetails.rows[0].price;
+      const totalPrice = quantity * pricePerUnit;
 
+      await pool.query(
+        `INSERT INTO order_details (order_id, sneaker_id, quantity, price_per_unit, total_price)
+         VALUES ($1, $2, $3, $4, $5)`,
+        [orderId, sneakerId, quantity, pricePerUnit, totalPrice]
+      );
+    }
     req.session.cart = {};
 
     res.status(201).json({ message: "Order created successfully", orderId });
   } catch (error) {
-    res.status(500).json({ error: error.message });
+    console.error(error);
+    res.status(500).json({ error: "Internal Server Error" });
   }
 };

server/package-lock.json

@@ -20,6 +20,7 @@
     "passport": "^0.6.0",
     "passport-google-oauth20": "^2.0.0",
     "passport-google-oidc": "^0.1.0",
-    "pg": "^8.11.3"
+    "pg": "^8.11.3",
+    "stripe": "^14.4.0"
   }
 }

server/package.json

@@ -50,16 +50,20 @@ app.use("api/auth", authRoutes);
 app.use("/api/sneakers", sneakersRoutes);
 app.use("/api/reviews", reviewRoutes);
 app.use("/api/cart", cartRoutes);
-// Payment Setup
-const stripe = require("stripe")(process.env.STRIPE_KEY);
+
+// Payment Setupimport createStripe from "stripe";
+import { pool } from "./config/database.js";
+import createStripe from "stripe";
+const stripe = createStripe(process.env.STRIPE_KEY);
+
 app.post("/create-checkout-session", async (req, res) => {
   try {
-    const userId = req.user ? req.user.id : null; // Assuming user authentication
-    const orderId = req.body.orderId; // Pass the order ID from your front end
+    const userId = req.user ? req.user.id : null;
+    const orderId = req.body.orderId;
 
-    // Fetch order details from the database, adjust the query based on your schema
+    // Fetch order details from the database
     const orderResult = await pool.query(
-      "SELECT * FROM ordedetails WHERE orderid = $1 AND userid = $2",
+      "SELECT * FROM order_details WHERE order_id = $1 AND user_id = $2",
       [orderId, userId]
     );
 
@@ -71,26 +75,51 @@ app.post("/create-checkout-session", async (req, res) => {
 
     const totalAmount = calculateTotalAmount(order);
 
-    const session = await stripe.checkout.sessions.create({
-      payment_method_types: ["card"],
-      line_items: order.items.map((item) => ({
-        price_data: {
-          currency: "usd",
-          product_data: {
-            name: item.sneaker_name, // Adjust based on your schema
+    // Start a database transaction
+    const client = await pool.connect();
+    try {
+      // Insert payment information into the payments table
+      const paymentResult = await client.query(
+        "INSERT INTO payments (order_id,  payment_date, amount, status) VALUES ($1, NOW(), $2,'Paid') RETURNING id",
+        [orderId, totalAmount]
+      );
+
+      const paymentId = paymentResult.rows[0].id;
+
+      // Create a payment session with Stripe
+      const session = await stripe.checkout.sessions.create({
+        payment_method_types: ["card"],
+        line_items: order.items.map((item) => ({
+          price_data: {
+            currency: "usd",
+            product_data: {
+              name: item.sneaker_name,
+            },
+            unit_amount: item.price * 100,
           },
-          unit_amount: item.price * 100, // Amount in cents
-        },
-        quantity: item.quantity,
-      })),
-      mode: "payment",
-      success_url: `${DOMAIN}?success=true`,
-      cancel_url: `${DOMAIN}?canceled=true`,
-    });
-
-    res.status(200).json({ sessionId: session.id });
+          quantity: item.quantity,
+        })),
+        mode: "payment",
+        success_url: `${DOMAIN}?success=true&paymentId=${paymentId}`,
+        cancel_url: `${DOMAIN}?canceled=true`,
+      });
+
+      // Commit the transaction
+      await client.query("COMMIT");
+
+      res.status(200).json({ sessionId: session.id, paymentId });
+    } catch (error) {
+      // Rollback the transaction in case of an error
+      await client.query("ROLLBACK");
+      console.error(error);
+      res.status(500).json({ error: "Internal Server Error" });
+    } finally {
+      // Release the client back to the pool
+      client.release();
+    }
   } catch (error) {
-    res.status(500).json({ error: error.message });
+    console.error(error);
+    res.status(500).json({ error: "Internal Server Error" });
   }
 });
 
@@ -101,6 +130,7 @@ function calculateTotalAmount(order) {
     0
   );
 }
+
 const PORT = process.env.PORT || 3001;
 
 app.listen(PORT, () => {