Merge branch 'technology-2014-09-25'

Author: ykohata

actions/challenges.js

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2013 - 2014 TopCoder Inc., All Rights Reserved.
  *
- * @version 1.30
+ * @version 1.31
  * @author Sky_, mekanizumu, TCSASSEMBLER, freegod, Ghost_141, kurtrips, xjtufreeman, ecnu_haozi, hesibo, LazyChild,
  * @author isv, muzehyun, bugbuka
  * @changes from 1.0
@@ -77,6 +77,8 @@
  * - Fixed existing errors report by jsLint tool.
  * Changes in 1.30:
  * - Update challenge type filter.
+ * Changes in 1.31:
+ * - Remove screeningScorecardId and reviewScorecardId from search challenges api.
  */
 "use strict";
 /*jslint stupid: true, unparam: true, continue: true */
@@ -721,12 +723,6 @@ function transferResultV2(src, helper) {
         if (!_.isUndefined(challenge.forumId)) {
             challenge.forumId = Number(challenge.forumId);
         }
-        if (!_.isUndefined(challenge.screeningScorecardId)) {
-            challenge.screeningScorecardId = Number(challenge.screeningScorecardId);
-        }
-        if (!_.isUndefined(challenge.reviewScorecardId)) {
-            challenge.reviewScorecardId = Number(challenge.reviewScorecardId);
-        }
         if (!challenge.isStudio) {
             delete challenge.submissionsViewable;
         }
@@ -1598,7 +1594,7 @@ var uploadForDevelopChallenge = function (api, connection, dbConnectionMap, next
             //Note 2 - this will also cover the case of private challenges
             //User will have role Submitter only if the user belongs to group of private challenge and is registered.
             if (!rows[0].is_user_submitter_for_challenge) {
-                cb(new ForbiddenError('You cannot submit for this challenge as you are not a Submitter.'));
+                cb(new ForbiddenError('You cannot submit for this challenge as you are not a submitter.'));
                 return;
             }
 
@@ -2488,14 +2484,15 @@ exports.getChallenge = {
     transaction: 'read', // this action is read-only
     databases: ["tcs_catalog", "tcs_dw"],
     run: function (api, connection, next) {
-        var error = api.helper.checkIdParameter(connection.params.challengeId, "challengeId");
+        var challengeId = Number(connection.params.challengeId),
+            error = api.helper.checkIdParameter(challengeId, "challengeId");
 
         if (error) {
             api.helper.handleError(api, connection, new NotFoundError("Challenge Id Not Valid."));
             next(connection, true);
         } else if (connection.dbConnectionMap) {
             api.log("Execute getChallenge#run", 'debug');
-            api.dataAccess.executeQuery('check_challenge_exists', {challengeId: connection.params.challengeId}, connection.dbConnectionMap, function (err, result) {
+            api.dataAccess.executeQuery('check_challenge_exists', {challengeId: challengeId}, connection.dbConnectionMap, function (err, result) {
                 if (err) {
                     api.helper.handleError(api, connection, err);
                     next(connection, true);

apiary.apib

@@ -28,7 +28,7 @@ exports.default = {
             // disables the whitelisting of client params
             disableParamScrubbing: false,
             // params you would like hidden from any logs
-            filteredParams: ['password', 'oldPassword', 'newPassword'],
+            filteredParams: ['password', 'oldPassword', 'newPassword', 'fileData'],
             // The default filetype to server when a user requests a directory
             directoryFileType : 'index.html',
             // configuration for your actionhero project structure

config/api.js

@@ -3,8 +3,6 @@ SELECT
 , pcl.description AS challenge_type
 , pn.value AS challenge_name
 , p.project_id AS challenge_id
-, pc3.parameter AS screening_scorecard_id
-, pc4.parameter AS review_scorecard_id
 , pi4.value AS forum_id
 , (SELECT COUNT(*) FROM submission s1 INNER JOIN upload u1 ON s1.upload_id = u1.upload_id
       WHERE u1.project_id = p.project_id
@@ -38,10 +36,6 @@ FROM project p
 , project_phase pp1 --registration phase
 , project_phase pp2 --submission phase
 , outer project_phase pp15 --checkpoint submission phase
-, outer ( project_phase pp3  --screening phase
-, outer phase_criteria pc3 ) --screening phase scorecard
-, outer ( project_phase pp4 --review phase
-, outer phase_criteria pc4)  --review phase scorecard
 , project_info pn
 , outer project_info pidr
 , outer project_phase nd_phase
@@ -57,14 +51,6 @@ AND pp2.project_id = p.project_id
 AND pp2.phase_type_id = 2  --submission phase
 AND pp15.project_id = p.project_id
 AND pp15.phase_type_id = 15 --checkpoint submission phase
-AND pp3.project_id = p.project_id
-AND pp3.phase_type_id = 3  --screening phase
-AND pp3.project_phase_id = pc3.project_phase_id
-AND pc3.phase_criteria_type_id = 1 -- scorecardid type
-AND pp4.project_id = p.project_id
-AND pp4.phase_type_id = 4  --review phase
-AND pp4.project_phase_id = pc4.project_phase_id
-AND pc4.phase_criteria_type_id = 1 -- scorecardid type
 AND pidr.project_id = p.project_id
 AND pidr.project_info_type_id = 26  --digital run
 AND pi4.project_id = p.project_id

queries/get_active_challenges

@@ -5,8 +5,6 @@ FIRST @page_size@
 , pcl.description AS challenge_type
 , pn.value AS challenge_name
 , p.project_id AS challenge_id
-, pc3.parameter AS screening_scorecard_id
-, pc4.parameter AS review_scorecard_id
 , pi4.value AS forum_id
 , (SELECT COUNT(*) FROM submission s1 INNER JOIN upload u1 ON s1.upload_id = u1.upload_id
       WHERE u1.project_id = p.project_id
@@ -39,10 +37,6 @@ FROM project p
 , project_phase pp1 --registration phase
 , project_phase pp2 --submission phase
 , outer project_phase pp15 --checkpoint submission phase
-, outer ( project_phase pp3  --screening phase
-, outer phase_criteria pc3 ) --screening phase scorecard
-, outer ( project_phase pp4 --review phase
-, outer phase_criteria pc4)  --review phase scorecard
 , project_info pn
 , outer project_info pidr
 , outer project_phase nd_phase
@@ -58,14 +52,6 @@ AND pp2.project_id = p.project_id
 AND pp2.phase_type_id = 2  --submission phase
 AND pp15.project_id = p.project_id
 AND pp15.phase_type_id = 15 --checkpoint submission phase
-AND pp3.project_id = p.project_id
-AND pp3.phase_type_id = 3  --screening phase
-AND pp3.project_phase_id = pc3.project_phase_id
-AND pc3.phase_criteria_type_id = 1 -- scorecardid type
-AND pp4.project_id = p.project_id
-AND pp4.phase_type_id = 4  --review phase
-AND pp4.project_phase_id = pc4.project_phase_id
-AND pc4.phase_criteria_type_id = 1 -- scorecardid type
 AND pidr.project_id = p.project_id
 AND pidr.project_info_type_id = 26  --digital run
 AND pi4.project_id = p.project_id

queries/get_open_challenges

@@ -5,8 +5,6 @@ FIRST @page_size@
 , pcl.description AS challenge_type
 , pn.value AS challenge_name
 , p.project_id AS challenge_id
-, screening.parameter AS screening_scorecard_id
-, review.parameter AS review_scorecard_id
 , (SELECT value FROM project_info WHERE project_id = p.project_id AND project_info_type_id = 4) AS forum_id
 , (SELECT COUNT(*) FROM submission s1 INNER JOIN upload u1 ON s1.upload_id = u1.upload_id
         WHERE u1.project_id = p.project_id
@@ -40,24 +38,6 @@ INNER JOIN project_phase pp2 ON pp2.project_id = p.project_id AND pp2.phase_type
 INNER JOIN project_info pn ON pn.project_id = p.project_id AND pn.project_info_type_id = 6 
 INNER JOIN project_info pi1 ON pi1.project_id = p.project_id AND pi1.project_info_type_id = 1
 LEFT JOIN project_phase pp15 ON pp15.project_id = p.project_id AND pp15.phase_type_id = 15
-LEFT JOIN (
-  SELECT
-    pp3.project_id
-  , pc3.parameter
-  FROM project_phase pp3
-  LEFT JOIN phase_criteria pc3 ON pp3.project_phase_id = pc3.project_phase_id
-  WHERE pp3.phase_type_id = 3
-  AND pc3.phase_criteria_type_id = 1
-) screening ON screening.project_id = p.project_id
-LEFT JOIN (
-  SELECT
-    pp4.project_id
-  , pc4.parameter
-  FROM project_phase pp4
-  LEFT JOIN phase_criteria pc4 ON pp4.project_phase_id = pc4.project_phase_id
-  WHERE pp4.phase_type_id = 4
-  AND pc4.phase_criteria_type_id = 1
-) review ON review.project_id = p.project_id
 LEFT JOIN project_info pidr ON pidr.project_id = p.project_id AND pidr.project_info_type_id = 26
 WHERE
 p.project_status_id IN (4, 5, 6, 7, 8, 9, 10, 11)

queries/get_past_challenges

@@ -3,8 +3,6 @@ SELECT
 , pcl.description AS challenge_type
 , pn.value AS challenge_name
 , p.project_id AS challenge_id
-, pc3.parameter AS screening_scorecard_id
-, pc4.parameter AS review_scorecard_id
 , pi4.value AS forum_id
 , NVL((SELECT SUM(pr.number_of_submissions) FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 14), 0) AS number_of_checkpoints_prizes
 , (SELECT pr.prize_amount FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15 AND pr.place = 1) AS first_place_prize
@@ -30,10 +28,6 @@ FROM project p
 , project_phase pp1 --registration phase
 , project_phase pp2 --submission phase
 , outer project_phase pp15 --checkpoint submission phase
-, outer ( project_phase pp3  --screening phase
-, outer phase_criteria pc3 ) --screening phase scorecard
-, outer ( project_phase pp4 --review phase
-, outer phase_criteria pc4)  --review phase scorecard
 , project_info pn
 , project_info pi32
 , outer project_info pidr
@@ -49,14 +43,6 @@ AND pp2.project_id = p.project_id
 AND pp2.phase_type_id = 2  --submission phase
 AND pp15.project_id = p.project_id
 AND pp15.phase_type_id = 15 --checkpoint submission phase
-AND pp3.project_id = p.project_id
-AND pp3.phase_type_id = 3  --screening phase
-AND pp3.project_phase_id = pc3.project_phase_id
-AND pc3.phase_criteria_type_id = 1 -- scorecardid type
-AND pp4.project_id = p.project_id
-AND pp4.phase_type_id = 4  --review phase
-AND pp4.project_phase_id = pc4.project_phase_id
-AND pc4.phase_criteria_type_id = 1 -- scorecardid type
 AND pidr.project_id = p.project_id
 AND pidr.project_info_type_id = 26  --digital run
 AND pi4.project_id = p.project_id