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

Release #459

Merged
merged 16 commits into from
Sep 15, 2015
Merged

Release #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
13b6282
cleanup startup warning
thabofletcher Jul 13, 2015
d908fc6
ignore env.sh file
thabofletcher Jul 13, 2015
c0a8bf3
Merge pull request #452 from appirio-tech/SUP-968-heapdump
thabofletcher Jul 13, 2015
05d6a93
SUP-1470 Limit maximum and default page sizes to be 100
santthosh Sep 14, 2015
1586459
wrap connect and disconnect in timeouts
thabofletcher Sep 14, 2015
22b630d
logging level to debug
thabofletcher Sep 14, 2015
6666a43
update jsonwebtoken
thabofletcher Sep 15, 2015
398942c
additional logging
thabofletcher Sep 15, 2015
fa70236
allow disconnect on timeout to be disabled
thabofletcher Sep 15, 2015
2a660f0
Merge pull request #453 from appirio-tech/feature/SUP-1470
thabofletcher Sep 15, 2015
64e135a
use new informix wrapper with more logging
thabofletcher Sep 15, 2015
18253f3
Merge pull request #455 from appirio-tech/firefighting
thabofletcher Sep 15, 2015
00326d8
Merge pull request #456 from appirio-tech/dev
thabofletcher Sep 15, 2015
532f3bf
allow max page size to be overridden for active challenges
thabofletcher Sep 15, 2015
71e0d96
Merge pull request #457 from appirio-tech/firefighting
thabofletcher Sep 15, 2015
7bbd271
Merge pull request #458 from appirio-tech/dev
thabofletcher Sep 15, 2015
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
log
pids
deploy/prod.sh
deploy/env.sh
node_modules
test/tmp/submissions/*.zip
test/tmp/design_submissions/*.zip
Expand Down
18 changes: 11 additions & 7 deletions actions/challenges.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ function validateInputParameter(helper, caller, challengeType, query, filter, pa
var error = helper.checkContains(['asc', 'desc'], sortOrder.toLowerCase(), "sortOrder") ||
helper.checkPageIndex(pageIndex, "pageIndex") ||
helper.checkPositiveInteger(pageSize, "pageSize") ||
helper.checkMaxNumber(pageSize, MAX_INT, 'pageSize') ||
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, 'pageSize') ||
helper.checkMaxNumber(pageIndex, MAX_INT, 'pageIndex') ||
helper.checkContains(helper.VALID_LIST_TYPE, type.toUpperCase(), "type") ||
checkQueryParameterAndSortColumn(helper, type, query, sortColumn);
Expand Down Expand Up @@ -502,10 +502,13 @@ function checkQueryParameterAndSortColumnV2(helper, type, queryString, sortColum
* @since 1.21
*/
function validateInputParameterV2(helper, caller, type, query, filter, pageIndex, pageSize, sortColumn, sortOrder, listType, dbConnectionMap, callback) {

var allowedPageSize = helper.ListType.ACTIVE ? helper.MAX_INT : helper.MAX_PAGE_SIZE;

var error = helper.checkContains(['asc', 'desc'], sortOrder.toLowerCase(), "sortOrder") ||
helper.checkPageIndex(pageIndex, "pageIndex") ||
helper.checkPositiveInteger(pageSize, "pageSize") ||
helper.checkMaxNumber(pageSize, MAX_INT, 'pageSize') ||
helper.checkMaxNumber(pageSize, allowedPageSize, 'pageSize') ||
helper.checkMaxNumber(pageIndex, MAX_INT, 'pageIndex') ||
checkQueryParameterAndSortColumnV2(helper, listType, query, sortColumn);

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

copyToFilter.forEach(function (p) {
if (query.hasOwnProperty(p.toLowerCase())) {
Expand All @@ -952,7 +955,7 @@ var searchChallenges = function (api, connection, dbConnectionMap, community, ne
}, function (cb) {
if (pageIndex === -1) {
pageIndex = 1;
pageSize = MAX_INT;
pageSize = helper.MAX_PAGE_SIZE;
}

setFilter(filter, sqlParams);
Expand Down Expand Up @@ -3686,8 +3689,9 @@ var getChallenges = function (api, connection, listType, isMyChallenges, next) {
(!query.sortcolumn && (listType == api.helper.ListType.ACTIVE || listType == api.helper.ListType.UPCOMING) ? "asc" : "desc");
sortColumn = query.sortcolumn || DEFAULT_SORT_COLUMN;
pageIndex = Number(query.pageindex || 1);
pageSize = Number(query.pagesize || 150);

pageSize = Number(query.pagesize ||
(listType == api.helper.ListType.ACTIVE ? helper.MAX_INT : helper.MAX_PAGE_SIZE));

if (isMyChallenges) {
index = copyToFilter.indexOf('type');
copyToFilter.splice(index, 1);
Expand Down Expand Up @@ -3727,7 +3731,7 @@ var getChallenges = function (api, connection, listType, isMyChallenges, next) {
}, function (cb) {
if (pageIndex === -1) {
pageIndex = 1;
pageSize = MAX_INT;
pageSize = helper.MAX_PAGE_SIZE;
}

setFilterV2(filter, sqlParams);
Expand Down
6 changes: 3 additions & 3 deletions actions/dataScienceChallenges.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function pastDataScienceChallenges(pageIndex, pageSize, sortingColumnName, sorti
submissionEndTo, api, connection, callback) {
if (pageIndex === NO_PAGING) {
pageIndex = 1;
pageSize = MAX_INT;
pageSize = helper.MAX_PAGE_SIZE;
}

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

err = helper.checkContains([SORTING_ORDER_ASCENDING, SORTING_ORDER_DESCENDING], sortingOrder.toLowerCase(), "sortOrder")
|| helper.checkContains(PAST_CHALLENGES_DATA_COLUMN_NAMES, sortingColumnName.toLowerCase(), "sortColumn")
|| helper.checkPageIndex(pageIndex, "pageIndex")
|| helper.checkPositiveInteger(pageSize, "pageSize")
|| helper.checkMaxInt(pageSize, 'pageSize');
|| helper.checkMaxNumber(pageSize,helper.MAX_PAGE_SIZE,'pageSize');

if (err) {
cb(err);
Expand Down
6 changes: 3 additions & 3 deletions actions/marathonChallenges.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ exports.searchMarathonChallenges = {
sortOrder = (params.sortOrder || "asc").toLowerCase();
sortColumn = (params.sortColumn || "roundId").toLowerCase();
pageIndex = Number(params.pageIndex || 1);
pageSize = Number(params.pageSize || 50);
pageSize = Number(params.pageSize || helper.MAX_PAGE_SIZE);

if (!_.isDefined(params.sortOrder) && sortColumn === "roundid") {
sortOrder = "desc";
Expand Down Expand Up @@ -180,7 +180,7 @@ exports.searchMarathonChallenges = {
}
error = error ||
helper.checkMaxNumber(pageIndex, MAX_INT, "pageIndex") ||
helper.checkMaxNumber(pageSize, MAX_INT, "pageSize") ||
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, "pageSize") ||
helper.checkPageIndex(pageIndex, "pageIndex") ||
helper.checkPositiveInteger(pageSize, "pageSize") ||
helper.checkContains(ALLOWABLE_LIST_TYPE, listType, "listType") ||
Expand All @@ -203,7 +203,7 @@ exports.searchMarathonChallenges = {

if (pageIndex === -1) {
pageIndex = 1;
pageSize = MAX_INT;
pageSize = helper.MAX_PAGE_SIZE;
}
sqlParams = {
firstRowIndex: (pageIndex - 1) * pageSize,
Expand Down
2 changes: 2 additions & 0 deletions actions/memDump.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ exports.dumpMemory = {
required: [],
optional: []
},
outputExample: {},
cacheEnabled: false,
version: 'v2',
run: function (api, connection, next) {
if (process.env.ADMIN_API_KEY && connection.params.apiKey === process.env.ADMIN_API_KEY) {
Expand Down
4 changes: 2 additions & 2 deletions actions/memberSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var searchUsers = function (api, connection, dbConnectionMap, next) {
result = {},
sqlParams = {},
pageIndex = Number(connection.params.pageIndex || 1),
pageSize = Number(connection.params.pageSize || 10),
pageSize = Number(connection.params.pageSize || helper.MAX_PAGE_SIZE),
caseSensitive = (connection.params.caseSensitive || "false").toLowerCase(),
handle = connection.params.handle;

Expand All @@ -36,7 +36,7 @@ var searchUsers = function (api, connection, dbConnectionMap, next) {
var error = helper.checkPositiveInteger(pageIndex, "pageIndex") ||
helper.checkMaxNumber(pageIndex, helper.MAX_INT, "pageIndex") ||
helper.checkPositiveInteger(pageSize, "pageSize") ||
helper.checkMaxNumber(pageSize, 500, "pageSize") ||
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, "pageSize") ||
helper.checkStringPopulated(handle, "handle");
if (error) {
callback(error);
Expand Down
4 changes: 2 additions & 2 deletions actions/payments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ var searchPayments = function (api, connection, next) {
var error, i,
helper = api.helper,
pageIndex = Number(connection.params.pageIndex || 1),
pageSize = Number(connection.params.pageSize || 10),
pageSize = Number(connection.params.pageSize || helper.MAX_PAGE_SIZE),
status = connection.params.status,
type = connection.params.type,
sortColumn = (connection.params.sortColumn || "createDate").toLowerCase(),
Expand All @@ -98,7 +98,7 @@ var searchPayments = function (api, connection, next) {
error = helper.checkPositiveInteger(pageIndex, "pageIndex")
|| helper.checkMaxInt(pageIndex, "pageIndex")
|| helper.checkPositiveInteger(pageSize, "pageSize")
|| helper.checkMaxInt(pageSize, "pageSize")
|| helper.checkMaxNumber(pageSize,helper.MAX_PAGE_SIZE,"pageSize")
|| helper.checkMember(connection)
|| helper.checkContains(["asc", "desc"], sortOrder.toLowerCase(), "sortOrder")
|| helper.checkSortColumn(ALLOWABLE_SORT_COLUMN, sortColumn)
Expand Down
8 changes: 4 additions & 4 deletions actions/reviewOpportunities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ var validateInputParameter = function (helper, connection, filter, isStudio, cb)
error;

params = connection.params;
pageSize = Number(params.pageSize || 10);
pageSize = Number(params.pageSize || helper.MAX_PAGE_SIZE);
pageIndex = Number(params.pageIndex || 1);
sortOrder = params.sortOrder || 'asc';
sortColumn = params.sortColumn || 'challengeName';
Expand All @@ -356,7 +356,7 @@ var validateInputParameter = function (helper, connection, filter, isStudio, cb)
error =
helper.checkPageIndex(pageIndex, 'pageIndex') ||
helper.checkPositiveInteger(pageSize, 'pageSize') ||
helper.checkMaxInt(pageSize, 'pageSize') ||
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE,'pageSize') ||
helper.checkContains(helper.getLowerCaseList(allowedSortColumn), sortColumn.toLowerCase(), 'sortColumn') ||
helper.checkContains(helper.getLowerCaseList(ALLOWABLE_SORT_ORDER), sortOrder.toLowerCase(), 'sortOrder');

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

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

if (pageIndex === -1) {
pageIndex = 1;
pageSize = helper.MAX_INT;
pageSize = helper.MAX_PAGE_SIZE;
}

sqlParams = {
Expand Down
6 changes: 3 additions & 3 deletions actions/rounds.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ var getRounds = function (api, connection, dbConnectionMap, next) {
sortOrder = (params.sortOrder || "asc").toLowerCase();
sortColumn = (params.sortColumn || "registrationPhaseStartTime").toLowerCase();
pageIndex = Number(params.pageIndex || 1);
pageSize = Number(params.pageSize || 50);
pageSize = Number(params.pageSize || helper.MAX_PAGE_SIZE);

async.waterfall([
function (cb) {
Expand All @@ -240,7 +240,7 @@ var getRounds = function (api, connection, dbConnectionMap, next) {
}
}
error = error ||
helper.checkMaxNumber(pageSize, helper.MAX_INT, "pageSize") ||
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, "pageSize") ||
helper.checkPageIndex(pageIndex, "pageIndex") ||
helper.checkPositiveInteger(pageSize, "pageSize") ||
helper.checkContains(["asc", "desc"], sortOrder, "sortOrder") ||
Expand Down Expand Up @@ -285,7 +285,7 @@ var getRounds = function (api, connection, dbConnectionMap, next) {
}, function (typeIds, cb) {
if (pageIndex === -1) {
pageIndex = 1;
pageSize = helper.MAX_INT;
pageSize = helper.MAX_PAGE_SIZE;
}

filterCondition = ' r.round_id > 0 ';
Expand Down
21 changes: 8 additions & 13 deletions actions/srmChallenges.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,6 @@ var DATE_FORMAT = "YYYY-MM-DD HH:mm";
*/
var MAX_INT = 2147483647;

/**
* The default page size
*/
var DEFAULT_PAGE_SIZE = 50;

/**
* Default number of leaders to show in SRM details
*/
Expand Down Expand Up @@ -265,7 +260,7 @@ exports.searchSRMChallenges = {
sortColumn = "roundid";
}
pageIndex = Number(params.pageIndex || 1);
pageSize = Number(params.pageSize || DEFAULT_PAGE_SIZE);
pageSize = Number(params.pageSize || helper.MAX_PAGE_SIZE);
listType = (params.listType || 'ACTIVE').toUpperCase();
challengeName = _.has(params, 'challengeName') ? '%' + params.challengeName.toLowerCase() + '%' : '%';

Expand All @@ -287,7 +282,7 @@ exports.searchSRMChallenges = {
}
error = error ||
helper.checkMaxNumber(pageIndex, MAX_INT, "pageIndex") ||
helper.checkMaxNumber(pageSize, MAX_INT, "pageSize") ||
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, "pageSize") ||
helper.checkPageIndex(pageIndex, "pageIndex") ||
helper.checkPositiveInteger(pageSize, "pageSize") ||
helper.checkContains(["asc", "desc"], sortOrder, "sortOrder") ||
Expand All @@ -301,7 +296,7 @@ exports.searchSRMChallenges = {

if (pageIndex === -1) {
pageIndex = 1;
pageSize = MAX_INT;
pageSize = helper.MAX_PAGE_SIZE;
}
sqlParams = {
firstRowIndex: (pageIndex - 1) * pageSize,
Expand Down Expand Up @@ -720,7 +715,7 @@ exports.getSRMSchedule = {
sortColumn = (params.sortColumn || "registrationStartTime").toLowerCase();

pageIndex = Number(params.pageIndex || 1);
pageSize = Number(params.pageSize || DEFAULT_PAGE_SIZE);
pageSize = Number(params.pageSize || helper.MAX_PAGE_SIZE);

if (!_.isDefined(params.sortOrder) && sortColumn === "registrationstarttime") {
sortOrder = "desc";
Expand All @@ -734,7 +729,7 @@ exports.getSRMSchedule = {
}
error = error ||
helper.checkMaxNumber(pageIndex, MAX_INT, "pageIndex") ||
helper.checkMaxNumber(pageSize, MAX_INT, "pageSize") ||
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, "pageSize") ||
helper.checkPageIndex(pageIndex, "pageIndex") ||
helper.checkPositiveInteger(pageSize, "pageSize") ||
helper.checkContains(["asc", "desc"], sortOrder, "sortOrder") ||
Expand All @@ -757,7 +752,7 @@ exports.getSRMSchedule = {

if (pageIndex === -1) {
pageIndex = 1;
pageSize = MAX_INT;
pageSize = helper.MAX_PAGE_SIZE;
}
SCHEDULE_TIMEZONE = api.config.tcConfig.databaseTimezoneIdentifier;
cb(error);
Expand Down Expand Up @@ -2402,7 +2397,7 @@ function getPracticeProblems(api, connection, next) {
myPointsUpperBound,
caller = connection.caller,
pageIndex = Number(connection.params.pageIndex || 1),
pageSize = Number(connection.params.pageSize || 10),
pageSize = Number(connection.params.pageSize || helper.MAX_PAGE_SIZE),
sortColumn = connection.params.sortColumn || 'problemId',
sortOrder = connection.params.sortOrder || helper.consts.ASCENDING,
exeQuery = function (query) {
Expand All @@ -2414,7 +2409,7 @@ function getPracticeProblems(api, connection, next) {
function (cb) {
var error = helper.checkPageIndex(pageIndex, 'pageIndex') ||
helper.checkPositiveInteger(pageSize, 'pageSize') ||
helper.checkMaxInt(pageSize, 'pageSize') ||
helper.checkMaxNumber(pageSize, helper.MAX_PAGE_SIZE, 'pageSize') ||
helper.checkContains(['asc', 'desc'], sortOrder.toLowerCase(), 'sortOrder') ||
helper.checkSortColumn(VALID_PRACTICE_PROBLEMS_SORT_COLUMN, sortColumn.toLowerCase()) ||
helper.checkMember(connection, 'Only logged in user can access to this endpoint.');
Expand Down
Loading