@sera4/essentia 1.1.50 → 1.1.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sera4/essentia",
-  "version": "1.1.50",
+  "version": "1.1.52",
   "description": "A library of utilities for Teleporte Web Services",
   "main": "index.js",
   "type": "module",

package/paginator/sql-pagination.js

@@ -113,6 +113,13 @@ class SequelizePaginator {
     const getPaginationData = (result) => {
       var currentPage = this.zeroBasedOffset ? pagination.offset : pagination.offset + 1;
       var outOfBounds = result.rows.length === 0;
+      
+      // For queries with aggregation (Group By, Count), sequelize findAndCountAll returns an array of objects instead of just an integer
+      // To avoid implementing a custom findAndCountAll, we just use the array's Length
+      if (Array.isArray(result.count)) {
+        result.count = result.count.length;
+      }
+      
       var totalPages = Math.ceil(result.count / pagination.limit);
       var data = {};
       data[this.paginateOut["current_page"]] = currentPage;

package/utils/index.js

@@ -64,8 +64,11 @@ export const utils = {
 
     return routeType;
   },
-  isWebRoute: (sessionType) => (sessionType === TWS_ROUTE_TYPES['web']),
-  isApiRoute: (sessionType) => (sessionType === TWS_ROUTE_TYPES['api']),
-  isMobileRoute: (sessionType) => (sessionType === TWS_ROUTE_TYPES['mobile']),
-  isOtherRoute: (sessionType) => (sessionType === TWS_ROUTE_TYPES['other'])
+  isWebRoute: (sessionType) => (parseInt(sessionType) === TWS_ROUTE_TYPES['web']),
+  isApiRoute: (sessionType) => (parseInt(sessionType) === TWS_ROUTE_TYPES['api']),
+  isMobileRoute: (sessionType) => (parseInt(sessionType) === TWS_ROUTE_TYPES['mobile']),
+  isOtherRoute: (sessionType) => {
+    const value = parseInt(sessionType);
+    return ((value === TWS_ROUTE_TYPES['other']) || isNaN(value)) ? true : false;
+  }
 }