Merge branch 'dev' into main

Author: Víctor Martínez

src/controllers/bookings-controller.js

@@ -1,5 +1,5 @@
 const db = require("../models");
-const { getPropertyById } = require("./property-controller");
+const { getPropertyById } = require("../utils/properties");
 
 async function bookProperty(req, res, next) {
     const { uid } = req.user;
@@ -74,5 +74,38 @@ async function updateBookingAddress(req, res, next) {
         next(err);
     }
 }
-
-module.exports = { getBookings, bookProperty, cancelBooking, updateBookingAddress };
+async function getBookingsByEmployeeId(req, res, next) {
+    const { eid } = req.params;
+    try {
+        const bookings = await db.Bookings
+            .find({ employeeId: eid })
+            .select("-__v -contactInfo")
+            .sort({ createdAt: -1 })
+            .lean()
+            .exec();
+        res.status(200).send({
+            data: bookings,
+            error: null
+        });
+    } catch (err) {
+        next(err);
+    }
+}
+async function setStatus(req, res, next) {
+    const { propertyId } = req.params;
+    const { status } = req.body;
+    try {
+        const booking = await db.Bookings
+            .findByIdAndUpdate(propertyId, { status }, { new: true })
+            .select("-__v -contactInfo")
+            .lean()
+            .exec();
+        res.status(200).send({
+            data: booking,
+            error: null
+        });
+    } catch (err) {
+        next(err);
+    }
+}
+module.exports = { getBookings, bookProperty, cancelBooking, updateBookingAddress, getBookingsByEmployeeId, setStatus };

src/controllers/properties-controller.js

@@ -0,0 +1,24 @@
+const fetch = require("node-fetch");
+const config = require("../config");
+const { getPropertyById, searchAdminProperties } = require("../utils/properties");
+
+async function getProperty(req, res, next) {
+    const { propertyId } = req.params;
+    try {
+        const response = await getPropertyById(propertyId);
+        res.status(200).send(response);
+    } catch (err) {
+        next(err);
+    }
+}
+
+async function searchProperties(req, res, next) {
+    try {
+        const response = await searchAdminProperties(req.query);
+        res.status(200).send(response);
+    } catch (err) {
+        next(err);
+    }
+}
+
+module.exports = { getProperty, searchProperties };

src/middleware/stsauth-middleware.js

@@ -15,6 +15,9 @@ const updateBookingAddressSchema = Joi.object({
     state: Joi.string().trim().required(),
     country: Joi.string().trim().required(),
 });
+const setStatusSchema = Joi.object({
+    status: Joi.string().trim().required().valid("pending", "rejected", "accepted"),
+});
 
 async function validateNewBooking(req, res, next) {
     try {
@@ -33,5 +36,13 @@ async function validateUpdateBookingAddress(req, res, next) {
         next({ statusCode: 400, message: err.details });
     }
 }
+async function validateSetStatus(req, res, next) {
+    try {
+        req.body = await setStatusSchema.validateAsync(req.body);
+        next();
+    } catch (err) {
+        next({ statusCode: 400, message: err.details });
+    }
+}
 
-module.exports = { validateNewBooking, validateUpdateBookingAddress };
+module.exports = { validateNewBooking, validateUpdateBookingAddress, validateSetStatus };

src/middleware/validators/bookings-validator.js

@@ -1,5 +1,5 @@
 const mockAuth = (clientId, mail) => {
-    return (req, _, next) => {
+    return () => (req, _, next) => {
         req.user = {
             uid: clientId,
             email: mail

src/mock/middleware/auth-middleware.js

@@ -10,7 +10,7 @@ const setupTestDB = require("../../mock/seedTestDB");
 
 const mockHome = setupTestDB.getHome();
 
-jest.mock("../../controllers/property-controller", () => ({
+jest.mock("../../utils/properties", () => ({
     getPropertyById: () => mockHome
 }))
 

src/routes/__tests__/bookings-routes.test.js

@@ -0,0 +1,37 @@
+// Mock Firebase Auth
+const MOCK_CLIENT_ID = "5d6ede6a0ba62570afcedd3a";
+const mockAuth = require("../../mock/middleware/auth-middleware")(MOCK_CLIENT_ID, "[email protected]");
+jest.mock('../../middleware/auth-middleware.js', () => mockAuth);
+// Require everything else
+const supertest = require("supertest");
+const testServer = require("../../mock/db-test-server");
+const app = require("../../server");
+const setupTestDB = require("../../mock/seedTestDB");
+const { parseQueryParams } = require("../../utils/properties");
+
+const request = supertest(app);
+
+beforeAll(async () => {
+    await testServer.initTestServer();
+    await setupTestDB.seedTestBookingsDB();
+});
+
+afterAll(async () => {
+    await testServer.clearCollections();
+    await testServer.stopTestServer();
+});
+
+describe("Properties routes", () => {
+    it("Query params conversion", () => {
+        const queryParams = {
+            name: "Patata",
+            age: 19,
+            homeType: ["patata", "queso", "macarrones"],
+            names: ["Victor", "Martinez", "Montané"],
+            sold: true
+        };
+        //insert into db test_property with create property
+        const string = parseQueryParams(queryParams);
+        expect(string).toEqual("name=Patata&age=19&homeType[]=patata&homeType[]=queso&homeType[]=macarrones&names[]=Victor&names[]=Martinez&names[]=Montané&sold=true&");
+    });
+});

src/routes/__tests__/properties-routes.js

@@ -1,21 +1,25 @@
 const { Router } = require("express");
 const auth = require("../middleware/auth-middleware");
 const validateJWT = require("../middleware/jwt-middleware");
-const { validateNewBooking, validateUpdateBookingAddress } = require("../middleware/validators/bookings-validator");
+const { validateNewBooking, validateUpdateBookingAddress, validateSetStatus } = require("../middleware/validators/bookings-validator");
 
 const bookingsRouter = Router();
 
 const {
     getBookings,
     cancelBooking,
     bookProperty,
-    updateBookingAddress
+    updateBookingAddress,
+    getBookingsByEmployeeId,
+    setStatus
 } = require("../controllers/bookings-controller");
 
-bookingsRouter.post("/", auth, validateNewBooking, bookProperty);
-bookingsRouter.delete("/:propertyId", auth, cancelBooking);
-bookingsRouter.get("/all", auth, getBookings);
+bookingsRouter.post("/", auth(), validateNewBooking, bookProperty);
+bookingsRouter.delete("/:propertyId", auth(), cancelBooking);
+bookingsRouter.get("/all", auth(), getBookings);
 
-bookingsRouter.patch("/:propertyId", validateUpdateBookingAddress, updateBookingAddress);
+bookingsRouter.get("/employees/:eid", validateJWT, getBookingsByEmployeeId);
+bookingsRouter.post("/:propertyId", validateJWT, validateSetStatus, setStatus);
+bookingsRouter.patch("/:propertyId", validateJWT, validateUpdateBookingAddress, updateBookingAddress);
 
 module.exports = bookingsRouter;

src/routes/bookings-routes.js

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

src/routes/properties-routes.js

@@ -12,8 +12,8 @@ const {
 } = require("../controllers/user-controller");
 
 userRouter.post("/register", validateRegisterData, register);
-userRouter.post("/login", auth, login);
-userRouter.delete("/", auth, deleteUser);
-userRouter.patch("/profile", auth, validateUpdateData, update);
+userRouter.post("/login", auth(), login);
+userRouter.delete("/", auth(), deleteUser);
+userRouter.patch("/profile", auth(), validateUpdateData, update);
 
 module.exports = userRouter;