Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions server/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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;
19 changes: 18 additions & 1 deletion server/controllers/dataAccess.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 };
12 changes: 12 additions & 0 deletions server/controllers/deskStatus.js
Original file line number Diff line number Diff line change
@@ -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" });
}
};
3 changes: 0 additions & 3 deletions server/controllers/viewBookings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down