LDS: Improve querying dates (#808)

* LDS: Improve querying dates Can query from Date Object / String comparison * fix Date
parse-community · Apr 30, 2019 · df81cba · df81cba
1 parent 342a5ac
commit df81cba
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/integration/test/ParseLocalDatastoreTest.js b/integration/test/ParseLocalDatastoreTest.js
@@ -2590,6 +2590,45 @@ function runTest(controller) {
       });
     });
 
+    it(`${controller.name} can query from date`, async () => {
+      const now = new Date();
+      const obj = new TestObject({ dateField: now });
+      await obj.save();
+      await obj.pin();
+
+      let q = new Parse.Query(TestObject);
+      q.equalTo('dateField', now);
+      q.fromLocalDatastore();
+      let objects = await q.find();
+      assert.equal(objects.length, 1);
+
+      const future = new Date(now.getTime() + 1000);
+      q = new Parse.Query(TestObject);
+      q.lessThan('dateField', future);
+      q.fromLocalDatastore();
+      objects = await q.find();
+      assert.equal(objects.length, 1);
+
+      q = new Parse.Query(TestObject);
+      q.lessThanOrEqualTo('dateField', now);
+      q.fromLocalDatastore();
+      objects = await q.find();
+      assert.equal(objects.length, 1);
+
+      const past = new Date(now.getTime() - 1000);
+      q = new Parse.Query(TestObject);
+      q.greaterThan('dateField', past);
+      q.fromLocalDatastore();
+      objects = await q.find();
+      assert.equal(objects.length, 1);
+
+      q = new Parse.Query(TestObject);
+      q.greaterThanOrEqualTo('dateField', now);
+      q.fromLocalDatastore();
+      objects = await q.find();
+      assert.equal(objects.length, 1);
+    });
+
     it(`${controller.name} supports withinPolygon`, async () => {
       const sacramento = new TestObject();
       sacramento.set('location', new Parse.GeoPoint(38.52, -121.50));

diff --git a/src/OfflineQuery.js b/src/OfflineQuery.js
@@ -137,8 +137,12 @@ function matchesKeyConstraints(className, object, objects, key, constraints) {
     if (compareTo.__type) {
       compareTo = decode(compareTo);
     }
-    if (toString.call(compareTo) === '[object Date]') {
-      object[key] = new Date(object[key]);
+    // Compare Date Object or Date String
+    if (toString.call(compareTo) === '[object Date]' ||
+       (typeof compareTo === 'string' &&
+       new Date(compareTo) !== 'Invalid Date' &&
+       !isNaN(new Date(compareTo)))) {
+      object[key] = new Date(object[key].iso ? object[key].iso : object[key]);
     }
     switch (condition) {
     case '$lt':