Merge pull request #131 from haseebzaki-07/new_branch_2

Added notification for bookings

backend/controllers/WheelchairController.js

@@ -1,17 +1,10 @@
 import WheelchairBooking from "../models/WheelChairBooking.js";
+import { io } from "../index.js";
 
+// Controller to handle booking creation
 export const createWheelchairBooking = async (req, res) => {
   const { station, bookingDate, bookingTime, wheelchairType } = req.body;
 
-  if (!station || !bookingDate || !bookingTime) {
-    return res
-      .status(400)
-      .json({
-        message:
-          "Please provide all required fields: station, bookingDate, bookingTime",
-      });
-  }
-
   try {
     const newBooking = new WheelchairBooking({
       station,
@@ -22,11 +15,17 @@ export const createWheelchairBooking = async (req, res) => {
 
     const savedBooking = await newBooking.save();
 
-    res.status(201).json(savedBooking);
-  } catch (error) {
-    console.error("Error creating wheelchair booking:", error);
+    // Emit real-time booking confirmation to the client
+    io.emit("wheelchairBookingConfirmation", {
+      message: `Your booking at ${station} for ${bookingDate} has been confirmed.`,
+      booking: savedBooking,
+    });
+
+    // Send back HTTP response as well
     res
-      .status(500)
-      .json({ message: "Server error. Could not create wheelchair booking." });
+      .status(201)
+      .json({ message: "Booking created successfully", booking: savedBooking });
+  } catch (error) {
+    res.status(500).json({ message: "Server error." });
   }
 };

backend/controllers/cloakroomController.js

@@ -1,3 +1,4 @@
+import { io } from "../index.js";
 import CloakroomBooking from "../models/CloakroomBooking.js";
 
 export const createCloakroomBooking = async (req, res) => {
@@ -21,6 +22,11 @@ export const createCloakroomBooking = async (req, res) => {
 
     const savedBooking = await newBooking.save();
 
+    io.emit("cloakroomBookingConfirmation", {
+      message: `Your booking at ${station} for ${items} has been confirmed.`,
+      booking: savedBooking,
+    });
+
     res.status(201).json(savedBooking);
   } catch (error) {
     console.error("Error creating cloakroom booking:", error);

backend/controllers/coolieController.js

@@ -1,3 +1,4 @@
+import { io } from "../index.js";
 import CoolieBooking from "../models/CoolieBooking.js";
 
 export const createCoolieBooking = async (req, res) => {
@@ -35,6 +36,11 @@ export const createCoolieBooking = async (req, res) => {
 
     const savedBooking = await coolieBooking.save();
 
+    io.emit("coolieBookingConfirmation", {
+      message: `Your booking at ${station} for coolie has been confirmed.`,
+      booking: savedBooking,
+    });
+
     res.status(201).json({
       message: "Coolie booking created successfully.",
       data: savedBooking,

backend/index.js

@@ -1,36 +1,63 @@
-import express from 'express';
-import cors from 'cors';
-import connectDB from './config/dbConnection.js';
-import cookieParser from 'cookie-parser';
+import express from "express";
+import cors from "cors";
+import connectDB from "./config/dbConnection.js";
+import cookieParser from "cookie-parser";
+import { createServer } from "http";
+import { Server } from "socket.io";
 
 const app = express();
+const server = createServer(app);
 
 const port = process.env.PORT || 3000;
 
-app.use(cors({
-  origin: 'http://localhost:5173',
-  methods: ['GET', 'POST'],
-  allowedHeaders: ['Content-Type'],
-  credentials: true
-})); // Enable CORS
+app.use(
+  cors({
+    origin: ["http://localhost:5173", "http://127.0.0.1:5500"],
+    methods: ["GET", "POST"],
+    allowedHeaders: ["Content-Type"],
+    credentials: true,
+  })
+);
 
-app.use(cookieParser()); // Parse cookies
-app.use(express.json()); // Parse incoming request bodies in a middleware before your handlers
-app.use(express.urlencoded({ extended: true })); // Parse URL-encoded bodies
+app.use(cookieParser());
+app.use(express.json());
+app.use(express.urlencoded({ extended: true }));
 
-// Connect to MongoDB
 connectDB();
 
-// Routes
-import authRoutes from './routes/authRoutes.js';
+import authRoutes from "./routes/authRoutes.js";
 
-app.use('/auth', authRoutes);
-app.use('/api', authRoutes); 
+app.use("/auth", authRoutes);
+app.use("/api", authRoutes);
 
-app.get('/', (req, res) => {
-  res.send('Working...');
+app.get("/", (req, res) => {
+  res.send("Working...");
 });
-// Start the server
-app.listen(port, () => {
+
+
+
+const io = new Server(server, {
+  cors: {
+    origin: ["http://localhost:5173", "http://127.0.0.1:5500"],
+    methods: ["GET", "POST"],
+    credentials: true,
+  },
+});
+
+io.on("connection", (socket) => {
+  console.log("A user connected:", socket.id);
+
+  socket.on("disconnect", () => {
+    console.log("User disconnected:", socket.id);
+  });
+
+  socket.on("error", (err) => {
+    console.error("Socket error:", err);
+  });
+});
+
+server.listen(port, () => {
   console.log(`Server is running on http://localhost:${port}`);
-});
+});
+
+export { io };

backend/package.json

@@ -101,6 +101,7 @@
     "side-channel": "^1.0.6",
     "sift": "^17.1.3",
     "simple-update-notifier": "^2.0.0",
+    "socket.io": "^4.8.0",
     "sparse-bitfield": "^3.0.3",
     "statuses": "^2.0.1",
     "supports-color": "^5.5.0",