Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 5740dce

Browse files
thabofletcherthabofletcher
committed
Merge pull request #459 from appirio-tech/release
Release
2 parents b3e5c97 + 7bbd271 commit 5740dce

19 files changed

+102
-81
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
log
33
pids
44
deploy/prod.sh
5+
deploy/env.sh
56
node_modules
67
test/tmp/submissions/*.zip
78
test/tmp/design_submissions/*.zip

‎actions/challenges.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ function validateInputParameter(helper, caller, challengeType, query, filter, pa
345345
var error = helper.checkContains(['asc', 'desc'], sortOrder.toLowerCase(), "sortOrder") ||
346346
helper.checkPageIndex(pageIndex, "pageIndex") ||
347347
helper.checkPositiveInteger(pageSize, "pageSize") ||
348-
helper.checkMaxNumber(pageSize, MAX_INT, 'pageSize') ||
348+
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, 'pageSize') ||
349349
helper.checkMaxNumber(pageIndex, MAX_INT, 'pageIndex') ||
350350
helper.checkContains(helper.VALID_LIST_TYPE, type.toUpperCase(), "type") ||
351351
checkQueryParameterAndSortColumn(helper, type, query, sortColumn);
@@ -502,10 +502,13 @@ function checkQueryParameterAndSortColumnV2(helper, type, queryString, sortColum
502502
* @since 1.21
503503
*/
504504
function validateInputParameterV2(helper, caller, type, query, filter, pageIndex, pageSize, sortColumn, sortOrder, listType, dbConnectionMap, callback) {
505+
506+
var allowedPageSize = helper.ListType.ACTIVE ? helper.MAX_INT : helper.MAX_PAGE_SIZE;
507+
505508
var error = helper.checkContains(['asc', 'desc'], sortOrder.toLowerCase(), "sortOrder") ||
506509
helper.checkPageIndex(pageIndex, "pageIndex") ||
507510
helper.checkPositiveInteger(pageSize, "pageSize") ||
508-
helper.checkMaxNumber(pageSize, MAX_INT, 'pageSize') ||
511+
helper.checkMaxNumber(pageSize, allowedPageSize, 'pageSize') ||
509512
helper.checkMaxNumber(pageIndex, MAX_INT, 'pageIndex') ||
510513
checkQueryParameterAndSortColumnV2(helper, listType, query, sortColumn);
511514

@@ -938,7 +941,7 @@ var searchChallenges = function (api, connection, dbConnectionMap, community, ne
938941
sortColumn = query.sortcolumn || DEFAULT_SORT_COLUMN;
939942
listType = (query.listtype || helper.ListType.OPEN).toUpperCase();
940943
pageIndex = Number(query.pageindex || 1);
941-
pageSize = Number(query.pagesize || 50);
944+
pageSize = Number(query.pagesize || helper.MAX_PAGE_SIZE);
942945

943946
copyToFilter.forEach(function (p) {
944947
if (query.hasOwnProperty(p.toLowerCase())) {
@@ -952,7 +955,7 @@ var searchChallenges = function (api, connection, dbConnectionMap, community, ne
952955
}, function (cb) {
953956
if (pageIndex === -1) {
954957
pageIndex = 1;
955-
pageSize = MAX_INT;
958+
pageSize = helper.MAX_PAGE_SIZE;
956959
}
957960

958961
setFilter(filter, sqlParams);
@@ -3686,8 +3689,9 @@ var getChallenges = function (api, connection, listType, isMyChallenges, next) {
36863689
(!query.sortcolumn && (listType == api.helper.ListType.ACTIVE || listType == api.helper.ListType.UPCOMING) ? "asc" : "desc");
36873690
sortColumn = query.sortcolumn || DEFAULT_SORT_COLUMN;
36883691
pageIndex = Number(query.pageindex || 1);
3689-
pageSize = Number(query.pagesize || 150);
3690-
3692+
pageSize = Number(query.pagesize ||
3693+
(listType == api.helper.ListType.ACTIVE ? helper.MAX_INT : helper.MAX_PAGE_SIZE));
3694+
36913695
if (isMyChallenges) {
36923696
index = copyToFilter.indexOf('type');
36933697
copyToFilter.splice(index, 1);
@@ -3727,7 +3731,7 @@ var getChallenges = function (api, connection, listType, isMyChallenges, next) {
37273731
}, function (cb) {
37283732
if (pageIndex === -1) {
37293733
pageIndex = 1;
3730-
pageSize = MAX_INT;
3734+
pageSize = helper.MAX_PAGE_SIZE;
37313735
}
37323736

37333737
setFilterV2(filter, sqlParams);

‎actions/dataScienceChallenges.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function pastDataScienceChallenges(pageIndex, pageSize, sortingColumnName, sorti
7979
submissionEndTo, api, connection, callback) {
8080
if (pageIndex === NO_PAGING) {
8181
pageIndex = 1;
82-
pageSize = MAX_INT;
82+
pageSize = helper.MAX_PAGE_SIZE;
8383
}
8484

8585
var sqlParams = {};
@@ -270,15 +270,15 @@ exports.pastDataScienceChallenges = {
270270
async.waterfall([
271271
function (cb) { // Parse and validate request parameters
272272
pageIndex = Number(connection.params.pageIndex || 1);
273-
pageSize = Number(connection.params.pageSize || 50);
273+
pageSize = Number(connection.params.pageSize || helper.MAX_PAGE_SIZE);
274274
sortingOrder = connection.params.sortOrder || PAST_CHALLENGES_DEFAULT_SORT_ORDER;
275275
sortingColumnName = connection.params.sortColumn || PAST_CHALLENGES_DEFAULT_SORT_COLUMN;
276276

277277
err = helper.checkContains([SORTING_ORDER_ASCENDING, SORTING_ORDER_DESCENDING], sortingOrder.toLowerCase(), "sortOrder")
278278
|| helper.checkContains(PAST_CHALLENGES_DATA_COLUMN_NAMES, sortingColumnName.toLowerCase(), "sortColumn")
279279
|| helper.checkPageIndex(pageIndex, "pageIndex")
280280
|| helper.checkPositiveInteger(pageSize, "pageSize")
281-
|| helper.checkMaxInt(pageSize, 'pageSize');
281+
|| helper.checkMaxNumber(pageSize,helper.MAX_PAGE_SIZE,'pageSize');
282282

283283
if (err) {
284284
cb(err);

‎actions/marathonChallenges.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ exports.searchMarathonChallenges = {
137137
sortOrder = (params.sortOrder || "asc").toLowerCase();
138138
sortColumn = (params.sortColumn || "roundId").toLowerCase();
139139
pageIndex = Number(params.pageIndex || 1);
140-
pageSize = Number(params.pageSize || 50);
140+
pageSize = Number(params.pageSize || helper.MAX_PAGE_SIZE);
141141

142142
if (!_.isDefined(params.sortOrder) && sortColumn === "roundid") {
143143
sortOrder = "desc";
@@ -180,7 +180,7 @@ exports.searchMarathonChallenges = {
180180
}
181181
error = error ||
182182
helper.checkMaxNumber(pageIndex, MAX_INT, "pageIndex") ||
183-
helper.checkMaxNumber(pageSize, MAX_INT, "pageSize") ||
183+
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, "pageSize") ||
184184
helper.checkPageIndex(pageIndex, "pageIndex") ||
185185
helper.checkPositiveInteger(pageSize, "pageSize") ||
186186
helper.checkContains(ALLOWABLE_LIST_TYPE, listType, "listType") ||
@@ -203,7 +203,7 @@ exports.searchMarathonChallenges = {
203203

204204
if (pageIndex === -1) {
205205
pageIndex = 1;
206-
pageSize = MAX_INT;
206+
pageSize = helper.MAX_PAGE_SIZE;
207207
}
208208
sqlParams = {
209209
firstRowIndex: (pageIndex - 1) * pageSize,

‎actions/memDump.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ exports.dumpMemory = {
1111
required: [],
1212
optional: []
1313
},
14+
outputExample: {},
15+
cacheEnabled: false,
1416
version: 'v2',
1517
run: function (api, connection, next) {
1618
if (process.env.ADMIN_API_KEY && connection.params.apiKey === process.env.ADMIN_API_KEY) {

‎actions/memberSearch.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var searchUsers = function (api, connection, dbConnectionMap, next) {
2222
result = {},
2323
sqlParams = {},
2424
pageIndex = Number(connection.params.pageIndex || 1),
25-
pageSize = Number(connection.params.pageSize || 10),
25+
pageSize = Number(connection.params.pageSize || helper.MAX_PAGE_SIZE),
2626
caseSensitive = (connection.params.caseSensitive || "false").toLowerCase(),
2727
handle = connection.params.handle;
2828

@@ -36,7 +36,7 @@ var searchUsers = function (api, connection, dbConnectionMap, next) {
3636
var error = helper.checkPositiveInteger(pageIndex, "pageIndex") ||
3737
helper.checkMaxNumber(pageIndex, helper.MAX_INT, "pageIndex") ||
3838
helper.checkPositiveInteger(pageSize, "pageSize") ||
39-
helper.checkMaxNumber(pageSize, 500, "pageSize") ||
39+
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, "pageSize") ||
4040
helper.checkStringPopulated(handle, "handle");
4141
if (error) {
4242
callback(error);

‎actions/payments.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ var searchPayments = function (api, connection, next) {
7373
var error, i,
7474
helper = api.helper,
7575
pageIndex = Number(connection.params.pageIndex || 1),
76-
pageSize = Number(connection.params.pageSize || 10),
76+
pageSize = Number(connection.params.pageSize || helper.MAX_PAGE_SIZE),
7777
status = connection.params.status,
7878
type = connection.params.type,
7979
sortColumn = (connection.params.sortColumn || "createDate").toLowerCase(),
@@ -98,7 +98,7 @@ var searchPayments = function (api, connection, next) {
9898
error = helper.checkPositiveInteger(pageIndex, "pageIndex")
9999
|| helper.checkMaxInt(pageIndex, "pageIndex")
100100
|| helper.checkPositiveInteger(pageSize, "pageSize")
101-
|| helper.checkMaxInt(pageSize, "pageSize")
101+
|| helper.checkMaxNumber(pageSize,helper.MAX_PAGE_SIZE,"pageSize")
102102
|| helper.checkMember(connection)
103103
|| helper.checkContains(["asc", "desc"], sortOrder.toLowerCase(), "sortOrder")
104104
|| helper.checkSortColumn(ALLOWABLE_SORT_COLUMN, sortColumn)

‎actions/reviewOpportunities.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ var validateInputParameter = function (helper, connection, filter, isStudio, cb)
346346
error;
347347

348348
params = connection.params;
349-
pageSize = Number(params.pageSize || 10);
349+
pageSize = Number(params.pageSize || helper.MAX_PAGE_SIZE);
350350
pageIndex = Number(params.pageIndex || 1);
351351
sortOrder = params.sortOrder || 'asc';
352352
sortColumn = params.sortColumn || 'challengeName';
@@ -356,7 +356,7 @@ var validateInputParameter = function (helper, connection, filter, isStudio, cb)
356356
error =
357357
helper.checkPageIndex(pageIndex, 'pageIndex') ||
358358
helper.checkPositiveInteger(pageSize, 'pageSize') ||
359-
helper.checkMaxInt(pageSize, 'pageSize') ||
359+
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE,'pageSize') ||
360360
helper.checkContains(helper.getLowerCaseList(allowedSortColumn), sortColumn.toLowerCase(), 'sortColumn') ||
361361
helper.checkContains(helper.getLowerCaseList(ALLOWABLE_SORT_ORDER), sortOrder.toLowerCase(), 'sortOrder');
362362

@@ -481,7 +481,7 @@ var getReviewOpportunities = function (api, connection, isStudio, next) {
481481
var helper = api.helper, result = {}, sqlParams, dbConnectionMap = connection.dbConnectionMap, pageIndex,
482482
pageSize, sortOrder, sortColumn, filter = {}, reviewOpportunities, queryName;
483483

484-
pageSize = Number(connection.params.pageSize || 10);
484+
pageSize = Number(connection.params.pageSize || helper.MAX_PAGE_SIZE);
485485
pageIndex = Number(connection.params.pageIndex || 1);
486486
sortOrder = connection.params.sortOrder || 'asc';
487487
sortColumn = connection.params.sortColumn || 'challengeName';
@@ -494,7 +494,7 @@ var getReviewOpportunities = function (api, connection, isStudio, next) {
494494

495495
if (pageIndex === -1) {
496496
pageIndex = 1;
497-
pageSize = helper.MAX_INT;
497+
pageSize = helper.MAX_PAGE_SIZE;
498498
}
499499

500500
sqlParams = {

‎actions/rounds.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ var getRounds = function (api, connection, dbConnectionMap, next) {
216216
sortOrder = (params.sortOrder || "asc").toLowerCase();
217217
sortColumn = (params.sortColumn || "registrationPhaseStartTime").toLowerCase();
218218
pageIndex = Number(params.pageIndex || 1);
219-
pageSize = Number(params.pageSize || 50);
219+
pageSize = Number(params.pageSize || helper.MAX_PAGE_SIZE);
220220

221221
async.waterfall([
222222
function (cb) {
@@ -240,7 +240,7 @@ var getRounds = function (api, connection, dbConnectionMap, next) {
240240
}
241241
}
242242
error = error ||
243-
helper.checkMaxNumber(pageSize, helper.MAX_INT, "pageSize") ||
243+
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, "pageSize") ||
244244
helper.checkPageIndex(pageIndex, "pageIndex") ||
245245
helper.checkPositiveInteger(pageSize, "pageSize") ||
246246
helper.checkContains(["asc", "desc"], sortOrder, "sortOrder") ||
@@ -285,7 +285,7 @@ var getRounds = function (api, connection, dbConnectionMap, next) {
285285
}, function (typeIds, cb) {
286286
if (pageIndex === -1) {
287287
pageIndex = 1;
288-
pageSize = helper.MAX_INT;
288+
pageSize = helper.MAX_PAGE_SIZE;
289289
}
290290

291291
filterCondition = ' r.round_id > 0 ';

‎actions/srmChallenges.js

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,6 @@ var DATE_FORMAT = "YYYY-MM-DD HH:mm";
217217
*/
218218
var MAX_INT = 2147483647;
219219

220-
/**
221-
* The default page size
222-
*/
223-
var DEFAULT_PAGE_SIZE = 50;
224-
225220
/**
226221
* Default number of leaders to show in SRM details
227222
*/
@@ -265,7 +260,7 @@ exports.searchSRMChallenges = {
265260
sortColumn = "roundid";
266261
}
267262
pageIndex = Number(params.pageIndex || 1);
268-
pageSize = Number(params.pageSize || DEFAULT_PAGE_SIZE);
263+
pageSize = Number(params.pageSize || helper.MAX_PAGE_SIZE);
269264
listType = (params.listType || 'ACTIVE').toUpperCase();
270265
challengeName = _.has(params, 'challengeName') ? '%' + params.challengeName.toLowerCase() + '%' : '%';
271266

@@ -287,7 +282,7 @@ exports.searchSRMChallenges = {
287282
}
288283
error = error ||
289284
helper.checkMaxNumber(pageIndex, MAX_INT, "pageIndex") ||
290-
helper.checkMaxNumber(pageSize, MAX_INT, "pageSize") ||
285+
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, "pageSize") ||
291286
helper.checkPageIndex(pageIndex, "pageIndex") ||
292287
helper.checkPositiveInteger(pageSize, "pageSize") ||
293288
helper.checkContains(["asc", "desc"], sortOrder, "sortOrder") ||
@@ -301,7 +296,7 @@ exports.searchSRMChallenges = {
301296

302297
if (pageIndex === -1) {
303298
pageIndex = 1;
304-
pageSize = MAX_INT;
299+
pageSize = helper.MAX_PAGE_SIZE;
305300
}
306301
sqlParams = {
307302
firstRowIndex: (pageIndex - 1) * pageSize,
@@ -720,7 +715,7 @@ exports.getSRMSchedule = {
720715
sortColumn = (params.sortColumn || "registrationStartTime").toLowerCase();
721716

722717
pageIndex = Number(params.pageIndex || 1);
723-
pageSize = Number(params.pageSize || DEFAULT_PAGE_SIZE);
718+
pageSize = Number(params.pageSize || helper.MAX_PAGE_SIZE);
724719

725720
if (!_.isDefined(params.sortOrder) && sortColumn === "registrationstarttime") {
726721
sortOrder = "desc";
@@ -734,7 +729,7 @@ exports.getSRMSchedule = {
734729
}
735730
error = error ||
736731
helper.checkMaxNumber(pageIndex, MAX_INT, "pageIndex") ||
737-
helper.checkMaxNumber(pageSize, MAX_INT, "pageSize") ||
732+
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, "pageSize") ||
738733
helper.checkPageIndex(pageIndex, "pageIndex") ||
739734
helper.checkPositiveInteger(pageSize, "pageSize") ||
740735
helper.checkContains(["asc", "desc"], sortOrder, "sortOrder") ||
@@ -757,7 +752,7 @@ exports.getSRMSchedule = {
757752

758753
if (pageIndex === -1) {
759754
pageIndex = 1;
760-
pageSize = MAX_INT;
755+
pageSize = helper.MAX_PAGE_SIZE;
761756
}
762757
SCHEDULE_TIMEZONE = api.config.tcConfig.databaseTimezoneIdentifier;
763758
cb(error);
@@ -2402,7 +2397,7 @@ function getPracticeProblems(api, connection, next) {
24022397
myPointsUpperBound,
24032398
caller = connection.caller,
24042399
pageIndex = Number(connection.params.pageIndex || 1),
2405-
pageSize = Number(connection.params.pageSize || 10),
2400+
pageSize = Number(connection.params.pageSize || helper.MAX_PAGE_SIZE),
24062401
sortColumn = connection.params.sortColumn || 'problemId',
24072402
sortOrder = connection.params.sortOrder || helper.consts.ASCENDING,
24082403
exeQuery = function (query) {
@@ -2414,7 +2409,7 @@ function getPracticeProblems(api, connection, next) {
24142409
function (cb) {
24152410
var error = helper.checkPageIndex(pageIndex, 'pageIndex') ||
24162411
helper.checkPositiveInteger(pageSize, 'pageSize') ||
2417-
helper.checkMaxInt(pageSize, 'pageSize') ||
2412+
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, 'pageSize') ||
24182413
helper.checkContains(['asc', 'desc'], sortOrder.toLowerCase(), 'sortOrder') ||
24192414
helper.checkSortColumn(VALID_PRACTICE_PROBLEMS_SORT_COLUMN, sortColumn.toLowerCase()) ||
24202415
helper.checkMember(connection, 'Only logged in user can access to this endpoint.');

0 commit comments

Comments
 (0)