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

Author: fireice.topcoder

actions/rounds.js

@@ -65,6 +65,7 @@ var TIME_FILTER_COLUMNS = [
 
 // the sort columns
 var SORT_COLUMNS = {
+    "name": "name",
     "registrationPhaseStartTime": "start_time_1",
     "registrationPhaseEndTime": "end_time_1",
     "codingPhaseStartTime": "start_time_2",
@@ -274,7 +275,7 @@ var getRounds = function (api, connection, dbConnectionMap, next) {
             filterCondition = ' r.round_id > 0 ';
             if (_.isDefined(params.name)) {
                 // set name filter
-                filterCondition = filterCondition + ' AND LOWER(name) LIKE LOWER("%' + decodeURIComponent(params.name) + '%")';
+                filterCondition = filterCondition + ' AND LOWER(r.name) LIKE LOWER("%' + decodeURIComponent(params.name) + '%")';
             }
 
             if (statusCondition !== '') {
@@ -344,7 +345,15 @@ var getRounds = function (api, connection, dbConnectionMap, next) {
                     "registrationLimit": rounds[i].registration_limit,
                     "invitationalType": rounds[i].invitational ? rounds[i].invitational.trim() : rounds[i].invitational,
                     "region": rounds[i].region_name,
-                    "roundSchedule": []
+                    "contestId": rounds[i].contest_id,
+                    "contestName": rounds[i].contest_name,
+                    "contestStatus": rounds[i].contest_status,
+                    "hasProblems": rounds[i].has_problems.trim() === 'true',
+                    "hasTerms": rounds[i].has_terms.trim() === 'true',
+                    "hasSchedule": rounds[i].has_schedule.trim() === 'true',
+                    "hasQuestions": rounds[i].has_questions.trim() === 'true',
+                    "roundSchedule": [],
+                    "languages": []
                 };
 
                 for (j = 1; j <= 7; j++) {
@@ -364,26 +373,43 @@ var getRounds = function (api, connection, dbConnectionMap, next) {
 
             if (idStr !== '') {
                 sqlParams.roundIdList = idStr;
-                // get round terms
-                api.dataAccess.executeQuery("get_round_terms_by_ids",
-                    sqlParams,
-                    dbConnectionMap,
-                    cb);
+                async.parallel({
+                    languages: function (cbx) {
+                        api.dataAccess.executeQuery("get_round_language_by_ids",
+                            sqlParams,
+                            dbConnectionMap,
+                            cbx);
+                    },
+                    terms: function (cbx) {
+                        api.dataAccess.executeQuery("get_round_terms_by_ids",
+                            sqlParams,
+                            dbConnectionMap,
+                            cbx);
+                    }
+                }, cb);
             } else {
                 cb(null, null);
             }
         }, function (results, cb) {
             var j;
             if (results !== null) {
-                for (i = 0; i < results.length; i++) {
+                for (i = 0; i < results.terms.length; i++) {
                     for (j = 0; j < data.length; j++) {
                         // only return the first term
-                        if (results[i].round_id === data[j].id && !data[j]["roundTerms"]) {
-                            data[j]["roundTerms"] = results[i].terms_content;
+                        if (results.terms[i].round_id === data[j].id && !data[j]["roundTerms"]) {
+                            data[j]["roundTerms"] = results.terms[i].terms_content;
                             break;
                         }
                     }
                 }
+
+                for (i = 0; i < results.languages.length; i++) {
+                    for (j = 0; j < data.length; j++) {
+                        if (results.languages[i].round_id === data[j].id) {
+                            data[j]["languages"].push({"id": results.languages[i].language_id, "description": results.languages[i].language_name});
+                        }
+                    }
+                }
             }
 
             result.data = data;
@@ -408,7 +434,7 @@ exports.getRounds = {
     description: "Get Rounds",
     inputs: {
         required: [],
-        optional: ["pageSize", "pageIndex", "sortColumn", "sortOrder"].concat(FILTER_COLUMNS).concat(TIME_FILTER_COLUMNS)
+        optional: ["pageSize", "pageIndex", "sortColumn", "sortOrder", "name"].concat(FILTER_COLUMNS).concat(TIME_FILTER_COLUMNS)
     },
     blockedConnectionTypes: [],
     outputExample: {},

actions/srmRoundComponentsAndTerms.js

@@ -59,7 +59,7 @@ function checkDefinedNonNegativeInteger(value, name, error, helper) {
  * @param callback the callback method
  */
 function checkComponents(api, dbConnectionMap, components, callback) {
-    var helper = api.helper, error = helper.checkArray(components, "components", false), existingComponentDivisionIds = [];
+    var helper = api.helper, error = helper.checkArray(components, "components", true), existingComponentDivisionIds = [];
     if (error) {
         callback(error);
         return;
@@ -202,7 +202,7 @@ var setRoundComponents = function (api, connection, dbConnectionMap, next) {
     var helper = api.helper,
         sqlParams = {},
         roundId = Number(connection.params.roundId),
-        components = connection.params.components;
+        components = connection.params.components || [];
 
     async.waterfall([
         function (cb) {
@@ -348,8 +348,8 @@ exports.setRoundComponents = {
     name: "setRoundComponents",
     description: "Set Round Components",
     inputs: {
-        required: ['roundId', 'components'],
-        optional: []
+        required: ['roundId'],
+        optional: ['components']
     },
     blockedConnectionTypes: [],
     outputExample: {},

apiary.apib

@@ -6943,31 +6943,35 @@ Request
                     "roundId": 6,
                     "roundName": "Past Srm Round",
                     "divisionDescription": "Unrated Division",
-                    "levelDescription": "Level 2001"
+                    "levelDescription": "Level 2001",
+                    "editorialLink": "http://editlink6"
                 },
                 {
                     "contestId": 3006,
                     "contestName": "Contest 3006",
                     "roundId": 7,
                     "roundName": "Past Tournament Round",
                     "divisionDescription": "Division-I",
-                    "levelDescription": "Level 2001"
+                    "levelDescription": "Level 2001",
+                    "editorialLink": "http://editlink7"
                 },
                 {
                     "contestId": 3007,
                     "contestName": "Contest 3007",
                     "roundId": 8,
                     "roundName": "Past Long Round",
                     "divisionDescription": "Division-II",
-                    "levelDescription": "Level 2001"
+                    "levelDescription": "Level 2001",
+                    "editorialLink": "http://editlink8"
                 },
                 {
                     "contestId": 3008,
                     "contestName": "Contest 3008",
                     "roundId": 9,
                     "roundName": "Past Event Round",
                     "divisionDescription": "No Division Applicable",
-                    "levelDescription": "Level 2001"
+                    "levelDescription": "Level 2001",
+                    "editorialLink": "http://editlink9"
                 }
             ]
         }
@@ -8297,7 +8301,7 @@ Request
               },
               "languages": {
                      "roundId": 40006,
-                     “languages” [
+                     "languages": [
                          {
                            "id": 1,
                            "description": "Java"
@@ -15783,7 +15787,7 @@ Source Code Image Generation APIs
 + Parameters
     + pageIndex (optional, number, `1`) ... The paging number, 1-based, -1 if no paging. It can be null.
     + pageSize (optional, number, `50`) ... The max number of the results, should be set if pageIndex is set.
-    + sortColumn (optional, string, `registrationPhaseStartTime`) ... The column name to sort, can be null. It should be one of registrationPhaseStartTime, registrationPhaseEndTime, codingPhaseStartTime, codingPhaseEndTime, intermissionPhaseStartTime, intermissionPhaseEndTime, challengePhaseStartTime, challengePhaseEndTime, systemTestPhaseStartTime, systemTestPhaseEndTime, roomAssignmentPhaseStartTime, roomAssignmentPhaseEndTime, moderatedChatPhaseStartTime, moderatedChatPhaseEndTime.
+    + sortColumn (optional, string, `registrationPhaseStartTime`) ... The column name to sort, can be null. It should be one of name,registrationPhaseStartTime, registrationPhaseEndTime, codingPhaseStartTime, codingPhaseEndTime, intermissionPhaseStartTime, intermissionPhaseEndTime, challengePhaseStartTime, challengePhaseEndTime, systemTestPhaseStartTime, systemTestPhaseEndTime, roomAssignmentPhaseStartTime, roomAssignmentPhaseEndTime, moderatedChatPhaseStartTime, moderatedChatPhaseEndTime.
     + sortOrder (optional, string, `desc`) ... The sort order, can be null. It should be one of desc or asc.
     + name (optional, string, `test`) ... The name filter, can be null. It should be encoded in uri format. It's case insensitive and it could be only part of name to filter.
     + type (optional, string, `Single%20Round%20Match`) ... The type filter, can be null. It should be encoded in uri format. It's case insensitive. It should be values in round_type_lu table description field. It could use ',' char to connect more than 1 value.
@@ -15838,6 +15842,13 @@ Source Code Image Generation APIs
                         "Registration Limit": 1000,
                         "Invitational Type": "Not",
                         "Region": "Alpha",
+                        "contestId": 12917,
+                        "contestName": "Test SRM",
+                        "contestStatus": "A",
+                        "hasProblems": true,
+                        "hasTerms": true,
+                        "hasSchedule": true,
+                        "hasQuestions": false,
                         "Round Schedule": [
                             {
                                 "Phase Name": "Registration Phase",
@@ -15881,7 +15892,17 @@ Source Code Image Generation APIs
                                 "End Time": "2013-12-15T05:50:51.000+05:00",
                                 "Status": "Draft"
                             }
-                        ]
+                        ],
+                        "languages": [
+                                         {
+                                             "id": 1,
+                                             "description": "Java"
+                                         },
+                                         {
+                                             "id": 2,
+                                             "description": "XML"
+                                         }
+                                     ]
                     }
                 ]
             }

deploy/development.bat

@@ -90,4 +90,6 @@ set WATERMARK_FILE_PATH=test/test_files/design_image_file_generator/studio_logo_
 
 set WKHTMLTOIMAGE_COMMAND_PATH=/home/ubuntu/tmp/wkhtmltox-0.12.1/static-build/posix-local/wkhtmltox-0.12.1/bin/wkhtmltoimage
 set WKHTMLTOIMAGE_IMAGE_WIDTH=1024
-set HIGHLIGHT_STYLE_LINK=http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/styles/%OVERRIDE_STYLE_NAME%.min.css
+set HIGHLIGHT_STYLE_LINK=http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/styles/%OVERRIDE_STYLE_NAME%.min.css
+
+set JWT_TOKEN_COOKIE_KEY="tcjwt_vm"

deploy/development.sh

@@ -96,3 +96,5 @@ export WATERMARK_FILE_PATH=test/test_files/design_image_file_generator/studio_lo
 export WKHTMLTOIMAGE_COMMAND_PATH=/home/ubuntu/tmp/wkhtmltox-0.12.1/static-build/posix-local/wkhtmltox-0.12.1/bin/wkhtmltoimage
 export WKHTMLTOIMAGE_IMAGE_WIDTH=1024
 export HIGHLIGHT_STYLE_LINK=http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/styles/%OVERRIDE_STYLE_NAME%.min.css
+
+export JWT_TOKEN_COOKIE_KEY="tcjwt_vm"

initializers/middleware.js

@@ -81,20 +81,27 @@ exports.middleware = function (api, next) {
             isCachedReturned,
             cacheKey,
             socialUserId,
-            socialProvider;
-        if (!_.isDefined(authHeader)) {
+            socialProvider,
+            cookieToken = api.utils.parseCookies(connection.rawConnection.req)[process.env.JWT_TOKEN_COOKIE_KEY];
+
+        if (_.isUndefined(authHeader) && _.isUndefined(cookieToken)) {
             connection.caller = {accessLevel: "anon"};
             next(connection, true);
             return;
         }
+
         async.waterfall([
             function (cb) {
-                var reg = /^bearer ([\s\S]+)$/i;
-                if (!reg.test(authHeader)) {
-                    cb(new IllegalArgumentError("Malformed Auth header"));
-                    return;
+                if (_.isUndefined(authHeader)) {
+                    cb(null, cookieToken);
+                } else {
+                    var reg = /^bearer ([\s\S]+)$/i;
+                    if (!reg.test(authHeader)) {
+                        cb(new IllegalArgumentError("Malformed Auth header"));
+                        return;
+                    }
+                    cb(null, reg.exec(authHeader)[1]);
                 }
-                cb(null, reg.exec(authHeader)[1]);
             }, function (token, cb) {
                 jwt.verify(token,
                     api.config.tcConfig.oauthClientSecret,
@@ -107,6 +114,11 @@ exports.middleware = function (api, next) {
                     return;
                 }
                 var split = decoded.sub.split("|");
+                if (split.length == 1) {
+                    // token.sub should contain "|"
+                    cb(new IllegalArgumentError('Malformed Auth header. token.sub is in bad format!'));
+                    return;
+                }
                 try {
                     socialUserId = (split[split.length-1] || "").trim();
                     socialProvider = (split[0] || "").trim();
@@ -212,7 +224,8 @@ exports.middleware = function (api, next) {
             //error messages returned by jwt.verify(...) method
             if (err.message.indexOf('Invalid token') !== -1 ||
                     String(err.message).startsWith("jwt audience invalid.") ||
-                    err.message === "invalid signature") {
+                    err.message === "invalid signature" ||
+                    err.message === "jwt malformed") {
                 errorMessage = "Malformed Auth header";
                 baseError = api.helper.apiCodes.badRequest;
             } else if (err.message === "jwt expired") {

queries/get_round_language_by_ids

@@ -0,0 +1 @@
+select rl.round_id as round_id, l.language_id as language_id, l.language_name as language_name from round_language rl, language l where rl.language_id = l.language_id and rl.round_id in (@roundIdList@)

queries/get_round_language_by_ids.json

@@ -0,0 +1,5 @@
+{
+    "name"    : "get_round_language_by_ids",
+    "db"      : "informixoltp",
+    "sqlfile" : "get_round_language_by_ids"
+}

queries/get_rounds

@@ -5,6 +5,9 @@ SELECT
   r.name as name,
   r.short_name as short_name,  
   rt.round_type_desc,  
+  c.contest_id as contest_id,
+  c.name as contest_name,
+  c.status as contest_status,
   CASE WHEN (UPPER(r.status) = 'A') THEN
            'Active'
        WHEN (UPPER(r.status) = 'P') THEN
@@ -99,12 +102,31 @@ SELECT
            'Draft'
        ELSE NULL
        END as status_7,
-  (select segment_desc from segment where segment_id = 7) as name_7
+  (select segment_desc from segment where segment_id = 7) as name_7,
+  CASE WHEN ((select count(*) from round_component rc where rc.round_id = r.round_id) > 0) THEN
+           'true'
+       ELSE 'false'
+       END AS has_problems,
+  CASE WHEN ((select count(*) from round_terms rt where rt.round_id = r.round_id) > 0) THEN
+           'true'
+       ELSE 'false'
+       END AS has_terms,
+  CASE WHEN ((select count(*) from round_segment rs where rs.round_id = r.round_id) > 0) THEN
+           'true'
+       ELSE 'false'
+       END AS has_schedule,
+  CASE WHEN ((select count(*) from round_question rq where rq.round_id = r.round_id) > 0) THEN
+           'true'
+       ELSE 'false'
+       END AS has_questions
+       
  FROM (round r
       LEFT OUTER JOIN round_type_lu rt
         ON r.round_type_id=rt.round_type_id
       LEFT OUTER JOIN region reg
         ON r.region_id=reg.region_id
+      LEFT OUTER JOIN contest c
+        ON r.contest_id=c.contest_id
      LEFT OUTER JOIN round_segment rs1
         ON r.round_id=rs1.round_id and rs1.segment_id = 1
      LEFT OUTER JOIN round_segment rs2

queries/get_rounds_for_problem

@@ -4,7 +4,8 @@ SELECT
  r.contest_id,
  (SELECT name FROM contest c WHERE c.contest_id = r.contest_id) AS contest_name,
  (SELECT division_desc FROM division_lu d WHERE p.division_id = d.division_id) AS division_description,
- p.level_desc AS level_description
+ p.level_desc AS level_description,
+ r.editorial_link
 FROM
    problem p,
    round r