Merge pull request #15 from SimpliField/feat/query-sorting

[Feat] query sorting

Author: SebastienElet

angular-sql-query.js

@@ -98,10 +98,11 @@
      *
      * @param  {Object} params      - Request Params
      * @param  {Object} limitParams - Limit params of the query
+     * @param  {Array} sortParams   - Sort params of the query
      * @return {Promise}       - Request result
      * @this SqlQueryService
      */
-    function queryBackUp(params, limitParams) {
+    function queryBackUp(params, limitParams, sortParams) {
       var _this = this;
       var indexedFields = _this.helpers.indexed_fields;
       var castedParams = castParamsForQuery(params || {});
@@ -114,7 +115,7 @@
       var batchPromise = tmpTablesQueries.length ? _this.batch(tmpTablesQueries) : $q.when();
 
       return batchPromise.then(function onceCreated() {
-        var query = prepareSimpleQuery(_this.backUpName, organizedIndexedParams, limitParams);
+        var query = prepareSimpleQuery(_this.backUpName, organizedIndexedParams, limitParams, sortParams);
 
         return _this.execute(query.query, query.params).then(function (docs) {
           var datas = transformResults(docs);
@@ -367,7 +368,7 @@
   //   QUERY HELPERS
   //
   // -----------------
-  function prepareSimpleQuery(tableName, queryAsObject, limitParams) {
+  function prepareSimpleQuery(tableName, queryAsObject, limitParams, sortParams) {
     return {
       query: getSimpleQuery(queryAsObject),
       params: Object.keys(queryAsObject.self).reduce(function (arr, column) {
@@ -382,7 +383,8 @@
       var andDefinition = queries.join(' AND ');
       var dataDefinition = '' + whereDefinition + andDefinition;
       var query = statement + dataDefinition;
-      var limitDefinition = applyLimitQuery(query, limitParams);
+      var sortedQuery = applySortQuery(query, sortParams);
+      var limitDefinition = applyLimitQuery(sortedQuery, limitParams);
 
       return limitDefinition + ';';
     }
@@ -451,6 +453,22 @@
 
     return paramsQuery ? query + ' WHERE ' + paramsQuery : query;
   }
+  function applySortQuery(query) {
+    var sortParams = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+
+    if (sortParams.length === 0) {
+      return query;
+    };
+
+    // const sort = sortParams.map((p) => `${p.key}`).join(',')
+    var queryOrder = ' ORDER BY ' + sortParams.map(function (_ref) {
+      var key = _ref.key,
+          desc = _ref.desc;
+      return key + ' ' + (desc && 'DESC');
+    }).join(',');
+
+    return query + queryOrder;
+  }
   function applyLimitQuery(query) {
     var limitParams = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 

angular-sql-query.min.js

@@ -99,10 +99,11 @@
      *
      * @param  {Object} params      - Request Params
      * @param  {Object} limitParams - Limit params of the query
+     * @param  {Array}  sortParams  - Sort params of the query
      * @return {Promise}       - Request result
      * @this SqlQueryService
      */
-    function queryBackUp(params, limitParams) {
+    function queryBackUp(params, limitParams, sortParams) {
       const _this = this;
       const indexedFields = _this.helpers.indexed_fields;
       const castedParams = castParamsForQuery(params || {});
@@ -120,7 +121,7 @@
 
       return batchPromise
         .then(function onceCreated() {
-          var query = prepareSimpleQuery(_this.backUpName, organizedIndexedParams, limitParams);
+          var query = prepareSimpleQuery(_this.backUpName, organizedIndexedParams, limitParams, sortParams);
 
           return _this.execute(query.query, query.params)
             .then((docs) => {
@@ -392,7 +393,7 @@
   //   QUERY HELPERS
   //
   // -----------------
-  function prepareSimpleQuery(tableName, queryAsObject, limitParams) {
+  function prepareSimpleQuery(tableName, queryAsObject, limitParams, sortParams) {
     return {
       query: getSimpleQuery(queryAsObject),
       params: Object.keys(queryAsObject.self)
@@ -411,7 +412,8 @@
       const andDefinition = queries.join(' AND ');
       const dataDefinition = `${whereDefinition}${andDefinition}`;
       const query = statement + dataDefinition;
-      const limitDefinition = applyLimitQuery(query, limitParams);
+      const sortedQuery = applySortQuery(query, sortParams);
+      const limitDefinition = applyLimitQuery(sortedQuery, limitParams);
 
       return `${limitDefinition};`;
     }
@@ -480,6 +482,17 @@
       `${query} WHERE ${paramsQuery}` :
       query;
   }
+  function applySortQuery(query, sortParams = []) {
+    if(0 === sortParams.length) {
+      return query;
+    }
+
+    const queryOrder = ` ORDER BY ${
+      sortParams.map(({ key, desc }) => `${key} ${desc && 'DESC'}`).join(',')
+    }`;
+
+    return query + queryOrder;
+  }
   function applyLimitQuery(query, limitParams = {}) {
     let queryLimit = (limitParams.limit) ? ` LIMIT ${limitParams.limit}` : '';
 

src/angular-sql-query.js

@@ -202,6 +202,41 @@
         expect(data[1].id).equal(2);
       }));
 
+      it('should query Backup datas with sort', inject(($q, $timeout) => {
+        var data;
+
+        executeStub.yields('test', backupDatas);
+
+        // Common param
+        backUp.queryBackUp({
+          test: 'test1',
+          isOk: false,
+        }, { limit: 10 }, [{ key: 'name', desc: true }]).then((_data_) => {
+          data = _data_;
+        });
+
+        $timeout.flush();
+
+        // expect(executeStub.callCount).equal(1);
+        expect(executeStub.args[0][0]).equal('SELECT * FROM test ORDER BY name DESC LIMIT 10;');
+
+        expect(data).lengthOf(1);
+        expect(data[0].id).equal(1);
+
+        // Array param
+        data = null;
+        backUp.queryBackUp({
+          test: ['test1', 'test2'],
+        }).then((_data_) => {
+          data = _data_;
+        });
+        $timeout.flush();
+
+        expect(data).lengthOf(2);
+        expect(data[0].id).equal(1);
+        expect(data[1].id).equal(2);
+      }));
+
       it('should query Backup datas with indexed fields', inject(($q, $timeout) => {
         var data;