hotfix: Properties routes imports & tests (#18)

* hotfix: properties controller imports
* properties tests added (#17)

Author: Víctor Martínez

Makefile

@@ -15,5 +15,6 @@ down:
 
 build:
 	docker-compose -f docker-compose-test.yaml build
+
 up_forward: down
-	docker-compose -f docker-compose-test.yaml up -d --scale node=0 && docker-compose -f docker-compose-test.yaml -p 5000:5000 run node /bin/sh
+	docker-compose -f docker-compose-test.yaml up -d --scale node=0 && docker-compose -f docker-compose-test.yaml run -p 5000:5000 node /bin/sh

src/controllers/properties-controller.js

@@ -1,12 +1,13 @@
-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);
+        res.status(200).send({
+            data: response,
+            error: null
+        });
     } catch (err) {
         next(err);
     }
@@ -15,7 +16,10 @@ async function getProperty(req, res, next) {
 async function searchProperties(req, res, next) {
     try {
         const response = await searchAdminProperties(req.query);
-        res.status(200).send(response);
+        res.status(200).send({
+            data: response,
+            error: null
+        });
     } catch (err) {
         next(err);
     }

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

@@ -8,9 +8,16 @@ const testServer = require("../../mock/db-test-server");
 const app = require("../../server");
 const setupTestDB = require("../../mock/seedTestDB");
 const { parseQueryParams } = require("../../utils/properties");
+const fetch = require("node-fetch");
+jest.mock("node-fetch");
 
 const request = supertest(app);
 
+
+beforeEach(async () => {
+    jest.clearAllMocks();
+});
+
 beforeAll(async () => {
     await testServer.initTestServer();
     await setupTestDB.seedTestBookingsDB();
@@ -34,4 +41,28 @@ describe("Properties routes", () => {
         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&");
     });
+
+    it("can search properties", async () => {
+        fetch.mockResolvedValue({
+            json: () => Promise.resolve([
+                { hello: "World" }
+            ]),
+            ok: true
+        });
+
+        const res = await request.get("/properties?kind=Office");
+        expect(res.body.data).toMatchObject([{ hello: "World" }]);
+    });
+
+    it("can get property by Id", async () => {
+        fetch.mockResolvedValue({
+            json: () => Promise.resolve(
+                { hello: "World" }
+            ),
+            ok: true
+        });
+
+        const res = await request.get("/properties/sdflksdgkn");
+        expect(res.body.data).toMatchObject({ hello: "World" });
+    });
 });

src/utils/properties/index.js

@@ -1,3 +1,6 @@
+const fetch = require("node-fetch");
+const config = require("../../config");
+
 async function getPropertyById(propertyId) {
     const res = await fetch(`${config.admin_server_url}/client/properties/${propertyId}`, {
         method: 'get',