Applied Changes

Author: devmxhv

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;

src/controllers/properties-controller.js

@@ -0,0 +1,24 @@
+const fetch = require("node-fetch");
+const config = require("../config");
+const { getPropertyById } = 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/controllers/property-controller.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

@@ -21,7 +21,6 @@ bookingsRouter.get("/employees/:eid", validateJWT, getBookingsByEmployeeId);
 
 bookingsRouter.post("/:propertyId", validateJWT, validateSetStatus, setStatus);
 
-
-bookingsRouter.patch("/:propertyId", validateUpdateBookingAddress, updateBookingAddress);
+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

@@ -8,6 +8,7 @@ const validateJWT = require("./middleware/jwt-middleware")
 const errorMiddleware = require("./middleware/error-middleware");
 const userRouter = require("./routes/user-routes")
 const bookingsRouter = require("./routes/bookings-routes");
+const propertiesRouter = require("./routes/properties-routes");
 
 const app = express();
 
@@ -16,9 +17,9 @@ app.use(helmet());
 app.use(json());
 app.use(cors());
 
-app.get("/admin", validateJWT, (req, res, next) => res.status(200).send("Authorized"));
 app.use("/user", userRouter);
 app.use("/bookings", bookingsRouter);
+app.use("/properties", propertiesRouter);
 app.use(errorMiddleware);
 
 module.exports = app;

src/server.js

@@ -0,0 +1,34 @@
+async function getPropertyById(propertyId) {
+    const res = await fetch(`${config.admin_server_url}/client/properties/${propertyId}`, {
+        method: 'get',
+        headers: {
+            'Accept': 'application/json',
+            'auth': config.jwt.token
+        },
+    });
+    if (!res.ok) throw new Error(res.statusText);
+    return await res.json();
+}
+
+async function searchAdminProperties(queryParams) {
+    const queryString = parseQueryParams(queryParams);
+    const res = await fetch(`${config.admin_server_url}/client/properties?${queryString}`, {
+        method: 'get',
+        headers: {
+            'Accept': 'application/json',
+            'auth': config.jwt.token
+        },
+    });
+    if (!res.ok) throw new Error(res.statusText);
+    return await res.json();
+}
+
+const parseQueryParams = (params) => {
+    return Object.entries(params).reduce((acc, [key, value]) => {
+        return acc + (Array.isArray(value) ?
+            value.reduce((last, curr) => last + `${key}[]=${curr}&`, "") :
+            `${key}=${value}&`)
+    }, "")
+}
+
+module.exports = { getPropertyById, searchAdminProperties, parseQueryParams };