From e080548da96d08a7d04b06f13e956389d6dd049a Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Mon, 26 Aug 2019 17:42:52 +0200
Subject: [PATCH] .

---
 helpers/controller.helper.js        | 5 ++---
 modules/comments/comment.service.js | 2 +-
 modules/entities/entity.service.js  | 2 +-
 modules/events/event.service.js     | 2 +-
 package.json                        | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/helpers/controller.helper.js b/helpers/controller.helper.js
index b24642a..a78fe99 100644
--- a/helpers/controller.helper.js
+++ b/helpers/controller.helper.js
@@ -84,13 +84,13 @@ function setPaginationInfo(totalCount, res) {
             limit = (params.paginate && params.paginate.limit) ? params.paginate.limit : null,
             count = (limit) ? Math.ceil(totalCount / limit) : null;
         
-        if (params.paginate.hasNextPages(count)) {
+        /*if (params.paginate.hasNextPages(count)) {
             const nextPage = params.paginate.href();
             res.set('Link-Next-Page', nextPage + '; rel=next');
             res.set('Pagination-Next-Page', true);
         } else {
             res.set('Pagination-Next-Page', false);
-        }
+        }*/
             
         res.set({
             'Pagination-Count': count,
@@ -131,7 +131,6 @@ function handleErrorResponse(controllerName, methodName, error, res) {
 }
 
 function handleResultResponse(result, totalCount = null, params, res, statusCode = httpStatus.OK) {
-    console.log('handleResultResponse(result>>>>>>>>>>>>>>', result, getTotalCount(result));
     setPaginationInfo((totalCount) ? totalCount : getTotalCount(result), res);
     res.status(statusCode).send(typeof result == 'number' ? result.toString() : result);
 }
diff --git a/modules/comments/comment.service.js b/modules/comments/comment.service.js
index 4b2cd63..558832c 100644
--- a/modules/comments/comment.service.js
+++ b/modules/comments/comment.service.js
@@ -18,7 +18,7 @@ const extraMethods = {
         rows = rows.map(comment => commentComposer(comment, context));
         
         return {
-            count: rows.length,
+            count: result.count,
             rows: rows
         }
     },
diff --git a/modules/entities/entity.service.js b/modules/entities/entity.service.js
index 3803fbd..34ca586 100644
--- a/modules/entities/entity.service.js
+++ b/modules/entities/entity.service.js
@@ -19,7 +19,7 @@ const extraMethods = {
         rows = rows.map(entity => entityComposer(entity, context));
 
         return {
-            count: rows.length,
+            count: result.count,
             rows: rows
         }
     },
diff --git a/modules/events/event.service.js b/modules/events/event.service.js
index aa74a99..59d2e1d 100644
--- a/modules/events/event.service.js
+++ b/modules/events/event.service.js
@@ -24,7 +24,7 @@ const extraMethods = {
             rows = rows.map(event => eventComposer(event, context));
         
         return {
-            count: rows.length,
+            count: result.count,
             rows: rows
         }
 
diff --git a/package.json b/package.json
index 3728647..204cffa 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "response-time": "^2.3.2",
     "safename": "^1.0.2",
     "sanitize-filename": "^1.6.2",
-    "sequelize": "^5.6.1",
+    "sequelize": "^5.16.0",
     "sharp": "^0.23.0",
     "unique-file-name": "^1.0.0",
     "vimeo": "^2.1.1",