project-startup 1.0.1 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-startup",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Minimal session-based auth starter using Express, MySQL, React, Vite, and React Router.",
   "main": "index.js",
   "bin": {

package/template/Logics/Booking/controllers/bookingController.js

@@ -0,0 +1,176 @@
+const db = require("../config/db");
+
+// GET /api/bookings
+// Manager → all bookings with customer + bus details
+// Customer → only their own bookings
+exports.getBookings = async (req, res) => {
+    if (req.user.role === "manager") {
+        const [bookings] = await db.query(
+            `SELECT
+                bk.id,
+                bk.seats,
+                bk.total_rwf,
+                bk.booked_at,
+                u.name  AS customer_name,
+                u.email AS customer_email,
+                b.plate_number,
+                b.destination,
+                b.departure_time,
+                b.price_rwf
+                FROM bookings bk
+                JOIN users u ON u.id = bk.customer_id
+                JOIN buses  b ON b.id = bk.bus_id
+                ORDER BY bk.booked_at DESC`
+        );
+        return res.json(bookings);
+    }
+
+    // Customer: only their rows
+    const [bookings] = await db.query(
+        `SELECT
+            bk.id,
+            bk.seats,
+            bk.total_rwf,
+            bk.booked_at,
+            b.plate_number,
+            b.destination,
+            b.departure_time,
+            b.price_rwf
+         FROM bookings bk
+         JOIN buses b ON b.id = bk.bus_id
+         WHERE bk.customer_id = ?
+         ORDER BY bk.booked_at DESC`,
+        [req.user.id]
+    );
+
+    res.json(bookings);
+};
+
+// POST /api/bookings  (customer only)
+exports.createBooking = async (req, res) => {
+    const { busId, seats } = req.body;
+
+    if (!busId || !seats || seats < 1) {
+        return res.status(400).json({ error: "busId and seats (≥ 1) are required." });
+    }
+
+    // ── Critical section: read and update in one atomic step ───────────────
+    // We use a transaction so two customers can't both grab the last seat.
+    const conn = await db.getConnection();
+
+    try {
+        await conn.beginTransaction();
+
+        // Lock this bus row for the duration of the transaction (FOR UPDATE)
+        // This prevents another request from reading stale available_seats
+        const [rows] = await conn.query(
+            "SELECT * FROM buses WHERE id = ? FOR UPDATE",
+            [busId]
+        );
+
+        if (rows.length === 0) {
+            await conn.rollback();
+            return res.status(404).json({ error: "Bus not found." });
+        }
+
+        const bus = rows[0];
+
+        if (new Date(bus.departure_time) <= new Date()) {
+            await conn.rollback();
+            return res.status(400).json({ error: "This bus has already departed." });
+        }
+
+        if (seats > bus.available_seats) {
+            await conn.rollback();
+            return res.status(400).json({
+                error: `Only ${bus.available_seats} seat(s) available.`,
+            });
+        }
+
+        // Decrement available_seats
+        await conn.query(
+            "UPDATE buses SET available_seats = available_seats - ? WHERE id = ?",
+            [seats, busId]
+        );
+
+        // Insert the booking record
+        const [result] = await conn.query(
+            `INSERT INTO bookings (bus_id, customer_id, seats, total_rwf)
+             VALUES (?, ?, ?, ?)`,
+            [busId, req.user.id, seats, seats * bus.price_rwf]
+        );
+
+        await conn.commit();
+
+        // Return the new booking with bus details attached
+        const [booking] = await conn.query(
+            `SELECT
+                bk.id,
+                bk.seats,
+                bk.total_rwf,
+                bk.booked_at,
+                b.plate_number,
+                b.destination,
+                b.departure_time
+             FROM bookings bk
+             JOIN buses b ON b.id = bk.bus_id
+             WHERE bk.id = ?`,
+            [result.insertId]
+        );
+
+        res.status(201).json(booking[0]);
+
+    } catch (err) {
+        await conn.rollback();
+        throw err;
+    } finally {
+        conn.release();  // always return connection to pool
+    }
+};
+
+// DELETE /api/bookings/:id  (customer only — own bookings)
+exports.cancelBooking = async (req, res) => {
+    const conn = await db.getConnection();
+
+    try {
+        await conn.beginTransaction();
+
+        // Find the booking AND confirm it belongs to this customer
+        const [rows] = await conn.query(
+            "SELECT * FROM bookings WHERE id = ? AND customer_id = ?",
+            [req.params.id, req.user.id]
+        );
+
+        if (rows.length === 0) {
+            await conn.rollback();
+            return res.status(404).json({ error: "Booking not found." });
+        }
+
+        const booking = rows[0];
+
+        // Restore seats only if bus hasn't departed yet
+        const [busRows] = await conn.query(
+            "SELECT departure_time FROM buses WHERE id = ?",
+            [booking.bus_id]
+        );
+
+        if (busRows.length > 0 && new Date(busRows[0].departure_time) > new Date()) {
+            await conn.query(
+                "UPDATE buses SET available_seats = available_seats + ? WHERE id = ?",
+                [booking.seats, booking.bus_id]
+            );
+        }
+
+        await conn.query("DELETE FROM bookings WHERE id = ?", [booking.id]);
+
+        await conn.commit();
+
+        res.json({ message: "Booking cancelled. Seats have been restored." });
+
+    } catch (err) {
+        await conn.rollback();
+        throw err;
+    } finally {
+        conn.release();
+    }
+};

package/template/Logics/Booking/controllers/busController.js

@@ -0,0 +1,143 @@
+const db = require("../config/db");
+
+// GET /api/buses
+exports.getAllBuses = async (req, res) => {
+    const [buses] = await db.query(
+        "SELECT * FROM buses ORDER BY departure_time ASC"
+    );
+    res.json(buses);
+};
+
+// GET /api/buses/:id
+exports.getBusById = async (req, res) => {
+    const [rows] = await db.query(
+        "SELECT * FROM buses WHERE id = ?",
+        [req.params.id]
+    );
+
+    if (rows.length === 0) {
+        return res.status(404).json({ error: "Bus not found." });
+    }
+
+    res.json(rows[0]);
+};
+
+// POST /api/buses  (manager only)
+exports.createBus = async (req, res) => {
+    const { plateNumber, destination, maxSeats, departureTime, priceRwf } = req.body;
+
+    if (!plateNumber || !destination || !maxSeats || !departureTime || !priceRwf) {
+        return res.status(400).json({ error: "All fields are required." });
+    }
+
+    if (new Date(departureTime) <= new Date()) {
+        return res.status(400).json({ error: "Departure time must be in the future." });
+    }
+
+    // Check for duplicate plate number
+    const [existing] = await db.query(
+        "SELECT id FROM buses WHERE plate_number = ?",
+        [plateNumber]
+    );
+
+    if (existing.length > 0) {
+        return res.status(400).json({ error: "Plate number already exists." });
+    }
+
+    const [result] = await db.query(
+        `INSERT INTO buses
+            (plate_number, destination, max_seats, available_seats, departure_time, price_rwf)
+         VALUES (?, ?, ?, ?, ?, ?)`,
+        [plateNumber, destination, maxSeats, maxSeats, departureTime, priceRwf]
+        //                                   ^ available_seats starts equal to max_seats
+    );
+
+    // Fetch and return the newly created row
+    const [rows] = await db.query(
+        "SELECT * FROM buses WHERE id = ?",
+        [result.insertId]
+    );
+
+    res.status(201).json(rows[0]);
+};
+
+// PUT /api/buses/:id  (manager only)
+exports.updateBus = async (req, res) => {
+    const { plateNumber, destination, maxSeats, departureTime, priceRwf } = req.body;
+
+    // Fetch current state first so we can calculate available_seats correctly
+    const [rows] = await db.query(
+        "SELECT * FROM buses WHERE id = ?",
+        [req.params.id]
+    );
+
+    if (rows.length === 0) {
+        return res.status(404).json({ error: "Bus not found." });
+    }
+
+    const bus = rows[0];
+
+    // If maxSeats is being changed, recalculate available_seats:
+    //   available = newMax - (oldMax - oldAvailable)  ← keeps already-booked seats
+    let newAvailable = bus.available_seats;
+
+    if (maxSeats) {
+        const booked = bus.max_seats - bus.available_seats;
+        if (parseInt(maxSeats) < booked) {
+            return res.status(400).json({
+                error: `Cannot reduce max seats below already booked count (${booked}).`,
+            });
+        }
+        newAvailable = parseInt(maxSeats) - booked;
+    }
+
+    await db.query(
+        `UPDATE buses SET
+            plate_number    = COALESCE(?, plate_number),
+            destination     = COALESCE(?, destination),
+            max_seats       = COALESCE(?, max_seats),
+            available_seats = ?,
+            departure_time  = COALESCE(?, departure_time),
+            price_rwf       = COALESCE(?, price_rwf)
+         WHERE id = ?`,
+        [
+            plateNumber  || null,
+            destination  || null,
+            maxSeats     || null,
+            newAvailable,
+            departureTime|| null,
+            priceRwf     || null,
+            req.params.id,
+        ]
+    );
+
+    // Return updated row
+    const [updated] = await db.query("SELECT * FROM buses WHERE id = ?", [req.params.id]);
+    res.json(updated[0]);
+};
+
+// DELETE /api/buses/:id  (manager only)
+exports.deleteBus = async (req, res) => {
+    // Check if any bookings exist for this bus
+    const [bookings] = await db.query(
+        "SELECT id FROM bookings WHERE bus_id = ?",
+        [req.params.id]
+    );
+
+    if (bookings.length > 0) {
+        return res.status(400).json({
+            error: "Cannot delete a bus that has existing bookings.",
+        });
+    }
+
+    const [result] = await db.query(
+        "DELETE FROM buses WHERE id = ?",
+        [req.params.id]
+    );
+
+    if (result.affectedRows === 0) {
+        return res.status(404).json({ error: "Bus not found." });
+    }
+
+    res.json({ message: "Bus deleted." });
+};

package/template/Logics/Booking/schema.sql

@@ -0,0 +1,47 @@
+-- Run this file once to set up your database:
+--   mysql -u root -p < schema.sql
+
+CREATE DATABASE IF NOT EXISTS fleet_db;
+USE fleet_db;
+
+-- ─── Users ────────────────────────────────────────────────────────────────────
+CREATE TABLE IF NOT EXISTS users (
+    id         INT PRIMARY KEY AUTO_INCREMENT,
+    name       VARCHAR(100) NOT NULL,
+    email      VARCHAR(150) UNIQUE NOT NULL,
+    password   VARCHAR(255) NOT NULL,
+    role       ENUM('manager', 'customer') NOT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+-- ─── Buses ────────────────────────────────────────────────────────────────────
+CREATE TABLE IF NOT EXISTS buses (
+    id               INT PRIMARY KEY AUTO_INCREMENT,
+    plate_number     VARCHAR(20) UNIQUE NOT NULL,
+    destination      VARCHAR(100) NOT NULL,
+    max_seats        INT NOT NULL,
+    available_seats  INT NOT NULL,
+    departure_time   DATETIME NOT NULL,
+    price_rwf        INT NOT NULL,
+    created_at       TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+-- ─── Bookings ─────────────────────────────────────────────────────────────────
+CREATE TABLE IF NOT EXISTS bookings (
+    id          INT PRIMARY KEY AUTO_INCREMENT,
+    bus_id      INT NOT NULL,
+    customer_id INT NOT NULL,
+    seats       INT NOT NULL,
+    total_rwf   INT NOT NULL,
+    booked_at   TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (bus_id)      REFERENCES buses(id) ON DELETE CASCADE,
+    FOREIGN KEY (customer_id) REFERENCES users(id) ON DELETE CASCADE
+);
+
+-- ─── Sessions ─────────────────────────────────────────────────────────────────
+CREATE TABLE IF NOT EXISTS sessions (
+    token      VARCHAR(255) PRIMARY KEY,
+    user_id    INT NOT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+);