Correctly parse rooms, size, price etc.

backend/server.js

@@ -1,7 +1,7 @@
 import express from 'express'
 import bodyParser from 'body-parser';
 var MongoClient = require('mongodb').MongoClient;
-var url = 'mongodb://localhost:27017/example';
+var url = 'mongodb://localhost:27017/kivi';
 
 require("babel-polyfill");
 
@@ -10,6 +10,9 @@ const router = express.Router({mergeParams: true})
 const PORT = process.env.PORT || 3001;
 const AGENTURA_KEY = process.env.AGENTURA_KEY || '1somethingverysecret';
 
+let db;
+//Monogo         = await MongoClient.connect(url);
+
 // TODO:
 // db.results.ensureIndex({loc:"2d"})
 //collection.ensureIndex("username",callback)
@@ -17,8 +20,13 @@ const AGENTURA_KEY = process.env.AGENTURA_KEY || '1somethingverysecret';
 router.get('/search', async (req, res, next) => {
   try {
     const bounds     = req.query.bounds || '';
-    const db         = await MongoClient.connect(url);
-    const properties = db.collection('results');
+    const minPrice   = req.query.minPrice;
+    const maxPrice   = req.query.maxPrice;
+    const minSize    = req.query.minSize;
+    const maxSize    = req.query.maxSize;
+    const rooms      = req.query.rooms;
+    const adType     = req.query.adType;
+    const properties = db.collection('listings');
     let query        = {};
 
     if (bounds) {
@@ -34,11 +42,62 @@ router.get('/search', async (req, res, next) => {
       });
     }
 
+    if (adType) {
+      query = Object.assign(query, {
+        adType: parseInt(adType)
+      });
+    }
+
+    if (minPrice) {
+      query = Object.assign(query, {
+        price: {
+          "$gte": parseFloat(minPrice),
+          "$ne": -1
+        }
+      });
+    }
+
+    if (maxPrice) {
+      query = Object.assign(query, {
+        price: {
+          "$lte": parseFloat(maxPrice),
+          "$ne": -1
+        }
+      });
+    }
+
+    if (rooms === "4+") {
+      query = Object.assign(query, {
+        rooms: {
+          "$gte": 4
+        }
+      })
+    } else if (rooms) {
+      query = Object.assign(query, {
+        rooms: parseFloat(rooms)
+      });
+    }
+
+    if (minSize) {
+      query = Object.assign(query, {
+        size: {
+          "$gte": parseFloat(minSize)
+        }
+      });
+    }
+
+    if (maxSize) {
+      query = Object.assign(query, {
+        size: {
+          "$lte": parseFloat(maxSize)
+        }
+      });
+    }
+
     const all = await properties.find(query).toArray();
 
     res.json(all);
     res.end();
-    await db.close();
   } catch (e) {
     console.log('error:', e);
     next(e);
@@ -58,5 +117,10 @@ app.use(function(req, res, next) {
 });
 
 app.use('/api', router);
-app.listen(PORT, () => console.log('Express server running at localhost: ' + PORT));
+
+MongoClient.connect(url).then((database) => {
+  db = database;
+  db.collection('listings').createIndex({loc: "2d"});
+  app.listen(PORT, () => console.log('Express server running at localhost: ' + PORT));
+});