Merge branch 'dev' of github.com:cloudspokes/tc-api into dev

Author: fireice.topcoder

actions/challenges.js

@@ -933,7 +933,7 @@ var searchChallenges = function (api, connection, dbConnectionMap, community, ne
             sqlParams.firstRowIndex = (pageIndex - 1) * pageSize;
             sqlParams.pageSize = pageSize;
             sqlParams.sortColumn = sortColumn.toLowerCase();
-            sqlParams.sortColumn = helper.getSortColumnDBName(sortColumn.toLowerCase());
+            sqlParams.sortColumn = helper.getSortColumnDBName(sortColumn);
             sqlParams.sortOrder = sortOrder.toLowerCase();
             // Set the project type id
             sqlParams.project_type_id = challengeType.category;
@@ -2383,8 +2383,8 @@ var getChallengeResults = function (api, connection, dbConnectionMap, isStudio,
                 //Submission Links
                 if (isStudio) {
                     if (challengeRestrictions.show_submissions) {
-                        resEl.submissionDownloadLink = api.config.tcConfig.designSubmissionLink + el.submission_id;
-                        resEl.previewDownloadLink = api.config.tcConfig.designSubmissionLink + el.submission_id + "&sbt=small";
+                        resEl.submissionDownloadLink = api.config.tcConfig.designSubmissionLink + el.submission_id + api.config.tcConfig.submissionDownloadLinkParams;
+                        resEl.previewDownloadLink = api.config.tcConfig.designSubmissionLink + el.submission_id + api.config.tcConfig.previewDownloadLinkParams;
                     }
                 } else {
                     resEl.submissionDownloadLink = api.config.tcConfig.submissionLink + el.upload_id;
@@ -2406,7 +2406,7 @@ var getChallengeResults = function (api, connection, dbConnectionMap, isStudio,
             if (isStudio) {
                 if (challengeRestrictions.show_submissions) {
                     result.finalFixes = _.map(res.finalFixes, function (ff) {
-                        return api.config.tcConfig.designSubmissionLink + ff.submission_id;
+                        return api.config.tcConfig.designSubmissionLink + ff.submission_id + api.config.tcConfig.submissionDownloadLinkParams;
                     });
                 }
             } else {
@@ -3696,7 +3696,7 @@ var getChallenges = function (api, connection, listType, isMyChallenges, next) {
             sqlParams = _.extend(sqlParams, {
                 first_row_index: (pageIndex - 1) * pageSize,
                 page_size: pageSize,
-                sort_column: helper.getSortColumnDBName(sortColumn.toLowerCase()),
+                sort_column: helper.getSortColumnDBName(sortColumn),
                 sort_order: sortOrder.toLowerCase(),
                 track: type.category,
                 // Set the submission phase status id.
@@ -3968,7 +3968,7 @@ var getUserSubmissions = function (api, connection, next) {
                     submission.download = api.config.tcConfig.submissionLink + item.upload_id;
                     delete submission.ranking;
                 } else {
-                    submission.download = api.config.tcConfig.designSubmissionLink + item.submission_id;
+                    submission.download = api.config.tcConfig.designSubmissionLink + item.submission_id + api.config.tcConfig.submissionDownloadLinkParams;
                 }
                 return submission;
             });

actions/memberRegistration.js

@@ -79,10 +79,8 @@ var HANDLE_ALPHABET = stringUtils.ALPHABET_ALPHA_EN + stringUtils.ALPHABET_DIGIT
 /**
  * The regular expression for email
  */
-var emailPattern = new RegExp("(^[\\+_A-Za-z0-9-]+(\\.[\\+_A-Za-z0-9-]+)*@([A-Za-z0-9-])+((\\.com)"
-        + "|(\\.net)|(\\.org)|(\\.info)|(\\.edu)|(\\.mil)|(\\.gov)|(\\.biz)|(\\.ws)|(\\.us)|(\\.tv)|(\\.cc)"
-        + "|(\\.aero)|(\\.arpa)|(\\.coop)|(\\.int)|(\\.jobs)|(\\.museum)|(\\.name)|(\\.pro)|(\\.travel)|(\\.nato)"
-        + "|(\\..{2,3})|(\\.([A-Za-z0-9-])+\\..{2,3}))$)");
+var emailPattern = new RegExp("(^[\\+_A-Za-z0-9-]+(\\.[\\+_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,}$))");
+
 
 /**
  * The patterns for checking invalid handle

actions/memberStatistics.js

@@ -63,48 +63,6 @@ var STUDIO_ID = 6;
 var OPENAIM_ID = 8;
 var HIGH_SCHOOL_ID = 3;
 
-/**
- * check whether given user is activated.
- * @param {String} handle - the handle to check.
- * @param {Object} api - the action hero api object
- * @param {Object} dbConnectionMap - the database connection map
- * @param {Function<err>} callback - the callback function
- */
-function checkCoderActivated(handle, api, dbConnectionMap, callback) {
-    api.dataAccess.executeQuery('check_coder_activated', { handle: handle }, dbConnectionMap, function (err, result) {
-        if (err) {
-            callback(err, null);
-            return;
-        }
-        if (result && result[0] && result[0].status === 'A') {
-            callback(err, null);
-        } else {
-            callback(err, new BadRequestError('User is not activated.'));
-        }
-    });
-}
-
-///**
-// * Check whether given user is activated.
-// * @param {String} handle - the handle to check.
-// * @param {Object} api - the action hero api object
-// * @param {Object} dbConnectionMap - the database connection map
-// * @param {Function<err>} callback - the callback function
-// */
-//function checkUserActivated(handle, api, dbConnectionMap, callback) {
-//    api.dataAccess.executeQuery('check_user_activated', { handle: handle }, dbConnectionMap, function (err, result) {
-//        if (err) {
-//            callback(err, null);
-//            return;
-//        }
-//        if (result && result[0] && result[0].status === 'A') {
-//            callback(err, null);
-//        } else {
-//            callback(err, new BadRequestError('User is not activated.'));
-//        }
-//    });
-//}
-
 /**
  * Update user preference.
  *
@@ -183,42 +141,6 @@ function updateDemographicResponse(key, value, questionId, userId, api, dbConnec
 }
 
 
-/**
- * Check if the user exist and activated.
- * @param {String} handle - the user handle.
- * @param {Object} api - the api object.
- * @param {Object} dbConnectionMap - the database connection map object.
- * @param {Function} callback - the callback function.
- * @since 1.10
- */
-function checkUserExistAndActivate(handle, api, dbConnectionMap, callback) {
-    async.waterfall([
-        function (cb) {
-            // check user existence and activated status.
-            async.parallel({
-                exist: function (cb) {
-                    api.helper.checkUserExists(handle, api, dbConnectionMap, cb);
-                },
-                activate: function (cb) {
-                    checkCoderActivated(handle, api, dbConnectionMap, cb);
-                }
-            }, cb);
-        },
-        function (results, cb) {
-            // handle the error situation.
-            if (results.exist) {
-                cb(results.exist);
-                return;
-            }
-            if (results.activate) {
-                cb(results.activate);
-                return;
-            }
-            cb();
-        }
-    ], callback);
-}
-
 /**
  * Get the user basic profile information.
  * @param {Object} api - the api object.
@@ -270,7 +192,7 @@ function getBasicUserProfile(api, handle, privateInfoEligibility, dbConnectionMa
                     }
                 });
             } else {
-                checkUserExistAndActivate(handle, api, dbConnectionMap, cb);
+                helper.checkCoderExistAndActivate(handle, api, dbConnectionMap, cb);
             }
         }, function (cb) {
             var execQuery = function (name) {
@@ -785,7 +707,7 @@ exports.getMarathonStatistics = {
         }
         async.waterfall([
             function (cb) {
-                checkUserExistAndActivate(handle, api, dbConnectionMap, cb);
+                helper.checkCoderExistAndActivate(handle, api, dbConnectionMap, cb);
             }, function (cb) {
                 var executeQuery = function (sqlName, cbx) {
                     api.dataAccess.executeQuery(sqlName, sqlParams, dbConnectionMap, cbx);
@@ -899,7 +821,7 @@ exports.getSoftwareStatistics = {
                     cb();
                 }
             }, function (cb) {
-                checkUserExistAndActivate(handle, api, dbConnectionMap, cb);
+                helper.checkCoderExistAndActivate(handle, api, dbConnectionMap, cb);
             }, function (cb) {
                 var execQuery = function (name, cbx) {
                         api.dataAccess.executeQuery(name,
@@ -1036,7 +958,7 @@ exports.getStudioStatistics = {
 
         async.waterfall([
             function (cb) {
-                checkUserExistAndActivate(handle, api, dbConnectionMap, cb);
+                helper.checkCoderExistAndActivate(handle, api, dbConnectionMap, cb);
             }, function (cb) {
                 api.dataAccess.executeQuery('get_studio_member_statistics_track', sqlParams, dbConnectionMap, cb);
             }, function (results, cb) {
@@ -1105,7 +1027,7 @@ exports.getAlgorithmStatistics = {
         }
         async.waterfall([
             function (cb) {
-                checkUserExistAndActivate(handle, api, dbConnectionMap, cb);
+                helper.checkCoderExistAndActivate(handle, api, dbConnectionMap, cb);
             }, function (cb) {
                 var execQuery = function (name) {
                     return function (cbx) {
@@ -1406,7 +1328,7 @@ var getRecentWinningDesignSubmissions = function (api, connection, dbConnectionM
                     submissionDate: element.submission_date,
                     viewable: element.viewable.toLowerCase() === "true",
                     challengeId: element.challenge_id,
-                    preview: api.config.tcConfig.designSubmissionLink + element.submission_id + "&sbt=small"
+                    preview: api.config.tcConfig.designSubmissionLink + element.submission_id + api.config.tcConfig.previewDownloadLinkParams
                 };
                 if (!winningSubmission.viewable) {
                     delete winningSubmission.preview;
@@ -1498,7 +1420,7 @@ exports.getCopilotStatistics = {
                     cb();
                 }
             }, function (cb) {
-                checkUserExistAndActivate(handle, api, dbConnectionMap, cb);
+                helper.checkCoderExistAndActivate(handle, api, dbConnectionMap, cb);
             }, function (cb) {
                 var execQuery = function (name, cbx) {
                         api.dataAccess.executeQuery(name,