diff --git a/package-lock.json b/package-lock.json index 8bd530b..3ddca7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6571,20 +6571,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", diff --git a/server/api.js b/server/api.js index b39e916..208ae9b 100644 --- a/server/api.js +++ b/server/api.js @@ -7,6 +7,7 @@ import { viewBookings } from "./controllers/viewBookings.js"; import { getDepartments } from "./controllers/getDepartments.js"; import {getDesks } from "./controllers/getDesks.js" import { cancelBooking } from "./controllers/cancelBooking.js"; +import { deskStatus } from "./controllers/deskStatus.js"; const router = Router(); @@ -21,6 +22,7 @@ router.post("/bookings", auth, createBooking); router.get("/bookings", auth, viewBookings); router.get("/departments", getDepartments); router.get("/desks", getDesks); +router.get("/desk/status", deskStatus) router.delete("/bookings/:bookingId", auth, cancelBooking); export default router; diff --git a/server/controllers/dataAccess.js b/server/controllers/dataAccess.js index cbcd644..a6e4880 100644 --- a/server/controllers/dataAccess.js +++ b/server/controllers/dataAccess.js @@ -8,7 +8,6 @@ import { formatDate, formatTime } from "./validators.js"; * @returns {string|null} - The desk ID if found, otherwise null. */ const getDeskId = async (deskName) => { - console.log("deskName", deskName); try { const result = await db.query( "SELECT desk_id FROM public.desks WHERE desk_name = $1", @@ -137,4 +136,22 @@ export const getUserBookings = async (userId) => { })); }; +// desks status +export const getDeskStatus = async (date) => { + try { + const deskStatusResult = await db.query( + ` + SELECT d.*, + CASE WHEN b.booking_id IS NULL THEN 'Open' ELSE 'Closed' END AS status + FROM desks d + LEFT JOIN bookings b ON d.desk_id = b.desk_id AND b.reservation_date = $1 + `, + [date] + ); + return deskStatusResult.rows; + } catch (error) { + console.error({ error: "Unable to retrieve desk status" }); + } +}; + export { checkAvailability, saveBooking }; diff --git a/server/controllers/deskStatus.js b/server/controllers/deskStatus.js new file mode 100644 index 0000000..1baec80 --- /dev/null +++ b/server/controllers/deskStatus.js @@ -0,0 +1,12 @@ +import { getDeskStatus } from "./dataAccess"; + +export const deskStatus = async(req, res) => { + try { + const { date } = req.body; + const deskStatusDetails = await getDeskStatus(date) + res.status(200).json(deskStatusDetails) + } catch (error) { + console.error(error); + res.status(500).json({ error: "Server error" }); + } +}; \ No newline at end of file diff --git a/server/controllers/viewBookings.js b/server/controllers/viewBookings.js index 4d75df8..7f7ad8d 100644 --- a/server/controllers/viewBookings.js +++ b/server/controllers/viewBookings.js @@ -19,9 +19,6 @@ export const viewBookings = async (req, res) => { } - if (bookingDetails.length === 0) { - res.status(404).json({ message: "No bookings found" }) - } res.json(bookingDetails); } catch (error) { console.error(error);