Merge branch 'member_registration_api_update_2'

Author: fireice.topcoder

actions/memberRegistration.js

@@ -129,8 +129,7 @@ function codeRandom(coderId) {
         } while (oldseed.toNumber() === nextseed.toNumber());
         cr.seed = nextseed;
         return nextseed.shiftRight(16).toNumber();
-    }
-
+    };
     return cr;
 }
 
@@ -190,7 +189,10 @@ function getCode(coderId) {
  * @param {Function} next - The callback function
  */
 var registerUser = function (user, api, dbConnectionMap, next) {
-    var activationCode;
+    var activationCode,
+        utm_source = user.utm_source || '',
+        utm_medium = user.utm_medium || '',
+        utm_campaign = user.utm_campaign || '';
     // Get the next user id
     api.idGenerator.getNextID("USER_SEQ", dbConnectionMap, function (err, result) {
         if (err) {
@@ -205,7 +207,18 @@ var registerUser = function (user, api, dbConnectionMap, next) {
                     var regSource = user.regSource !== null && user.regSource !== undefined ? user.regSource : 'api';                    
                     // use user id as activation code for now
                     activationCode = getCode(user.id);
-                    api.dataAccess.executeQuery("insert_user", {userId : user.id, firstName : user.firstName, lastName : user.lastName, handle : user.handle, status : status, activationCode : activationCode, regSource : regSource}, dbConnectionMap, function (err, result) {
+                    api.dataAccess.executeQuery("insert_user", {
+                            userId : user.id,
+                            firstName : user.firstName,
+                            lastName : user.lastName,
+                            handle : user.handle,
+                            status : status,
+                            activationCode : activationCode,
+                            regSource : regSource,
+                            utm_source : utm_source,
+                            utm_medium : utm_medium,
+                            utm_campaign : utm_campaign},
+                        dbConnectionMap, function (err, result) {
                         callback(err, result);
                     });
                 },
@@ -955,7 +968,7 @@ exports.memberRegister = {
     description: "Register a new member",
     inputs: {
         required: ["firstName", "lastName", "handle", "country", "email"],
-        optional: ["password", "socialProviderId", "socialUserName", "socialEmail", "socialEmailVerified", "regSource", "socialUserId"]
+        optional: ["password", "socialProviderId", "socialUserName", "socialEmail", "socialEmailVerified", "regSource", "socialUserId", "utm_source", "utm_medium", "utm_campaign"]
     },
     blockedConnectionTypes : [],
     outputExample : {},

queries/insert_user

@@ -1,2 +1,2 @@
-INSERT INTO user(user_id, first_name, last_name, handle, status, activation_code, reg_source) 
-VALUES (@userId@, '@firstName@', '@lastName@', '@handle@', '@status@', '@activationCode@', '@regSource@')
+INSERT INTO user(user_id, first_name, last_name, handle, status, activation_code, reg_source, utm_source, utm_medium, utm_campaign) 
+VALUES (@userId@, '@firstName@', '@lastName@', '@handle@', '@status@', '@activationCode@', '@regSource@', '@utm_source@', '@utm_medium@', '@utm_campaign@')

test/sqls/register_member/common_oltp__select_user

@@ -1 +1 @@
-user_id,first_name,last_name,handle,status,activation_code,reg_source from user where handle = 'testHandleFoo'
+user_id,first_name,last_name,handle,status,activation_code,reg_source,utm_source,utm_medium,utm_campaign from user where handle = 'testHandleFoo'

test/test.register_member.js

@@ -253,7 +253,7 @@ describe('Test Register Member API', function () {
     it('should register successfully', function (done) {
         supertest(API_ENDPOINT)
             .post('/v2/users').set('Accept', 'application/json')
-            .send({ firstName: 'foo', lastName: 'bar', handle: 'testHandleFoo', email: 'testHandleFoo@foobar.com', password: '123456', country: 'Japan', socialProviderId: 1, socialUserName: "foobar", socialEmail: "foobar@foobar.com", socialEmailVerified: 't', regSource: "source1", "socialUserId": 2 })
+            .send({ firstName: 'foo', lastName: 'bar', handle: 'testHandleFoo', email: 'testHandleFoo@foobar.com', password: '123456', country: 'Japan', socialProviderId: 1, socialUserName: "foobar", socialEmail: "foobar@foobar.com", socialEmailVerified: 't', regSource: "source1", "socialUserId": 2, utm_source: "some source", utm_medium: "some medium", utm_campaign: "some campaign"})
             .expect('Content-Type', /json/)
             .expect(200)
             .end(function (err, result) {

test/test_files/exptected_member_register_validate_user.txt

@@ -3,5 +3,8 @@
     "first_name": "foo",
     "handle": "testHandleFoo",
     "status": "U",
-    "last_name": "bar"
+    "last_name": "bar",
+    "utm_source": "some source", 
+    "utm_medium": "some medium",
+    "utm_campaign": "some campaign"
 }