#4678: Converting strings to Date when schema.type is Date within agg…

spec/ParseQuery.Aggregate.spec.js

@@ -474,6 +474,60 @@ describe('Parse.Query Aggregate testing', () => {
     });
   });
 
+  it('match date query - createdAt', (done) => {
+    const obj1 = new TestObject();
+    const obj2 = new TestObject();
+
+    Parse.Object.saveAll([obj1, obj2]).then(() => {
+      const now = new Date();
+      const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+      const pipeline = [
+        { match: { 'createdAt': { $gte: today } } }
+      ];
+      const query = new Parse.Query(TestObject);
+      return query.aggregate(pipeline);
+    }).then((results) => {
+      expect(results.length).toEqual(2);
+      done();
+    });
+  });
+
+  it('match date query - updatedAt', (done) => {
+    const obj1 = new TestObject();
+    const obj2 = new TestObject();
+
+    Parse.Object.saveAll([obj1, obj2]).then(() => {
+      const now = new Date();
+      const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+      const pipeline = [
+        { match: { 'updatedAt': { $gte: today } } }
+      ];
+      const query = new Parse.Query(TestObject);
+      return query.aggregate(pipeline);
+    }).then((results) => {
+      expect(results.length).toEqual(2);
+      done();
+    });
+  });
+
+  it('match date query - empty', (done) => {
+    const obj1 = new TestObject();
+    const obj2 = new TestObject();
+
+    Parse.Object.saveAll([obj1, obj2]).then(() => {
+      const now = new Date();
+      const future = new Date(now.getFullYear(), now.getMonth() + 1, now.getDate());
+      const pipeline = [
+        { match: { 'createdAt': future } }
+      ];
+      const query = new Parse.Query(TestObject);
+      return query.aggregate(pipeline);
+    }).then((results) => {
+      expect(results.length).toEqual(0);
+      done();
+    });
+  });
+
   it('project query', (done) => {
     const options = Object.assign({}, masterKeyOptions, {
       body: {

src/Adapters/Storage/Mongo/MongoStorageAdapter.js

@@ -565,18 +565,7 @@ export class MongoStorageAdapter implements StorageAdapter {
         }
       }
       if (stage.$match) {
-        for (const field in stage.$match) {
-          if (schema.fields[field] && schema.fields[field].type === 'Pointer') {
-            const transformMatch = { [`_p_${field}`] : `${schema.fields[field].targetClass}$${stage.$match[field]}` };
-            stage.$match = transformMatch;
-          }
-          if (field === 'objectId') {
-            const transformMatch = Object.assign({}, stage.$match);
-            transformMatch._id = stage.$match[field];
-            delete transformMatch.objectId;
-            stage.$match = transformMatch;
-          }
-        }
+        this._parseAggregateArgs(schema, stage.$match);
       }
       return stage;
     });
@@ -608,6 +597,55 @@ export class MongoStorageAdapter implements StorageAdapter {
       .catch(err => this.handleError(err));
   }
 
+  _parseAggregateArgs(schema: any, pipeline: any): any {
+    var rtnval = {};
+    if (Array.isArray(pipeline)) {
+      rtnval = [];
+      for (const field in pipeline) {
+        rtnval.push(this._parseAggregateArgs(schema, pipeline[field]));
+      }
+    }
+    else if (typeof pipeline === 'object') {
+      for (const field in pipeline) {
+        if (schema.fields[field] && schema.fields[field].type === 'Pointer') {
+          rtnval[`_p_${field}`] = `${schema.fields[field].targetClass}$${pipeline[field]}`;
+        }
+        else if (schema.fields[field] && schema.fields[field].type === 'Date') {
+          rtnval[field] = this._convertToDate(pipeline[field]);
+        }
+        else {
+          rtnval[field] = this._parseAggregateArgs(schema, pipeline[field]);
+        }
+
+        if (field === 'objectId') {
+          rtnval['_id'] = rtnval[field];
+          delete rtnval[field];
+        }
+        else if (field === 'createdAt') {
+          rtnval['_created_at'] = rtnval[field];
+          delete rtnval[field];
+        }
+        else if (field === 'updatedAt') {
+          rtnval['_updated_at'] = rtnval[field];
+          delete rtnval[field];
+        }
+      }
+    }
+    return rtnval;
+  }
+
+  _convertToDate(value: any): any {
+    if (typeof value === 'string') {
+      return new Date(value);
+    }
+
+    var rtnval = {}
+    for (const field in value) {
+      rtnval[field] = this._convertToDate(value[field])
+    }
+    return rtnval;
+  }
+
   _parseReadPreference(readPreference: ?string): ?string {
     switch (readPreference) {
     case 'PRIMARY':