From c01bda9fff144a21ae86ea4ad79fbdedd29ffa1f Mon Sep 17 00:00:00 2001 From: Walter Cossu Date: Fri, 17 Apr 2020 17:33:21 +0200 Subject: [PATCH 1/5] added user count Signed-off-by: Walter Cossu --- .../config/routes.json | 9 ++++++++ .../controllers/User.js | 12 ++++++++++ .../services/User.js | 22 ++++++++++++++----- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/packages/strapi-plugin-users-permissions/config/routes.json b/packages/strapi-plugin-users-permissions/config/routes.json index 2491f37359..5b917339c9 100644 --- a/packages/strapi-plugin-users-permissions/config/routes.json +++ b/packages/strapi-plugin-users-permissions/config/routes.json @@ -299,6 +299,15 @@ } } }, + { + "method": "GET", + "path": "/users/count", + "handler": "User.count", + "config": { + "prefix": "", + "policies": [] + } + }, { "method": "GET", "path": "/users", diff --git a/packages/strapi-plugin-users-permissions/controllers/User.js b/packages/strapi-plugin-users-permissions/controllers/User.js index 702b311369..9a67ea0d06 100644 --- a/packages/strapi-plugin-users-permissions/controllers/User.js +++ b/packages/strapi-plugin-users-permissions/controllers/User.js @@ -52,6 +52,18 @@ module.exports = { ctx.send(data); }, + /** + * Retrieve user count. + * @return {Number} + */ + + async count(ctx) { + if (ctx.query._q) { + return await strapi.plugins['users-permissions'].services.user.countSearch(ctx.query); + } + return await strapi.plugins['users-permissions'].services.user.count(ctx.query); + }, + /** * Retrieve a user record. * @return {Object} diff --git a/packages/strapi-plugin-users-permissions/services/User.js b/packages/strapi-plugin-users-permissions/services/User.js index a970ec3aec..3544cae062 100644 --- a/packages/strapi-plugin-users-permissions/services/User.js +++ b/packages/strapi-plugin-users-permissions/services/User.js @@ -10,15 +10,25 @@ const bcrypt = require('bcryptjs'); const _ = require('lodash'); module.exports = { + /** + * Promise to count users + * + * @return {Promise} + */ + + count(params) { + return strapi.query('user', 'users-permissions').count(params); + }, + /** * Promise to add a/an user. * @return {Promise} */ async add(values) { if (values.password) { - values.password = await strapi.plugins[ - 'users-permissions' - ].services.user.hashPassword(values); + values.password = await strapi.plugins['users-permissions'].services.user.hashPassword( + values + ); } return strapi.query('user', 'users-permissions').create(values); @@ -33,9 +43,9 @@ module.exports = { // To get the updated object, you have to execute the `findOne()` method // or use the `findOneOrUpdate()` method with `{ new:true }` option. if (values.password) { - values.password = await strapi.plugins[ - 'users-permissions' - ].services.user.hashPassword(values); + values.password = await strapi.plugins['users-permissions'].services.user.hashPassword( + values + ); } return strapi.query('user', 'users-permissions').update(params, values); From 90e0d75230d9d733970da88aad7f8436e5d8aa11 Mon Sep 17 00:00:00 2001 From: Walter Cossu Date: Fri, 24 Apr 2020 10:30:37 +0200 Subject: [PATCH 2/5] added countSearch method to user service --- .../strapi-plugin-users-permissions/services/User.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/strapi-plugin-users-permissions/services/User.js b/packages/strapi-plugin-users-permissions/services/User.js index 3544cae062..388942c01a 100644 --- a/packages/strapi-plugin-users-permissions/services/User.js +++ b/packages/strapi-plugin-users-permissions/services/User.js @@ -20,6 +20,16 @@ module.exports = { return strapi.query('user', 'users-permissions').count(params); }, + /** + * Promise to search count users + * + * @return {Promise} + */ + + countSearch(params) { + return strapi.query('user', 'users-permissions').countSearch(params); + }, + /** * Promise to add a/an user. * @return {Promise} From ff455cb616222cb403d30d4232d649b9343aeda8 Mon Sep 17 00:00:00 2001 From: Walter Cossu Date: Fri, 24 Apr 2020 10:30:37 +0200 Subject: [PATCH 3/5] added countSearch method to user service Signed-off-by: Walter Cossu From d139ca9591ff83d4eea8439d37652a153a3d6110 Mon Sep 17 00:00:00 2001 From: Walter Cossu Date: Wed, 13 May 2020 20:16:20 +0200 Subject: [PATCH 4/5] added user count Signed-off-by: Walter Cossu From f5e9edb1249aa7907e2a4e6e8c33fa017b474bd7 Mon Sep 17 00:00:00 2001 From: Walter Cossu Date: Wed, 13 May 2020 20:33:17 +0200 Subject: [PATCH 5/5] added user count Signed-off-by: Walter Cossu