Skip to content

[Next Release] prevent query param exceeded the max_search_window sent to ES server #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 25, 2022
Merged

[Next Release] prevent query param exceeded the max_search_window sent to ES server #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a3dc48
redeploying original
LieutenantRoger Jun 23, 2022
e532554
redeploy resource fix
LieutenantRoger Jun 27, 2022
6f25a14
Merge pull request #103 from topcoder-platform/master
ThomasKranitsas Jul 21, 2022
3818d00
Merge branch 'develop' into fix-listmemberchallenges
LieutenantRoger Jul 21, 2022
98f0666
reset ci
LieutenantRoger Jul 21, 2022
8622060
Merge pull request #104 from topcoder-platform/fix-listmemberchallenges
ThomasKranitsas Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ 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`,

Expand Down
18 changes: 17 additions & 1 deletion src/services/ResourceService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,23 @@ async function listChallengesByMember (memberId, criteria) {
}
})

const docs = await searchES(mustQuery, perPage, page)
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}`
)
}

// Extract data from hits
let result = _.map(docs.hits.hits, item => item._source)
Expand Down