More fixes with pagination and the header response

Author: rootelement

config/default.js

@@ -6,6 +6,7 @@ module.exports = {
   LOG_LEVEL: process.env.LOG_LEVEL || 'debug',
   PORT: process.env.PORT || 3000,
   API_VERSION: process.env.API_VERSION || 'v5',
+  DEFAULT_PAGE_SIZE: process.env.DEFAULT_PAGE_SIZE || 1000,
   // used to properly set the header response to api calls for services behind a load balancer
   API_BASE_URL: process.env.API_BASE_URL || `http://localhost:3000`,
 

src/controllers/ResourceController.js

@@ -13,7 +13,7 @@ const helper = require('../common/helper')
 async function getResources (req, res) {
   const result = await service.getResources(req.authUser, req.query.challengeId, req.query.roleId, req.query.page, req.query.perPage)
   helper.setResHeaders(req, res, result)
-  res.send(result)
+  res.send(result.data)
 }
 
 /**
@@ -44,7 +44,7 @@ async function deleteResource (req, res) {
 async function listChallengesByMember (req, res) {
   const result = await service.listChallengesByMember(req.params.memberId, req.query)
   helper.setResHeaders(req, res, result)
-  res.send(result)
+  res.send(result.data)
 }
 
 module.exports = {

src/services/ResourceService.js

@@ -50,7 +50,7 @@ async function getResources (currentUser, challengeId, roleId, page, perPage) {
   const boolQuery = []
   const mustQuery = []
   page = page || 1
-  perPage = perPage || 20
+  perPage = perPage || config.DEFAULT_PAGE_SIZE
 
   boolQuery.push({ match: { challengeId } })
 
@@ -81,9 +81,9 @@ async function getResources (currentUser, challengeId, roleId, page, perPage) {
       }
     }
   }
-
   const esClient = await helper.getESClient()
   let docs
+  logger.info(`ES Query ${JSON.stringify(esQuery)}`)
   try {
     docs = await esClient.search(esQuery)
   } catch (e) {
@@ -125,7 +125,12 @@ async function getResources (currentUser, challengeId, roleId, page, perPage) {
     }
   }
 
-  return completeResources
+  return {
+    data: completeResources,
+    total: docs.hits.total,
+    page,
+    perPage
+  }
 }
 
 getResources.schema = {
@@ -346,7 +351,7 @@ async function listChallengesByMember (memberId, criteria) {
 
   const boolQuery = []
   const mustQuery = []
-  const perPage = criteria.perPage || 50
+  const perPage = criteria.perPage || config.DEFAULT_PAGE_SIZE
   const page = criteria.page || 1
   boolQuery.push({ match: { memberId } })
   if (criteria.resourceRoleId) boolQuery.push({ match: { roleId: criteria.resourceRoleId } })
@@ -393,7 +398,13 @@ async function listChallengesByMember (memberId, criteria) {
   }
   // Extract data from hits
   let result = _.map(docs.hits.hits, item => item._source)
-  return _.uniq(_.map(result, 'challengeId'))
+  const arr = _.uniq(_.map(result, 'challengeId'))
+  return {
+    data: arr,
+    total: docs.hits.total,
+    page,
+    perPage
+  }
 }
 
 listChallengesByMember.schema = {