Merge branch 'main' into main

.github/ISSUE_TEMPLATE/pull_request_template.md → .github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 ---
 name: Pull_request_TEMPLATE.yml
 about: use this template for creation of pull requests
-title: ''
+title: '[FIX/Feat] '
 labels: ''
 assignees: ''
 
@@ -14,7 +14,10 @@ name: Pull Request Template
 ## Description
 <!-- Please include a summary of the changes and the issue addressed by this pull request. -->
 
-Fixes # (issue)
+- Fixes # (issue)
+
+## Screenshots (if applicable)
+<!-- Please include screenshots of any visual changes if applicable. -->
 
 ## Type of Change
 <!-- Please check the options that apply: -->
@@ -32,8 +35,6 @@ Fixes # (issue)
 - [ ] New and existing unit tests pass locally with my changes.
 - [ ] Any dependent changes have been merged and published in downstream modules.
 
-## Screenshots (if applicable)
-<!-- Please include screenshots of any visual changes if applicable. -->
 
 ## Additional Information
 <!-- Add any other context or information about the pull request here. -->

Backend/Controllers/ambulanceController.js

@@ -0,0 +1,71 @@
+const Ambulance = require("../Models/Ambulance");
+const User = require("../Models/User");
+
+
+// Controller to get all ambulances
+const getAllAmbulances = async (req, res) => {
+  try {
+    const ambulances = await Ambulance.find();
+    res.json(ambulances);
+  } catch (error) {
+    res.status(500).json({ error: 'Server error, unable to fetch ambulances' });
+  }
+};
+
+// Controller to book an ambulance by a user
+const bookAmbulance = async (req, res) => {
+  const { userId, ambulanceId } = req.body;
+
+  try {
+    const user = await User.findById(userId);
+    if (!user) {
+      return res.status(404).json({ error: 'User not found' });
+    }
+
+    const ambulance = await Ambulance.findById(ambulanceId);
+    if (!ambulance) {
+      return res.status(404).json({ error: 'Ambulance not found' });
+    }
+
+    if (!ambulance.availabilityStatus) {
+      return res.status(400).json({ error: 'Ambulance is already booked' });
+    }
+
+    ambulance.availabilityStatus = false;
+    ambulance.user = user._id;
+    await ambulance.save();
+
+    user.bookedAmbulances.push(ambulance._id);
+    await user.save();
+
+    res.json({ message: 'Ambulance booked successfully', ambulance });
+  } catch (error) {
+    res.status(500).json({ error: 'Server error, unable to book ambulance' });
+  }
+};
+
+// Controller to create a new ambulance
+const createAmbulance = async (req, res) => {
+  const { numberPlate, driverName, location } = req.body;
+
+  try {
+    const newAmbulance = new Ambulance({
+      numberPlate,
+      driverName,
+      location,
+      availabilityStatus: true, // By default, new ambulances are available
+    });
+
+    await newAmbulance.save();
+
+    res.json({ message: 'Ambulance created successfully', ambulance: newAmbulance });
+  } catch (error) {
+    res.status(500).json({ error: 'Server error, unable to create ambulance' });
+  }
+};
+
+module.exports = {
+  getAllAmbulances,
+  bookAmbulance,
+  createAmbulance,
+};

Backend/Models/Ambulance.js

@@ -0,0 +1,12 @@
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+
+const ambulanceSchema = new Schema({
+  numberPlate: { type: String, required: true, unique: true },
+  driverName: { type: String, required: true },
+  location: { type: String, required: true },
+  availabilityStatus: { type: Boolean, default: true }, // Indicates if the ambulance is available
+  user: { type: Schema.Types.ObjectId, ref: 'User', required: false } // Reference to the user who booked the ambulance
+});
+
+module.exports = mongoose.model('Ambulance', ambulanceSchema);

Backend/Models/User.js

@@ -2,10 +2,10 @@ const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
 
 const userSchema = new Schema({
-    id: {type: String, unique: true},
-    username: String,
-    email: String,
-    password: String
-    });
-
-module.exports = mongoose.model('User', userSchema);
+  id: { type: String, unique: true },
+  username: String,
+  email: String,
+  password: String,
+  bookedAmbulances: [{ type: Schema.Types.ObjectId, ref: 'Ambulance' }] // Reference to ambulances booked by the user
+});
+module.exports = mongoose.models.User || mongoose.model('User', userSchema);

Backend/server.js

@@ -15,12 +15,21 @@ app.use(bodyParser.json());
 
 // MongoDB config below (Uncomment this code when mongoDB is created)
 
-// mongoose.connect('add the connection string', { useNewUrlParser: true, useUnifiedTopology: true })
-//   .then(() => console.log('MongoDB connected'))
-//   .catch(err => console.log(err));
+mongoose
+  .connect(
+    "your-connection-string",
+    { useNewUrlParser: true, useUnifiedTopology: true }
+  )
+  .then(() => console.log("MongoDB connected"))
+  .catch((err) => console.log(err));
 
 // Models
 const User = require("./Models/User");
+const {
+  createAmbulance,
+  getAllAmbulances,
+  bookAmbulance,
+} = require("./Controllers/AmbulanceController");
 
 app.get("/", (req, res) => {
   res.send("AmbuFlow Server");
@@ -30,67 +39,66 @@ app.get("/", (req, res) => {
 app.post("/signup", async (req, res) => {
   const { id, username, email, password } = req.body;
 
-  // Hash the password using bcrypt
-  const hashedPassword = await bcrypt.hash(password, 10);
+  try {
+    const hashedPassword = await bcrypt.hash(password, 10);
 
-  // Uncomment this block when MongoDB is set up
-  /*
-  const user = new User({ id, username, email, password: hashedPassword });
+    const user = new User({ id, username, email, password: hashedPassword });
 
-  try {
-      await user.save();
-      res.status(201).send('User created successfully');
+    await user.save();
+
+    res.status(201).json({
+      message: "User created successfully",
+      user: {
+        id: user.id,
+        username: user.username,
+        email: user.email,
+      },
+    });
   } catch (err) {
-      res.status(500).send('Error creating user: ' + err.message);
+    res.status(500).json({ error: "Error creating user: " + err.message });
   }
-  */
-
-  // Remove the below line when MongoDB is ready (for testing)
-  res.send("Signup route working");
 });
 
 // Login Route
 app.post("/login", async (req, res) => {
   const { username, password } = req.body;
 
   // Uncomment the lines when MongoDB is created
-  /*
+
   try {
     const user = await User.findOne({ username });
 
     if (!user) {
-      return res.status(401).send('User not found');
+      return res.status(401).send("User not found");
     }
 
     const isPasswordValid = await bcrypt.compare(password, user.password);
 
     if (!isPasswordValid) {
-      return res.status(401).send('Invalid credentials');
+      return res.status(401).send("Invalid credentials");
     }
 
     const token = jwt.sign(
       { id: user.id, username: user.username },
       process.env.JWT_SECRET,
-      { expiresIn: '1h' }
+      { expiresIn: "1h" }
     );
 
-    res.json({success: true, JWT_token: token , id: user.id});
+    res.json({ success: true, JWT_token: token, id: user.id });
   } catch (err) {
-    res.status(500).send('Internal Server Error: ' + err.message);
+    res.status(500).send("Internal Server Error: " + err.message);
   }
-  */
 
   // Hardcoded for testing purposes
   const token = jwt.sign(
-    { id: 1, username: "username" }, 
-    process.env.JWT_SECRET, 
+    { id: 1, username: "username" },
+    process.env.JWT_SECRET,
     { expiresIn: "1h" }
   );
 
-  res.json({success: true, JWT_token: token , id: "testID893973983"});
+  res.json({ success: true, JWT_token: token, id: "testID893973983" });
 });
 
-
 // Middleware to protect routes
 const authenticateToken = (req, res, next) => {
   const token = req.headers["authorization"]?.split(" ")[1]; // Bearer token
@@ -113,6 +121,10 @@ app.get("/protected", authenticateToken, (req, res) => {
   res.send("This is a protected route");
 });
 
+app.post("/ambulances/create", createAmbulance);
+app.get("/ambulances", getAllAmbulances);
+app.post("/ambulances/book", bookAmbulance);
+
 app.listen(port, () => {
   console.log(`Example app listening on http://localhost:${port}`);
 });