Merge branch 'master' into jiwon

server/db/index.js

@@ -43,10 +43,16 @@ const ConfirmNum = ConfirmNumModel(sequelize)
 User.belongsTo(Role);
 Role.hasOne(User);
 
+Guest.belongsTo(Role);
+Role.hasOne(Guest);
+
 Theater.belongsTo(TheaterType, { onDelete: 'CASCADE' });
 
 TicketFee.belongsTo(TheaterType, { onDelete: 'CASCADE' });
 
+Reservation.belongsTo(Theater);
+Reservation.belongsTo(TimeTable);
+
 export {
     sequelize,
     User,

server/routes/movie.route.js

@@ -18,7 +18,6 @@ router
         movieCtrl.getAllMovie,
         movieCtrl.movieforAdmin
     )
-
 router
     .route("/search/home")
     .get(movieCtrl.findonlyTitle)
@@ -34,6 +33,7 @@ router
     .route("/:movieId")
     .post(movieCtrl.create)
     .delete(movieCtrl.remove)
+    .get(movieCtrl.getMovieById)
 
 
 export default router;
\ No newline at end of file

server/routes/reservation.route.js

 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();
 
 
 router.route('/findreservation')
-    .post(ReservationCtrl.findReservedSeats)
-    .get(ReservationCtrl.findReservation)
+    .post(reservationCtrl.findReservedSeats)
+    .get(reservationCtrl.findReservation)
 
 router.route('/findonereservation')
-    .post(ReservationCtrl.findOneReservation)
+    .get(reservationCtrl.findOneReservation, movieCtrl.getMovieById)
 
 router.route('/save')
-    .post(ReservationCtrl.saveReservation)
+    .post(reservationCtrl.saveReservation)
 
 export default router;
\ No newline at end of file

server/routes/user.route.js

@@ -19,6 +19,10 @@ router
     .route("/logout")
     .get(userCtrl.logout)
 
+router
+    .route("/guest")
+    .post(userCtrl.guestLogin)
+
 router
     .route("/signup")
     .post(userCtrl.signup)
@@ -55,8 +59,4 @@ router.route('/guest/save')
 router.route('/guestinfo/:guestId')
     .get(userCtrl.getGuestInfo)
 
-router
-    .route("/:userId")
-    // .get(userCtrl.compareId)
-
 export default router;
\ No newline at end of file