enable web arena role to create round api

Author: skyhit

actions/srmRoundManagement.js

@@ -430,7 +430,7 @@ exports.createSRMContestRound = {
                 params.id = MAX_INT;
                 var error =
                         checkContestRound(helper, params) ||
-                        helper.checkAdmin(connection, "You need to be authorized first.", "You are forbidden for this API.");
+                        helper.checkAdminOrWebArenaSuper(connection, "You need to be authorized first.", "You are forbidden for this API.");
                 cb(error);
             },
             function (cb) {
@@ -440,6 +440,9 @@ exports.createSRMContestRound = {
                     },
                     function (roundId, cbx) {
                         params.id = roundId;
+                        if (connection.caller.isWebArenaSuper) {
+                            params.type.id = 24;
+                        }
                         api.dataAccess.executeQuery('insert_srm_contest_round',
                             {
                                 contest_id: params.contest_id,
@@ -451,7 +454,8 @@ exports.createSRMContestRound = {
                                 name: params.name,
                                 status: params.status,
                                 short_name: params.short_name,
-                                auto_end: params.auto_end
+                                auto_end: params.auto_end,
+                                creator_id: connection.caller.userId
                             },
                             dbConnectionMap, cbx);
                     }
@@ -613,6 +617,9 @@ exports.modifySRMContestRound = {
             helper.handleNoConnection(api, connection, next);
             return;
         }
+        if (_.isUndefined(params.auto_end)) {
+            params.auto_end = false;
+        }
         async.series([
             function (cb) {
                 console.log("oldRoundId = " + oldRoundId);

initializers/helper.js

@@ -6,7 +6,7 @@
 /**
  * This module contains helper functions.
  * @author Sky_, Ghost_141, muzehyun, kurtrips, isv, LazyChild, hesibo, panoptimum, flytoj2ee, TCSASSEMBLER
- * @version 1.41
+ * @version 1.42
  * changes in 1.1:
  * - add mapProperties
  * changes in 1.2:
@@ -110,6 +110,8 @@
  * - Update getLowerCaseList method to use map method.
  * Changes in 1.41:
  * - Update apiName2dbNameMap to add entries for srm schedule API.
+ * Changes in 1.42:
+ * - Add checkAdminOrWebArenaSuper to check if user has web arena super role.
  */
 "use strict";
 
@@ -1412,6 +1414,20 @@ helper.checkAdmin = function (connection, unauthorizedErrMsg, forbiddenErrMsg) {
     return new ForbiddenError();
 };
 
+/**
+ * Check whether given user has web arena super role or not
+ * @param connection - the api connection object
+ * @param {String} unauthorizedErrMsg - the error message for unauthorized error.
+ * @param {String} forbiddenErrMsg - the error message for forbidden error.
+ * @return {Error} if user is not admin or does not have web arena super role.
+ */
+helper.checkAdminOrWebArenaSuper = function (connection, unauthorizedErrMsg, forbiddenErrMsg) {
+    if (connection.caller.isWebArenaSuper) {
+        return null;
+    }
+    return helper.checkAdmin(connection, unauthorizedErrMsg, forbiddenErrMsg);
+};
+
 /**
  * Check if the caller has at least member access level.
  * @param {Object} connection - the connection object.

queries/insert_srm_contest_round

@@ -1,2 +1,2 @@
-INSERT INTO round (round_id, contest_id, round_type_id, registration_limit, invitational, region_id, name, status, short_name, auto_end)
-       VALUES (@round_id@, @contest_id@, @round_type_id@, @registration_limit@, @invitational@, @region_id@, '@name@', '@status@', '@short_name@', @auto_end@)
+INSERT INTO round (round_id, contest_id, round_type_id, registration_limit, invitational, region_id, name, status, short_name, auto_end, creator_id)
+       VALUES (@round_id@, @contest_id@, @round_type_id@, @registration_limit@, @invitational@, @region_id@, '@name@', '@status@', '@short_name@', @auto_end@, @creator_id@)

test/test.srmRoundManagement.js

@@ -1,8 +1,11 @@
 /*
  * Copyright (C) 2014 TopCoder Inc., All Rights Reserved.
  *
- * @version 1.0
- * @author TCASSEMBLER
+ * @version 1.1
+ * @author TCASSEMBLER, TCSFINALFIXER
+ *
+ * Changes in 1.1:
+ * - Add test 'should create new round for web arena super role'
  */
 "use strict";
 /*global describe, it, before, beforeEach, after, afterEach */
@@ -1328,9 +1331,53 @@ describe('SRM Round Management APIs', function () {
                     }
                 ], done);
             });
-        });
-
 
+            it('should create new round for web arena super role', function (done) {
+                async.waterfall([
+                    _.bind(testHelper.runSqlSelectQuery, testHelper, GET_ROUND_SEQ_SQL, "informixoltp"),
+                    function (results, cb) {
+                        var roundId = results[0].next_id + 1,
+                            req = _.clone(goodRequest),
+                            jwt = testHelper.generateAuthHeader({sub: 'ad|124861'});
+                        request(API_ENDPOINT)
+                            .post('/v2/data/srm/rounds')
+                            .set('Accept', 'application/json')
+                            .set('Content-Type', 'application/json')
+                            .set('Authorization', jwt)
+                            .expect('Content-Type', /json/)
+                            .expect(200)
+                            .send(req)
+                            .end(function (err, res) {
+                                if (err) {
+                                    return cb(err);
+                                }
+                                assert.equal(res.body.roundId, roundId);
+                                testHelper.runSqlSelectQuery(
+                                    "creator_id, round_type_id from round where round_id = " + roundId,
+                                    "informixoltp",
+                                    function (error, results) {
+                                        if (error) {
+                                            return cb(error);
+                                        }
+                                        assert.ok(results && results.length === 1, "query should have succeeded.");
+                                        assert.equal(
+                                            results[0].creator_id,
+                                            124861,
+                                            "creator should be ksmith"
+                                        );
+                                        assert.equal(
+                                            results[0].round_type_id,
+                                            24,
+                                            "round type should be 'Instant Match'"
+                                        );
+                                        return cb();
+                                    }
+                                );
+                            });
+                    }
+                ], done);
+            });
+        });
     });
 
     describe("Modify SRM Contest Round", function () {

test/test_files/srmRoundManagement/contest30002.json

@@ -15,7 +15,9 @@
         "id": 11,
         "desc": "Weakest Link Round"
       },
-      "segments": {
+        "segments": {
+        "codingStartTime": 1383958200000,
+        "registrationStartTime": 1381276200000,
         "registrationStart": "Oct 08, 2013 21:50 EDT",
         "registrationLength": 60,
         "registrationStatus": "A",
@@ -78,4 +80,4 @@
       }
     }
   ]
-}
+}

test/test_files/srmRoundManagement/contest30007.json

@@ -49,6 +49,8 @@
         "challengeStatus": "A",
         "codingLength": 60,
         "codingStart": "Nov 08, 2013 20:50 EST",
+        "codingStartTime": 1383958200000,
+          "registrationStartTime": 1381276200000,
         "codingStatus": "A",
         "intermissionLength": 60,
         "intermissionStatus": "A",

test/test_files/srmRoundManagement/contest30011.json

@@ -50,6 +50,8 @@
         "challengeStatus": "A",
         "codingLength": 60,
         "codingStart": "Nov 08, 2013 20:50 EST",
+        "codingStartTime": 1383958200000,
+        "registrationStartTime":1381276200000,
         "codingStatus": "A",
         "intermissionLength": 60,
         "intermissionStatus": "A",
@@ -79,4 +81,4 @@
     }
 
   ]
-}
+}