Refactor getEntries & add ordering by date / id as parameter

Author: matboehm

core/db.js

@@ -51,18 +51,26 @@ exports.isValidApiKey = function(secret, callback){
     });
 };
 
-exports.getEntries = function(limit, offset, active, callback){
+exports.getEntries = function(filter, callback){
     pool.getConnection(function(err, connection) {
-        if(err) { console.log(err); callback(true); return; }
-        let sql = '';
-        if(active === '0'){
-            sql  = "SELECT * FROM entries ORDER BY ID DESC LIMIT ? OFFSET ?;";
-        }else{
-            sql = "SELECT * FROM entries WHERE email_confirmed = 1 AND status = 1 ORDER BY ID DESC LIMIT ? OFFSET ?;";
+        if(err) {
+            console.log(err);
+            callback(true);
+            return;
         }
 
+        let sql = "SELECT * FROM entries";
+
+        if (filter['active'] !== '0') {
+            sql += ' WHERE email_confirmed = 1 AND status = 1';
+        }
+        filter['orderByDate'] = 'asc';
+        let orderByDate = filter['orderByDate'] === 'asc' ? 'ASC' : 'DESC';
+
+        sql += ' ORDER BY ID ' + orderByDate + ' LIMIT ? OFFSET ?;';
+
         // make the query
-        connection.query(sql, [parseInt(limit), parseInt(offset)], function(err, results) {
+        connection.query(sql, [parseInt(filter['limit']), parseInt(filter['offset'])], function(err, results) {
             connection.release();
             if(err) { callback(results, true); return; }
             callback(results, false);

core/entryController.js

@@ -8,10 +8,16 @@ let formidable     = require('formidable'),
     mailer         = require('./mailer');
 
 exports.getAll = function(req, res) {
-    let limit  = req.query.limit  || 10,
-        offset = req.query.offset || 0,
-        active = req.query.isActive || 1;
-    db.getEntries(limit, offset, active, function(results, err){
+    const ODER_BY_DATE_ASC = 'asc',
+          ORDER_BY_DATE_DESC = 'desc';
+
+    let filter = {};
+    filter['limit'] = req.query.limit  || 10;
+    filter['offset'] = req.query.offset || 0;
+    filter['active'] = req.query.isActive || 1;
+    filter['orderByDate'] = (req.query.sortByDate === ODER_BY_DATE_ASC) ?  ORDER_BY_DATE_ASC : ORDER_BY_DATE_DESC;
+
+    db.getEntries(filter, function(results, err){
         if(!err){
             // format output where required
             let out = [];
@@ -40,15 +46,14 @@ exports.getAll = function(req, res) {
                     obj.image = '';
                 }
 
-
                 out.push(obj);
             });
 
             res.status(200).json({
                 success : true,
                 results : out,
                 totalCount : results.length,
-                page : offset
+                page : filter['offset']
             });
         }else{
             res.status(400).json({success : false, message : "error"});