Merge branch 'main' into shreyanshi_zod

Author: 04shubham7

backend/package-lock.json

@@ -5,9 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc",
-    "dev": "node server.js",
-    "dev-ts": "node --loader ts-node/esm src/server.ts"
+    "dev": "tsc -b && nodemon dist/server.js"
   },
   "keywords": [],
   "author": "",
@@ -35,4 +33,4 @@
     "ts-node-dev": "^2.0.0",
     "typescript": "^5.9.3"
   }
-}
+}

backend/package.json

@@ -3,6 +3,7 @@ import dotenv from "dotenv";
 import authRoutes from "./routes/authRoutes.js";
 import healthRoutes from "./routes/healthRoutes.js";
 import { errorHandler } from "./middleware/errorHandler.js";
+import roomRoutes from "./routes/roomRoutes.js";
 
 dotenv.config();
 const app = express();
@@ -12,6 +13,7 @@ app.use(express.json());
 // Routes
 app.use("/api/auth", authRoutes);
 app.use("/api/health", healthRoutes);
+app.use("/api/rooms", roomRoutes);
 
 // Error Handler
 app.use(errorHandler);

backend/server.js

@@ -0,0 +1,74 @@
+import type { Request, Response } from "express";
+import Room from "../models/roomModel.js";
+import type { IRoom } from "../models/roomModel.js";
+import * as express from "express";
+import mongoose from "mongoose";
+
+declare global {
+    namespace Express {
+        interface Request {
+            userId?: string; // or number, depending on your ID type
+        }
+    }
+}
+
+// Create a new room
+export const createRoom = async (req: Request, res: Response) => {
+    try {
+        const { name } = req.body;
+        if (!name) return res.status(400).json({ message: "Room name is required" });
+
+        const existingRoom = await Room.findOne({ name });
+        if (existingRoom) return res.status(400).json({ message: "Room already exists" });
+
+        const room: IRoom = new Room({ name, members: [req.userId] });
+        await room.save();
+        res.status(201).json(room);
+    } catch (error) {
+        res.status(500).json({ message: "Server error", error });
+    }
+};
+
+// List all rooms
+export const listRooms = async (_req: Request, res: Response) => {
+    try {
+        const rooms = await Room.find().populate("members", "username email");
+        res.json(rooms);
+    } catch (error) {
+        res.status(500).json({ message: "Server error", error });
+    }
+};
+
+// Join a room
+export const joinRoom = async (req: Request, res: Response) => {
+    try {
+        const { roomId } = req.params;
+        const room = await Room.findById(roomId);
+        if (!room) return res.status(404).json({ message: "Room not found" });
+        const userId = new mongoose.Types.ObjectId(req.userId!);
+        if (!room.members.includes(userId)) {
+            room.members.push(userId);
+            await room.save();
+        }
+
+        res.json(room);
+    } catch (error) {
+        res.status(500).json({ message: "Server error", error });
+    }
+};
+
+// Leave a room
+export const leaveRoom = async (req: Request, res: Response) => {
+    try {
+        const { roomId } = req.params;
+        const room = await Room.findById(roomId);
+        if (!room) return res.status(404).json({ message: "Room not found" });
+
+        room.members = room.members.filter(member => member.toString() !== req.userId);
+        await room.save();
+
+        res.json({ message: "Left room successfully", room });
+    } catch (error) {
+        res.status(500).json({ message: "Server error", error });
+    }
+};

backend/src/app.ts

@@ -1,15 +1,19 @@
 import type { Request, Response, NextFunction } from "express";
 import jwt from "jsonwebtoken";
 
-export const protect = (req: Request, res: Response, next: NextFunction) => {
+interface AuthRequest extends Request {
+    userId?: string;
+}
+
+export const protect = (req: AuthRequest, res: Response, next: NextFunction) => {
     let token = req.headers.authorization?.split(" ")[1];
 
     if (!token)
         return res.status(401).json({ success: false, message: "Not authorized, token missing" });
 
     try {
         const decoded = jwt.verify(token, process.env.JWT_SECRET as string) as { id: string };
-        (req as any).userId = decoded.id;
+        req.userId = decoded.id;
         next();
     } catch {
         res.status(401).json({ success: false, message: "Invalid token" });

backend/src/controllers/roomController.ts

@@ -0,0 +1,15 @@
+import mongoose, { Schema, Document } from "mongoose";
+
+export interface IRoom extends Document {
+    name: string;
+    members: mongoose.Types.ObjectId[];
+    createdAt: Date;
+}
+
+const roomSchema: Schema = new Schema({
+    name: { type: String, required: true, unique: true },
+    members: [{ type: mongoose.Schema.Types.ObjectId, ref: "User" }],
+    createdAt: { type: Date, default: Date.now },
+});
+
+export default mongoose.model<IRoom>("Room", roomSchema);

backend/src/middleware/authMiddleware.ts

@@ -0,0 +1,15 @@
+import { Router } from "express";
+import { createRoom, listRooms, joinRoom, leaveRoom } from "../controllers/roomController.js";
+import { protect } from "../middleware/authMiddleware.js";
+
+const router = Router();
+
+// All routes require authentication
+router.use(protect);
+
+router.post("/createRoom", createRoom);           // Create room
+router.get("/listRooms", listRooms);             // List all rooms
+router.post("/:roomId/join", joinRoom); // Join a room
+router.post("/:roomId/leave", leaveRoom); // Leave a room
+
+export default router;