Skip to content

Sync master back to developer branch #103

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 8 commits into from
Jul 21, 2022
Merged

Sync master back to developer branch #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8fb7032
Merge pull request #61 from topcoder-platform/develop
ThomasKranitsas Feb 16, 2021
81c9f2d
Merge pull request #87 from topcoder-platform/develop
ThomasKranitsas Feb 3, 2022
cf2b583
Merge pull request #92 from topcoder-platform/develop
LieutenantRoger Mar 23, 2022
5b8d664
Merge pull request #93 from topcoder-platform/develop
ThomasKranitsas Apr 5, 2022
469c037
Merge pull request #96 from topcoder-platform/develop
ThomasKranitsas Apr 12, 2022
b34c5c2
Merge pull request #98 from topcoder-platform/develop
ThomasKranitsas Jun 21, 2022
ff3f72e
Revert "[Next Release] v1.2.2 - avoid sending ES params that exceed m…
ThomasKranitsas Jun 21, 2022
7e483a3
Merge pull request #99 from topcoder-platform/revert-98-develop
ThomasKranitsas Jun 21, 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: 0 additions & 1 deletion config/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`,

Expand Down
18 changes: 1 addition & 17 deletions src/services/ResourceService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down