fix(query): leave coordinates array as-is

florianholzapfel · Mar 14, 2016 · 3cd645a · 3cd645a
1 parent 1312741
commit 3cd645a
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
   },
   "dependencies": {
     "async": "~1.5.0",
+    "is-coordinates": "~1.0.0",
     "lodash": "~4.6.0",
     "mongoose-detective": "~0.1.0",
     "moredots": "~0.1.0",

diff --git a/src/middleware/prepareQuery.js b/src/middleware/prepareQuery.js
@@ -1,4 +1,5 @@
 const _ = require('lodash')
+const isCoordinates = require('is-coordinates')
 
 module.exports = function (options) {
   function jsonQueryParser (key, value) {
@@ -23,7 +24,7 @@ module.exports = function (options) {
       } else if (value[0] === '=') {
         return { $eq: value.substr(1) }*/
       }
-    } else if (_.isArray(value) && key[0] !== '$') {
+    } else if (_.isArray(value) && key[0] !== '$' && key !== 'coordinates' && !isCoordinates(value)) {
       return { $in: value }
     }
 

diff --git a/test/integration/read.js b/test/integration/read.js
@@ -44,7 +44,8 @@ module.exports = function (createFn, setup, dismantle) {
                 item: createdProduct._id,
                 number: 1
               }
-            }
+            },
+            coordinates: [45.2667, 72.1500]
           }, {
             name: 'John',
             age: 24,
@@ -317,6 +318,32 @@ module.exports = function (createFn, setup, dismantle) {
         })
       })
 
+      it('GET /Customer?query={"$near": { "$geometry": { "coordinates": [45.2667, 72.1500] } }} 200 - coordinates', (done) => {
+        request.get({
+          url: `${testUrl}/api/v1/Customer`,
+          qs: {
+            query: JSON.stringify({
+              coordinates: {
+                $near: {
+                  $geometry: {
+                    type: 'Point',
+                    coordinates: [45.2667, 72.1500]
+                  },
+                  $maxDistance: 1000
+                }
+              }
+            })
+          },
+          json: true
+        }, (err, res, body) => {
+          assert.ok(!err)
+          console.log(res.body)
+          assert.equal(res.statusCode, 200)
+          assert.equal(body.length, 1)
+          done()
+        })
+      })
+
       it('GET /Customer?query=invalidJson 400 - invalid json', (done) => {
         request.get({
           url: `${testUrl}/api/v1/Customer`,

diff --git a/test/integration/setup.js b/test/integration/setup.js
@@ -37,7 +37,8 @@ module.exports = function () {
       }],
       returns: [{ type: Schema.Types.ObjectId, ref: 'Product' }],
       creditCard: { type: String, access: 'protected' },
-      ssn: { type: String, access: 'private' }
+      ssn: { type: String, access: 'private' },
+      coordinates: { type: [Number], index: '2dsphere' }
     })
   }