Ha create and list reservations

.node-version

@@ -0,0 +1 @@
+16.20.2

back-end/.gitignore

@@ -19,7 +19,7 @@
 .env.test.local
 .env.production.local
 .vercel
-
+.env
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

back-end/package.json

@@ -1,11 +1,11 @@
 {
-  "name": "starter-restaurant-reservation-back-end",
+  "name": "restaurant-reservation-system-back-end",
   "version": "1.0.0",
-  "description": "Starter code for restaurant reservation backend",
+  "description": "Code for restaurant reservation system backend",
   "main": "src/server.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Thinkful-Ed/starter-restaurant-reservation",
+    "url": "https://github.com/halbert-anderson/restaurant-reservation-system",
     "directory": "/back-end"
   },
   "scripts": {

back-end/src/app.js

@@ -4,19 +4,21 @@ require("dotenv").config({ path: path.join(__dirname, "..", ".env") });
 
 const express = require("express");
 const cors = require("cors");
+const app = express();
+const reservationsRouter = require("./reservations/reservations.router");
 
 const errorHandler = require("./errors/errorHandler");
 const notFound = require("./errors/notFound");
-const reservationsRouter = require("./reservations/reservations.router");
 
-const app = express();
+
 
 app.use(cors());
 app.use(express.json());
 
+
 app.use("/reservations", reservationsRouter);
 
 app.use(notFound);
 app.use(errorHandler);
 
-module.exports = app;
+module.exports = app;

back-end/src/db/migrations/20210123122225_createReservationsTable.js

@@ -1,10 +1,17 @@
 exports.up = function (knex) {
   return knex.schema.createTable("reservations", (table) => {
     table.increments("reservation_id").primary();
+    table.string("first_name").notNullable();
+    table.string("last_name").notNullable();
+    table.string("mobile_number").notNullable();
+    table.date("reservation_date").notNullable();
+    table.time("reservation_time").notNullable();
+    table.integer("people").unsigned().notNullable();
+    table.string("status").defaultTo("booked");
     table.timestamps(true, true);
   });
 };
 
 exports.down = function (knex) {
   return knex.schema.dropTable("reservations");
-};
+};

back-end/src/db/migrations/20240630144440_createTablesTable.js

@@ -0,0 +1,14 @@
+exports.up = function (knex) {
+    return knex.schema.createTable("tables", (table) => {
+      table.increments("table_id").primary();
+      table.string("table_name").notNullable();
+      table.integer("capacity").notNullable();
+      table.integer('reservation_id').nullable();
+      table.foreign('reservation_id').references('reservation_id').inTable('reservations');
+      table.boolean('occupied').defaultTo(false).notNullable();
+      table.timestamps(true, true);    });
+  };
+
+  exports.down = function (knex) {
+    return knex.schema.dropTable("tables");
+  };

back-end/src/db/seeds/00-reservations.js

@@ -1,3 +1,8 @@
+const reservations =require("./00-reservations.json");
+
 exports.seed = function (knex) {
-  return knex.raw("TRUNCATE TABLE reservations RESTART IDENTITY CASCADE");
+  return knex.raw("TRUNCATE TABLE reservations RESTART IDENTITY CASCADE")
+  .then(function () {
+    return knex("reservations").insert(reservations);
+  });
 };

back-end/src/errors/asyncErrorBoundary.js

@@ -0,0 +1,15 @@
+function asyncErrorBoundary(delegate, defaultStatus) {
+    return (request, response, next) => {
+      Promise.resolve()
+        .then(() => delegate(request, response, next))
+        .catch((error = {}) => {
+          const { status = defaultStatus, message = error } = error;
+          next({
+            status,
+            message,
+          });
+        });
+    };
+  }
+
+  module.exports = asyncErrorBoundary;

back-end/src/errors/methodNotAllowed.js

@@ -0,0 +1,8 @@
+function methodNotAllowed(req, res, next) {
+    next({
+      status: 405,
+      message: `${req.method} not allowed for ${req.originalUrl}`,
+    });
+  };
+
+  module.exports = methodNotAllowed;

back-end/src/reservations/reservations.controller.js

@@ -1,12 +1,128 @@
 /**
  * List handler for reservation resources
  */
-async function list(req, res) {
+const reservationsService = require("./reservations.service");
+const asyncErrorBoundary = require("../errors/asyncErrorBoundary");
+
+
+function hasData(req, res, next) {
+  console.log("hasData: ",req.body.data);
+  if (req.body.data) {
+    return next()
+  }
+  next({ status: 400, message: "body must have data property" })
+}
+
+function firstAndLastNameAreValid(req, res, next) {
+  const regName =/^[a-zA-Z0-9'-. ]+$/;
+  const { first_name, last_name } =req.body.data;
+  console.log("firstAndLastNameAreValid - First Name:", first_name, " Last Name: ",last_name);
+  if(!first_name ||!regName.test(first_name)){
+    next({ status: 400, message: "Must include valid first_name."})
+  }
+
+  if(!last_name || !regName.test(last_name)){
+    next({ status: 400, message: "Must include valid last_name." })
+  }
+
+  return next();
+}
+
+function mobileNumberIsValid(req, res, next) {
+  const { mobile_number } = req.body.data;
+  const regMobileNum = /^\d{3}-\d{3}-\d{4}$/
+  console.log("mobileNumberIsValid: ", mobile_number);
+  if(!regMobileNum.test(mobile_number)){
+    next({ status: 400, message: "Must include valid mobile_number (ex. ddd-ddd-dddd)." })
+  }
+  return next();
+}
+
+function reservationDateIsValid(req, res, next) {
+  const { reservation_date,reservation_time } = req.body.data;
+  const regDate = /^\d{4}\-\d{1,2}\-\d{1,2}$/;
+  console.log("ReservationDateIsValid: ", reservation_date);
+  if(!regDate.test(reservation_date)){
+    next({ status: 400, message: "Must include valid reservation_date (ex. dd/mm/yyyy)." })
+  }
+   // No reservations on Tuesdays
+   const day = new Date(reservation_date).getUTCDay();
+   if (day === 2) {
+    next({status: 400, message: "Restaurant is closed on Tuesdays." });
+   }
+
+   // No reservations in the past
+   const formattedDate = new Date(`${reservation_date}T${reservation_time}`);
+   if (formattedDate <= new Date()) {
+     next({status: 400, message: "Reservation must be in the future." } );
+   }
+  return next();
+}
+
+
+function reservationTimeIsValid(req, res, next) {
+  const { reservation_time } = req.body.data;
+  // const regTime = /^(\d{1,2}):(\d{2})(:00)?([ap]m)?$/;
+  const regTime = /^(\d{2}):(\d{2})$/;
+  console.log("ReservationTimeIsValid:", reservation_time);
+  if(!regTime.test(reservation_time)){
+    next({ status: 400, message: "Must include valid reservation_time (ex. hh:mm:[ap]m)." })
+  }
+
+// No reservations before 10:30AM or after 9:30PM
+const hours = Number(reservation_time.split(":")[0]);
+const minutes = Number(reservation_time.split(":")[1]);
+if (hours < 10 || (hours === 10 && minutes < 30)) {
+  next({status: 400, message: "Reservation must be after 10:30AM." });
+}
+if (hours > 21 || (hours === 21 && minutes > 30)) {
+  next({status: 400, message: "Reservation must be before 9:30PM." });
+}
+
+   return next();
+}
+function peopleIsValid(req, res, next) {
+  const { people } = req.body.data;
+  console.log("peopleIsValid:", people);
+  // Check if people is not a number
+  if (!Number.isInteger(people)) {
+    return next({ status: 400, message: "people must be an integer" });
+  }
+
+  // Check if people is less than 1
+  if (people < 1) {
+    return next({ status: 400, message: "Must have 1 or more people ." });
+  }
+
+  // If validation passes
+  return next();
+}
+
+
+async function create(req, res) {
+  const newReservation = await reservationsService.create(req.body.data);
+  console.log("create - New Reservation: ",newReservation);
+  res.status(201).json({
+    data: newReservation
+  });
+}
+
+async function list(req, res, next) {
+  // console.log("req.query: ", req.query);
+  const date = req.query.date
+  // console.log("Date: ", date);
+  const data = await reservationsService.list(date);
+  // console.log("data: ",data);
   res.json({
-    data: [],
+       data
   });
 }
 
 module.exports = {
-  list,
+  list: asyncErrorBoundary(list),
+
+  create: [ hasData,firstAndLastNameAreValid,mobileNumberIsValid,reservationDateIsValid,reservationTimeIsValid, peopleIsValid, asyncErrorBoundary(create)],
 };
+
+
+

back-end/src/reservations/reservations.router.js

@@ -4,9 +4,16 @@
  * @type {Router}
  */
 
-const router = require("express").Router();
+const router = require("express").Router({ mergeParams: true });
 const controller = require("./reservations.controller");
+const methodNotAllowed =require("../errors/methodNotAllowed");
 
-router.route("/").get(controller.list);
+router.route("/")
+   .post(controller.create)
+   .get(controller.list)
+   .all(methodNotAllowed);
+
+
+
+   module.exports = router;
 
-module.exports = router;

back-end/src/reservations/reservations.service.js

@@ -0,0 +1,15 @@
+const knex = require("../db/connection");
+
+async function list(date) {
+  // const reservation_date = date;
+  return knex("reservations").select("*").where({reservation_date: date} ).orderBy("reservation_time","asc");
+  // return knex("reservations").select("*");
+}
+
+function create(newReservation) {
+    return knex("reservations").insert(newReservation).returning("*").then((createdRecords) => createdRecords[0]);
+}
+
+module.exports = {
+  list, create
+};

back-end/test/jest.config.js

@@ -1,3 +1,4 @@
 module.exports = {
+  setupFiles: ["./jest.setup.js"],
   testTimeout: 20000,
 };

back-end/test/jest.setup.js

@@ -0,0 +1,3 @@
+const TextEncodingPolyfill = require("text-encoding");
+global.TextEncoder = TextEncodingPolyfill.TextEncoder;
+global.TextDecoder = TextEncodingPolyfill.TextDecoder;

back-end/test/us-01-create-and-list-reservations.test.js

@@ -1,3 +1,6 @@
+// const TextEncodingPolyfill = require("text-encoding");
+// global.TextEncoder = TextEncodingPolyfill.TextEncoder;
+// global.TextDecoder = TextEncodingPolyfill.TextDecoder;
 const request = require("supertest");
 
 const app = require("../src/app");

front-end/e2e/jest.config.js

@@ -1,4 +1,4 @@
 module.exports = {
   preset: "jest-puppeteer",
-  testTimeout: 8000,
+  testTimeout: 12000,
 };

front-end/e2e/us-01-create-and-list-reservation.test.js

@@ -92,4 +92,4 @@ describe("US-01 - Create and list reservations - E2E", () => {
       expect(page.url()).toContain("/dashboard");
     });
   });
-});
+});