fixes a problem with sorting dates

Author: justinbmeyer

src/helpers.js

@@ -1,3 +1,12 @@
+var defaultCompare = {
+    $gt: function(valueA, valueB) {
+        return valueA > valueB;
+    },
+    $lt: function(valueA, valueB) {
+        return valueA < valueB;
+    }
+};
+
 var helpers =  {
     // given two arrays of items, combines and only returns the unique ones
     uniqueConcat: function(itemsA, itemsB, getId) {
@@ -49,25 +58,30 @@ var helpers =  {
             return {prop: sortPropValue, desc: false};
         }
     },
-    sorter: function (sortPropValue) {
+    sorter: function (sortPropValue, sorters) {
         var data = helpers.sortData(sortPropValue);
+        var compare;
+        if(sorters && sorters[data.prop]) {
+            compare = sorters[data.prop];
+        } else {
+            compare = defaultCompare;
+        }
         return function(item1, item2){
             var item1Value = item1[data.prop];
             var item2Value = item2[data.prop];
             var temp;
 
-
             if(data.desc) {
                 temp = item1Value;
                 item1Value = item2Value;
                 item2Value = temp;
             }
 
-            if(item1Value < item2Value) {
+            if( compare.$lt( item1Value, item2Value) ) {
                 return -1;
             }
 
-            if(item1Value > item2Value) {
+            if( compare.$gt( item1Value, item2Value)) {
                 return 1;
             }
 

src/serializers/basic-query.js

@@ -265,7 +265,25 @@ module.exports = function(schema) {
     ];
 
 
-
+    var sorters = {};
+    canReflect.eachKey(keys, function(schemaProp, key){
+
+        sorters[key] = {
+            // valueA is GT valueB
+            $gt: function(valueA, valueB) {
+                var $gt = hydrateAndValue({$gt: valueB}, key, schemaProp, function(){
+                    debugger;
+                });
+                return $gt.isMember(valueA);
+            },
+            $lt: function( valueA, valueB ){
+                var $lt = hydrateAndValue({$lt: valueB}, key, schemaProp, function(){
+                    debugger;
+                });
+                return $lt.isMember(valueA);
+            }
+        };
+    });
 
 
     var serializer = new Serializer(serializeMap);
@@ -309,7 +327,7 @@ module.exports = function(schema) {
             } else {
                 query.sort = id;
             }
-            return new BasicQuery(query);
+            return new BasicQuery(query, sorters);
         },
         serializer: serializer
     };

src/types/basic-query.js

@@ -16,7 +16,8 @@ var RecordRange = makeRealNumberRangeInclusive(0, Infinity);
 
 
 // Define the BasicQuery type
-function BasicQuery(query) {
+function BasicQuery(query, sorters) {
+	this._sorters = sorters;
 	assign(this, query);
 	if (!this.filter) {
 		this.filter = set.UNIVERSAL;
@@ -43,7 +44,7 @@ canReflect.assignMap(BasicQuery.prototype, {
 		return this.page.end - this.page.start + 1;
 	},
 	sortData: function(data) {
-		var sort = helpers.sorter(this.sort);
+		var sort = helpers.sorter(this.sort, this._sorters);
 		return data.slice(0).sort(sort);
 	},
 	filterMembersAndGetCount: function(bData, parentQuery) {
@@ -214,25 +215,22 @@ function metaInformation(queryA, queryB) {
 set.defineComparison(BasicQuery, BasicQuery, {
 	union: function(queryA, queryB) {
 
-		var pageIsEqual = set.isEqual(queryA.page, queryB.page);
-		var pagesAreUniversal = pageIsEqual && set.isEqual(queryA.page, set.UNIVERSAL);
+		var meta = metaInformation(queryA, queryB);
+
 
 		var filterUnion = set.union(queryA.filter, queryB.filter);
 
-		var sortIsEqual = set.isEqual(queryA.sort, queryB.sort);
-
-		if (pagesAreUniversal) {
+		if (meta.pagesAreUniversal) {
 			// We ignore the sort.
 			return new BasicQuery({
 				filter: filterUnion,
-				sort: sortIsEqual ? queryA.sort : undefined
+				sort: meta.sortIsEqual ? queryA.sort : undefined
 			});
 		}
 
-		var filterIsEqual = set.isEqual(queryA.filter, queryB.filter);
 
-		if (filterIsEqual) {
-			if (sortIsEqual) {
+		if (meta.filterIsEqual) {
+			if (meta.sortIsEqual) {
 				return new BasicQuery({
 					filter: queryA.filter,
 					sort: queryA.sort,

test/special-comparison-logic-test.js

@@ -232,4 +232,16 @@ QUnit.test("value type", function(){
         }
     );
 
+    var result = queryLogic.filterMembers({
+        sort: "date"
+    },[
+        {id: 2, date: new Date(1982,9,20).toString()},
+        {id: 1, date: new Date(1981,9,20).toString()},
+        {id: 4, date: new Date(1984,9,20).toString()},
+        {id: 3, date: new Date(1983,9,20).toString()}
+    ]);
+
+    var ids = result.map(function(item){ return item.id});
+    QUnit.deepEqual(ids,[1,2,3,4], "sorted correctly");
+
 });