@azteam/express 1.2.229 → 1.2.232

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.229",
+    "version": "1.2.232",
     "main": "src/index.js",
     "engines": {
         "node": ">= 12.0.0",

package/src/Server.js

@@ -306,6 +306,11 @@ class Server {
             app.all('/', async function (req, res) {
                 return res.success('welcome');
             });
+            app.get('/track', async function (req, res) {
+                return res.success({
+                    ...req.trackDevice,
+                });
+            });
 
             app.use(function (req, res) {
                 throw new ErrorException(NOT_FOUND);

package/src/middleware/paginateMiddleware.js

@@ -41,42 +41,43 @@ export default function (options = {}) {
         req.paginate.page = req.query.page ? Number(req.query.page) : 1;
         req.paginate.offset = (req.paginate.page - 1) * req.paginate.limit;
 
-        delete req.query.page;
-
         if (req.query.sort_by && options.sortFields.includes(req.query.sort_by)) {
             req.paginate.sort = {
                 [req.query.sort_by]: req.query.sort_type === 'asc' ? 'asc' : 'desc',
             };
-
-            delete req.query.sort_by;
-            delete req.query.sort_type;
+        } else if (options.sortFields.length > 0) {
+            const sortBy = options.sortFields[0];
+            req.paginate.sort = {
+                [sortBy]: 'asc',
+            };
         }
 
-        for (const key in req.query) {
-            if (req.query.hasOwnProperty(key)) {
-                const value = req.query[key];
-
-                if (key.endsWith('_start')) {
-                    const newKey = key.replace('_start', '');
-
-                    req.query[newKey] = {
-                        ...req.query[newKey],
-                        $gte: value,
-                    };
-                } else if (key.endsWith('_end')) {
-                    const newKey = key.replace('_end', '');
+        delete req.query.sort_by;
+        delete req.query.sort_type;
+        delete req.query.page;
 
-                    req.query[newKey] = {
-                        ...req.query[newKey],
-                        $lte: value,
-                    };
-                }
+        _.map(req.query, (value, key) => {
+            if (key.endsWith('_start')) {
+                const newKey = key.replace('_start', '');
+
+                req.query[newKey] = {
+                    ...req.query[newKey],
+                    $gte: value,
+                };
+            } else if (key.endsWith('_end')) {
+                const newKey = key.replace('_end', '');
+
+                req.query[newKey] = {
+                    ...req.query[newKey],
+                    $lte: value,
+                };
+            }
 
-                if (!options.searchFields.includes(key)) {
-                    delete req.query[key];
-                }
+            if (!options.searchFields.includes(key)) {
+                delete req.query[key];
             }
-        }
+        });
+
         if (req.query.keywords) {
             const arrKeywords = _.words(req.query.keywords);
             const keywords = `"${arrKeywords.join('" "')}"`;