Commit 80239d34 authored by Jiwon Yoon's avatar Jiwon Yoon
Browse files

Merge branch 'master' into jiwon

parents 8e1da1f3 7e4f390c
...@@ -43,10 +43,16 @@ const ConfirmNum = ConfirmNumModel(sequelize) ...@@ -43,10 +43,16 @@ const ConfirmNum = ConfirmNumModel(sequelize)
User.belongsTo(Role); User.belongsTo(Role);
Role.hasOne(User); Role.hasOne(User);
Guest.belongsTo(Role);
Role.hasOne(Guest);
Theater.belongsTo(TheaterType, { onDelete: 'CASCADE' }); Theater.belongsTo(TheaterType, { onDelete: 'CASCADE' });
TicketFee.belongsTo(TheaterType, { onDelete: 'CASCADE' }); TicketFee.belongsTo(TheaterType, { onDelete: 'CASCADE' });
Reservation.belongsTo(Theater);
Reservation.belongsTo(TimeTable);
export { export {
sequelize, sequelize,
User, User,
......
...@@ -18,7 +18,6 @@ router ...@@ -18,7 +18,6 @@ router
movieCtrl.getAllMovie, movieCtrl.getAllMovie,
movieCtrl.movieforAdmin movieCtrl.movieforAdmin
) )
router router
.route("/search/home") .route("/search/home")
.get(movieCtrl.findonlyTitle) .get(movieCtrl.findonlyTitle)
...@@ -34,6 +33,7 @@ router ...@@ -34,6 +33,7 @@ router
.route("/:movieId") .route("/:movieId")
.post(movieCtrl.create) .post(movieCtrl.create)
.delete(movieCtrl.remove) .delete(movieCtrl.remove)
.get(movieCtrl.getMovieById)
export default router; export default router;
\ No newline at end of file
import express from "express"; import express from "express";
import ReservationCtrl from "../controllers/reservation.controller.js"; import movieCtrl from "../controllers/movie.controller.js";
import reservationCtrl from "../controllers/reservation.controller.js";
const router = express.Router(); const router = express.Router();
router.route('/findreservation') router.route('/findreservation')
.post(ReservationCtrl.findReservedSeats) .post(reservationCtrl.findReservedSeats)
.get(ReservationCtrl.findReservation) .get(reservationCtrl.findReservation)
router.route('/findonereservation') router.route('/findonereservation')
.post(ReservationCtrl.findOneReservation) .get(reservationCtrl.findOneReservation, movieCtrl.getMovieById)
router.route('/save') router.route('/save')
.post(ReservationCtrl.saveReservation) .post(reservationCtrl.saveReservation)
export default router; export default router;
\ No newline at end of file
...@@ -19,6 +19,10 @@ router ...@@ -19,6 +19,10 @@ router
.route("/logout") .route("/logout")
.get(userCtrl.logout) .get(userCtrl.logout)
router
.route("/guest")
.post(userCtrl.guestLogin)
router router
.route("/signup") .route("/signup")
.post(userCtrl.signup) .post(userCtrl.signup)
...@@ -55,8 +59,4 @@ router.route('/guest/save') ...@@ -55,8 +59,4 @@ router.route('/guest/save')
router.route('/guestinfo/:guestId') router.route('/guestinfo/:guestId')
.get(userCtrl.getGuestInfo) .get(userCtrl.getGuestInfo)
router
.route("/:userId")
// .get(userCtrl.compareId)
export default router; export default router;
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment