merge changes

Author: skyhit

actions/srmRoundManagement.js

@@ -433,7 +433,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) {
@@ -443,6 +443,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,
@@ -454,7 +457,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);
                     }

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

@@ -7,6 +7,7 @@
  * Changes in 1.1:
  * - Add tests 'should 403 if web arena super modifies round not his own',
  *   'should modify own round for web arena super role'
+ * - Add test 'should create new round for web arena super role'
  */
 "use strict";
 /*global describe, it, before, beforeEach, after, afterEach */
@@ -1332,6 +1333,52 @@ 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);
+            });
         });
     });