diff --git a/day19/app.js b/day19/app.js index 97a1728..8c897dc 100644 --- a/day19/app.js +++ b/day19/app.js @@ -1,11 +1,12 @@ -var createError = require('http-errors'); -var express = require('express'); -var path = require('path'); -var cookieParser = require('cookie-parser'); -var logger = require('morgan'); +var createError = require("http-errors"); +var express = require("express"); +var path = require("path"); +var cookieParser = require("cookie-parser"); +var logger = require("morgan"); -var indexRouter = require('./routes/index'); -var usersRouter = require('./routes/users'); +var indexRouter = require("./routes/index"); +var usersRouter = require("./routes/users"); +var scheduleRouter = require("./routes/schedule"); const db = require("./models"); var cors = require("cors"); @@ -13,17 +14,18 @@ var cors = require("cors"); var app = express(); app.set("db", db); // view engine setup -app.set('views', path.join(__dirname, 'views')); -app.set('view engine', 'jade'); +app.set("views", path.join(__dirname, "views")); +app.set("view engine", "jade"); app.use(cors()); -app.use(logger('dev')); +app.use(logger("dev")); app.use(express.json()); app.use(express.urlencoded({ extended: false })); app.use(cookieParser()); -app.use(express.static(path.join(__dirname, 'public'))); +app.use(express.static(path.join(__dirname, "public"))); -app.use('/', indexRouter); -app.use('/users', usersRouter); +app.use("/", indexRouter); +app.use("/users", usersRouter); +app.use("/api/v1", scheduleRouter); // catch 404 and forward to error handler app.use(function (req, res, next) { @@ -34,11 +36,11 @@ app.use(function (req, res, next) { app.use(function (err, req, res, next) { // set locals, only providing error in development res.locals.message = err.message; - res.locals.error = req.app.get('env') === 'development' ? err : {}; + res.locals.error = req.app.get("env") === "development" ? err : {}; // render the error page res.status(err.status || 500); - res.render('error'); + res.render("error"); }); module.exports = app; diff --git a/day19/models/availability.js b/day19/models/availability.js new file mode 100644 index 0000000..78dd960 --- /dev/null +++ b/day19/models/availability.js @@ -0,0 +1,36 @@ +module.exports = (sequelize, DataTypes) => { + const availability = sequelize.define( + "availability", + { + id: { + type: DataTypes.INTEGER, + primaryKey: true, + autoIncrement: true, + }, + user_id: { + type: DataTypes.INTEGER, + allowNull: true, + }, + day_of_week: { + type: DataTypes.INTEGER, + allowNull: false, + }, + start_time: { + type: DataTypes.TIME, + allowNull: false, + }, + end_time: { + type: DataTypes.TIME, + allowNull: false, + }, + created_at: DataTypes.DATE, + updated_at: DataTypes.DATE, + }, + { + timestamps: true, + freezeTableName: true, + tableName: "availability", + } + ); + return availability; +}; diff --git a/day19/models/index.js b/day19/models/index.js index 8c44682..62cf181 100644 --- a/day19/models/index.js +++ b/day19/models/index.js @@ -1,4 +1,4 @@ -'use strict'; +"use strict"; /*Powered By: Manaknightdigital Inc. https://manaknightdigital.com/ Year: 2020*/ /** * Sequelize File @@ -8,49 +8,57 @@ * @author Ryan Wong * */ -const fs = require('fs'); -const path = require('path'); -let Sequelize = require('sequelize'); +const fs = require("fs"); +const path = require("path"); +let Sequelize = require("sequelize"); const basename = path.basename(__filename); -const { DataTypes } = require('sequelize'); +const { DataTypes } = require("sequelize"); const config = { - DB_DATABASE: 'mysql', - DB_USERNAME: 'root', - DB_PASSWORD: 'root', - DB_ADAPTER: 'mysql', - DB_NAME: 'day_1', - DB_HOSTNAME: 'localhost', + DB_DATABASE: "mysql", + DB_USERNAME: "root", + DB_PASSWORD: "root", + DB_ADAPTER: "mysql", + DB_NAME: "day_1", + DB_HOSTNAME: "localhost", DB_PORT: 3306, }; let db = {}; -let sequelize = new Sequelize(config.DB_DATABASE, config.DB_USERNAME, config.DB_PASSWORD, { - dialect: config.DB_ADAPTER, - username: config.DB_USERNAME, - password: config.DB_PASSWORD, - database: config.DB_NAME, - host: config.DB_HOSTNAME, - port: config.DB_PORT, - logging: console.log, - timezone: '-04:00', - pool: { - maxConnections: 1, - minConnections: 0, - maxIdleTime: 100, - }, - define: { - timestamps: false, - underscoredAll: true, - underscored: true, - }, -}); +let sequelize = new Sequelize( + config.DB_DATABASE, + config.DB_USERNAME, + config.DB_PASSWORD, + { + dialect: config.DB_ADAPTER, + username: config.DB_USERNAME, + password: config.DB_PASSWORD, + database: config.DB_NAME, + host: config.DB_HOSTNAME, + port: config.DB_PORT, + logging: console.log, + timezone: "-04:00", + pool: { + maxConnections: 1, + minConnections: 0, + maxIdleTime: 100, + }, + define: { + timestamps: false, + underscoredAll: true, + underscored: true, + }, + } +); // sequelize.sync({ force: true }); +sequelize.sync(); fs.readdirSync(__dirname) .filter((file) => { - return file.indexOf('.') !== 0 && file !== basename && file.slice(-3) === '.js'; + return ( + file.indexOf(".") !== 0 && file !== basename && file.slice(-3) === ".js" + ); }) .forEach((file) => { var model = require(path.join(__dirname, file))(sequelize, DataTypes); @@ -66,4 +74,4 @@ Object.keys(db).forEach((modelName) => { db.sequelize = sequelize; db.Sequelize = Sequelize; -module.exports = db; \ No newline at end of file +module.exports = db; diff --git a/day19/models/schedule.js b/day19/models/schedule.js new file mode 100644 index 0000000..94232a3 --- /dev/null +++ b/day19/models/schedule.js @@ -0,0 +1,32 @@ +module.exports = (sequelize, DataTypes) => { + const schedule = sequelize.define( + "schedule", + { + id: { + type: DataTypes.INTEGER, + primaryKey: true, + autoIncrement: true, + }, + user_id: { + type: DataTypes.INTEGER, + allowNull: true, + }, + start_time: { + type: DataTypes.DATE, + allowNull: false, + }, + end_time: { + type: DataTypes.DATE, + allowNull: false, + }, + created_at: DataTypes.DATE, + updated_at: DataTypes.DATE, + }, + { + timestamps: true, + freezeTableName: true, + tableName: "schedule", + } + ); + return schedule; +}; diff --git a/day19/routes/schedule.js b/day19/routes/schedule.js new file mode 100644 index 0000000..f42e1a8 --- /dev/null +++ b/day19/routes/schedule.js @@ -0,0 +1,52 @@ +const express = require("express"); +const router = express.Router(); +const db = require("../models"); +const { Op } = require("sequelize"); + +// POST /api/v1/schedule - Save an appointment +router.post("/schedule", async (req, res) => { + try { + const { user_id, start_time, end_time } = req.body; + if (!start_time || !end_time) { + return res + .status(400) + .json({ + success: false, + error: "start_time and end_time are required", + }); + } + const appointment = await db.schedule.create({ + user_id, + start_time, + end_time, + }); + res.json({ success: true, data: appointment }); + } catch (err) { + res.status(500).json({ success: false, error: err.message }); + } +}); + +// GET /api/v1/booked - Return available times excluding scheduled +router.get("/booked", async (req, res) => { + try { + // For demo: get all availability, then exclude times that overlap with schedule + const availabilities = await db.availability.findAll(); + const schedules = await db.schedule.findAll(); + + // This is a simple exclusion, not a full calendar logic + // For each availability, exclude if any schedule overlaps + const availableTimes = availabilities.filter((avail) => { + const availStart = avail.start_time; + const availEnd = avail.end_time; + const overlap = schedules.some((sch) => { + return sch.start_time < availEnd && sch.end_time > availStart; + }); + return !overlap; + }); + res.json({ success: true, data: availableTimes }); + } catch (err) { + res.status(500).json({ success: false, error: err.message }); + } +}); + +module.exports = router;