Fix aggregate geoNear with date query (#6540)

* added failing test case

* add date conversion for geoNear query

- geoNear stages were not parsed for date fields, but mongodb nodejs adapter requires date object

* reverted unnecessary code auto-formatting

* limited parsing to query property of geoNear stage

- the geoNear object contains parameter keys which could be identical to field names in the collection, which should not be parsed and changed, therefore restricting parsing only to query parameter key

* reverted unnecessary code auto-formatting

* added index type parameter to ensureIndex

- required to create geo index for geoNear test

* added geo index creation to test case

* fixed dates in test case

- test case likey failed due to date rounding

* added error output to console

- temporary, to find out why test fails on mongodb 3.6.9

* create seperate class to avoid multiple geo indices on TestObject class

- mongodb <4.0 does not allow nultiple geo indices on a class when using geoNear
- see https://docs.mongodb.com/v3.6/reference/operator/aggregation/geoNear/#behavior

* fixed incorrect result validation

- results were not ordered properly, so test validation failed sometimes

* removed error output to console

This reverts commit da81c51.

Author: mtrezza

spec/ParseQuery.Aggregate.spec.js

@@ -1,6 +1,7 @@
 'use strict';
 const Parse = require('parse/node');
 const request = require('../lib/request');
+const Config = require('../lib/Config');
 
 const masterKeyHeaders = {
   'X-Parse-Application-Id': 'test',
@@ -1428,4 +1429,49 @@ describe('Parse.Query Aggregate testing', () => {
         });
     }
   );
+
+  it_only_db('mongo')('geoNear with location query', async () => {
+    // Create geo index which is required for `geoNear` query
+    const database = Config.get(Parse.applicationId).database;
+    const schema = await new Parse.Schema('GeoObject').save();
+    await database.adapter.ensureIndex(
+      'GeoObject',
+      schema,
+      ['location'],
+      'geoIndex',
+      false,
+      '2dsphere'
+    );
+    // Create objects
+    const GeoObject = Parse.Object.extend('GeoObject');
+    const obj1 = new GeoObject({ value: 1, location: new Parse.GeoPoint(1, 1), date: new Date(1) });
+    const obj2 = new GeoObject({ value: 2, location: new Parse.GeoPoint(2, 1), date: new Date(2) });
+    const obj3 = new GeoObject({ value: 3, location: new Parse.GeoPoint(3, 1), date: new Date(3) });
+    await Parse.Object.saveAll([obj1, obj2, obj3]);
+    // Create query
+    const pipeline = [
+      {
+        geoNear: {
+          near: {
+            type: 'Point',
+            coordinates: [1, 1]
+          },
+          key: 'location',
+          spherical: true,
+          distanceField: 'dist',
+          query: {
+            date: {
+              $gte: new Date(2)
+            }
+          }
+        }
+      }
+    ];
+    const query = new Parse.Query(GeoObject);
+    const results = await query.aggregate(pipeline);
+    // Check results
+    expect(results.length).toEqual(2);
+    expect(results[0].value).toEqual(2);
+    expect(results[1].value).toEqual(3);
+  });
 });

src/Adapters/Storage/Mongo/MongoStorageAdapter.js

@@ -682,15 +682,16 @@ export class MongoStorageAdapter implements StorageAdapter {
     schema: SchemaType,
     fieldNames: string[],
     indexName: ?string,
-    caseInsensitive: boolean = false
+    caseInsensitive: boolean = false,
+    indexType: any = 1
   ): Promise<any> {
     schema = convertParseSchemaToMongoSchema(schema);
     const indexCreationRequest = {};
     const mongoFieldNames = fieldNames.map(fieldName =>
       transformKey(className, fieldName, schema)
     );
     mongoFieldNames.forEach(fieldName => {
-      indexCreationRequest[fieldName] = 1;
+      indexCreationRequest[fieldName] = indexType;
     });
 
     const defaultOptions: Object = { background: true, sparse: true };
@@ -843,6 +844,9 @@ export class MongoStorageAdapter implements StorageAdapter {
           stage.$project
         );
       }
+      if (stage.$geoNear) {
+        stage.$geoNear.query = this._parseAggregateArgs(schema, stage.$geoNear.query);
+      }
       return stage;
     });
     readPreference = this._parseReadPreference(readPreference);

src/Adapters/Storage/StorageAdapter.js

@@ -92,7 +92,8 @@ export interface StorageAdapter {
     schema: SchemaType,
     fieldNames: string[],
     indexName?: string,
-    caseSensitive?: boolean
+    caseSensitive?: boolean,
+    indexType?: any
   ): Promise<any>;
   ensureUniqueness(
     className: string,