From ff3f72e3ebefceb2dd7b69affd5163aaeef30daf Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Tue, 21 Jun 2022 15:59:56 +0300 Subject: [PATCH] Revert "[Next Release] v1.2.2 - avoid sending ES params that exceed max search window" --- config/default.js | 1 - src/services/ResourceService.js | 18 +----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/config/default.js b/config/default.js index fade308..503eedf 100644 --- a/config/default.js +++ b/config/default.js @@ -7,7 +7,6 @@ module.exports = { PORT: process.env.PORT || 3000, API_VERSION: process.env.API_VERSION || 'v5', DEFAULT_PAGE_SIZE: process.env.DEFAULT_PAGE_SIZE || 1000, - MAX_ELASTIC_SEARCH_RECORDS_SIZE: process.env.MAX_ELASTIC_SEARCH_RECORDS_SIZE || 10000, // 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`, diff --git a/src/services/ResourceService.js b/src/services/ResourceService.js index 199fde7..4016d99 100644 --- a/src/services/ResourceService.js +++ b/src/services/ResourceService.js @@ -446,23 +446,7 @@ async function listChallengesByMember (memberId, criteria) { } }) - let docs = { - hits: { - total: 0, - hits: [] - } - } - - if (perPage * page <= config.MAX_ELASTIC_SEARCH_RECORDS_SIZE) { - docs = await searchES(mustQuery, perPage, page) - } else { - throw new errors.BadRequestError(` - ES pagination params: - page ${page}, - perPage: ${perPage} - exceeds the max search window:${config.MAX_ELASTIC_SEARCH_RECORDS_SIZE}` - ) - } + const docs = await searchES(mustQuery, perPage, page) // Extract data from hits let result = _.map(docs.hits.hits, item => item._source)