Merge branch 'main' into dev

Author: Víctor Martínez

src/models/user-model.js

@@ -1,5 +1,4 @@
 const mongoose = require("mongoose");
-require("dotenv").config();
 
 const UserSchema = require("./schemas/user")
 

src/routes/bookings-routes.js

@@ -14,12 +14,12 @@ const {
     setStatus
 } = require("../controllers/bookings-controller");
 
-bookingsRouter.post("/", auth(), validateNewBooking, bookProperty);
-bookingsRouter.delete("/:propertyId", auth(), cancelBooking);
-bookingsRouter.get("/all", auth(), getBookings);
-
 bookingsRouter.get("/employees/:eid", validateJWT, getBookingsByEmployeeId);
+bookingsRouter.patch("/:propertyId/address", validateJWT, validateUpdateBookingAddress, updateBookingAddress);
 bookingsRouter.post("/:propertyId", validateJWT, validateSetStatus, setStatus);
-bookingsRouter.patch("/:propertyId", validateJWT, validateUpdateBookingAddress, updateBookingAddress);
+
+bookingsRouter.delete("/:propertyId", auth(), cancelBooking);
+bookingsRouter.get("/all", auth(), getBookings);
+bookingsRouter.post("/", auth(), validateNewBooking, bookProperty);
 
 module.exports = bookingsRouter;

src/routes/properties-routes.js

@@ -1,5 +1,4 @@
 const { Router } = require("express");
-const auth = require("../middleware/auth-middleware");
 
 const router = Router();
 
@@ -8,7 +7,7 @@ const {
     searchProperties
 } = require("../controllers/properties-controller");
 
-router.get("/:propertyId", auth(), getProperty);
-router.get("/", auth(), searchProperties);
+router.get("/:propertyId", getProperty);
+router.get("/", searchProperties);
 
 module.exports = router;

src/server.js

@@ -3,7 +3,6 @@ const morgan = require("morgan");
 const { json } = require("body-parser");
 const cors = require("cors");
 const helmet = require("helmet");
-const validateJWT = require("./middleware/jwt-middleware")
 
 const errorMiddleware = require("./middleware/error-middleware");
 const userRouter = require("./routes/user-routes")