Merge branch 'dev' of https://github.com/cloudspokes/tc-api into thabo-I-129863-new-registration-emails

Author: thabofletcher

actions/user.js

@@ -1,8 +1,10 @@
 /*
  * Copyright (C) 2014 TopCoder Inc., All Rights Reserved.
  *
- * @version 1.0
- * @author muzehyun
+ * @version 1.1
+ * @author muzehyun, Ghost_141
+ * Changes in 1.1:
+ * - Implement user activation email api.
  */
 'use strict';
 var async = require('async');
@@ -12,6 +14,18 @@ var ForbiddenError = require('../errors/ForbiddenError');
 var UnauthorizedError = require('../errors/UnauthorizedError');
 var IllegalArgumentError = require('../errors/IllegalArgumentError');
 
+/**
+ * The activation email subject.
+ * @since 1.1
+ */
+var activationEmailSubject = "Topcoder User Registration Activation";
+
+/**
+ * The activation email sender name.
+ * @since 1.1
+ */
+var activationEmailSenderName = "Topcoder API";
+
 /**
  * It validates activation code and retrieves user id from activation code
  * @param {String} activationCode - activation code string
@@ -27,6 +41,16 @@ function getCoderId(activationCode, helper) {
     return 0;
 }
 
+/**
+ * Get cache key for user resend times in cache.
+ * @param {String} handle - The handle of user.
+ * @returns {string} The cache key.
+ * @since 1.1
+ */
+function getCacheKeyForResendTimes(handle) {
+    return 'user-activation-' + handle;
+}
+
 /**
  * The API for activate user
  */
@@ -121,8 +145,12 @@ exports.activateUser = {
                 };
                 // send email
                 api.tasks.enqueue("sendEmail", emailParams, 'default');
+
                 result = { success: true };
-                cb();
+                // Remove cache from resend times from server.
+                api.cache.destroy(getCacheKeyForResendTimes(handle), function () {
+                    cb();
+                });
             }
         ], function (err) {
             if (err) {
@@ -134,3 +162,99 @@ exports.activateUser = {
         });
     }
 };
+
+/**
+ * Handle user activation email here.
+ * @param {Object} api - The api object.
+ * @param {Object} connection - The database connection object map.
+ * @param {Function} next - The callback function.
+ * @since 1.1
+ */
+function userActivationEmail(api, connection, next) {
+    var helper = api.helper, caller = connection.caller, currentResendTimes, activationCode,
+        dbConnectionMap = connection.dbConnectionMap,
+        cacheKey = 'user-activation-' + caller.handle;
+
+    async.waterfall([
+        function (cb) {
+            cb(helper.checkMember(connection, 'You must login for this endpoint.'));
+        },
+        function (cb) {
+            api.dataAccess.executeQuery('check_user_activated', { handle: caller.handle }, dbConnectionMap, cb);
+        },
+        function (rs, cb) {
+            if (rs[0].status === 'A') {
+                cb(new BadRequestError("You're already activated."));
+                return;
+            }
+            helper.getCachedValue(cacheKey, cb);
+        },
+        function (resendTimes, cb) {
+            if (_.isUndefined(resendTimes)) {
+                // We need to send the activation email and store the resend times.
+                currentResendTimes = 0;
+            } else {
+                if (resendTimes >= api.config.tcConfig.userActivationResendLimit) {
+                    cb(new BadRequestError('Sorry, you already reached the limit of resend times. Please contact for support.'));
+                    return;
+                }
+                currentResendTimes = resendTimes;
+            }
+            api.dataAccess.executeQuery('get_user_email_and_handle', { userId: caller.userId }, dbConnectionMap, cb);
+        },
+        function (rs, cb) {
+            activationCode = helper.generateActivationCode(caller.userId);
+            api.tasks.enqueue("sendEmail",
+                {
+                    subject : activationEmailSubject,
+                    activationCode : activationCode,
+                    template : 'activation_email',
+                    toAddress : rs[0].email,
+                    fromAddress : process.env.TC_EMAIL_ACCOUNT,
+                    senderName : activationEmailSenderName,
+                    url : process.env.TC_ACTIVATION_SERVER_NAME + '/reg2/activate.action?code=' + activationCode,
+                    userHandle : rs[0].handle
+                }, 'default');
+            api.cache.save(cacheKey, currentResendTimes + 1, api.config.tcConfig.userActivationCacheLifeTime,
+                function (err) {
+                    cb(err);
+                });
+        }
+    ], function (err) {
+        if (err) {
+            helper.handleError(api, connection, err);
+        } else {
+            connection.response = {
+                success: true
+            };
+        }
+        next(connection, true);
+    });
+}
+
+/**
+ * The API for activate user email.
+ * @since 1.1
+ */
+exports.userActivationEmail = {
+    name: 'userActivationEmail',
+    description: 'Trigger sending user activation email.',
+    inputs: {
+        required: [],
+        optional: []
+    },
+    blockedConnectionTypes: [],
+    outputExample: {},
+    version: 'v2',
+    transaction: 'read',
+    databases: ['common_oltp'],
+    cacheEnabled: false,
+    run: function (api, connection, next) {
+        if (connection.dbConnectionMap) {
+            api.log('Execute userActivationEmail#run', 'debug');
+            userActivationEmail(api, connection, next);
+        } else {
+            api.helper.handleNoConnection(api, connection, next);
+        }
+    }
+};

apiary.apib

@@ -2083,6 +2083,63 @@ Register a new user.
             "description":"Servers are up but overloaded. Try again later."
         }
 
+## My Profile [/user/activation-email]
+### My Profile [GET]
++ Request
+
+    + Headers
+
+            Authorization : Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZHwxMzI0NTYiLCJleHAiOjEzOTI4MTc4ODQsImF1ZCI6InRvcGNvZGVyIiwiaWF0IjoxMzkyNzU3ODg0fQ.7X2IKkiyyI1ExSM5GNpdhJ8fGGK5-oAjzccX6YL_BKY
+
++ Response 200 (application/json)
+
+        {
+            success: true
+        }
+
++ Response 400 (application/json)
+
+        {
+            "name":"Bad Request",
+            "value":"400",
+            "description":"This message will explain why the request is invalid or cannot be served."
+            "details:":"You're already activated."
+        }
+
++ Response 400 (application/json)
+
+        {
+            "name":"Bad Request",
+            "value":"400",
+            "description":"This message will explain why the request is invalid or cannot be served."
+            "details:":"Sorry, you already reached the limit of resend times. Please contact for support."
+        }
+
++ Response 401 (application/json)
+
+        {
+            "name":"Unauthorized",
+            "value":"401",
+            "description":"This message will explain why the request is invalid or cannot be served."
+            "details:":"You must login for this endpoint."
+        }
+
++ Response 500 (application/json)
+
+        {
+            "name":"Internal Server Error",
+            "value":"500",
+            "description":"Unknown server error. Please contact support."
+        }
+
++ Response 503 (application/json)
+
+        {
+            "name":"Service Unavailable",
+            "value":"503",
+            "description":"Servers are up but overloaded. Try again later."
+        }
+
 ## Search My Challenges [/user/challenges?type={type}&pageIndex={pageIndex}&pageSize={pageSize}&sortColumn={sortColumn}&sortOrder={sortOrder}&communityId={communityId}&submissionEndFrom={submissionEndFrom}&submissionEndTo={submissionEndTo}&challengeType={challengeType}&platforms={platforms}&technologies={technologies}&prizeLowerBound={prizeLowerBound}&prizeUpperBound={prizeUpperBound}]
 ### Search My Challenges [GET]
 
@@ -6461,6 +6518,10 @@ Request
                 {
                     "problemId": 10194,
                     "problemName": "DoubleLetter",
+                    "component_id": 30305,
+                    "room_id": 28,
+                    "round_id": 9873,
+                    "division_id": 2,
                     "problemType": "Single",
                     "points": 500,
                     "difficulty": "Medium",
@@ -6470,6 +6531,10 @@ Request
                 {
                     "problemId": 10195,
                     "problemName": "BlackAndWhite",
+                    "component_id": 30309,
+                    "room_id": 30,
+                    "round_id": 9877,
+                    "division_id": 2,
                     "problemType": "Team",
                     "points": 800,
                     "difficulty": "Hard",

config/tc-config.js

@@ -1,8 +1,8 @@
 /*
  * Copyright (C) 2013 - 2014 TopCoder Inc., All Rights Reserved.
  *
- * @author vangavroche, Ghost_141, kurtrips, Sky_, isv, bugbuka, flytoj2ee
- * @version 1.26
+ * @author vangavroche, Ghost_141, kurtrips, Sky_, isv, bugbuka, flytoj2ee, TCSASSEMBLER
+ * @version 1.27
  * changes in 1.1:
  * - add defaultCacheLifetime parameter
  * changes in 1.2:
@@ -62,12 +62,16 @@
  * - Move configuration contents in tc-config.js
  * Changes in 1.26:
  * - Add studioReview object for get studio review opportunities api.
+ * Changes in 1.27:
+ * Add userActivationResendLimit and userActivationCacheLifeTime for user activation email api.
  */
 
 "use strict";
 
 var config = {
     defaultUserCacheLifetime: process.env.USER_CACHE_EXPIRY || 1000 * 60 * 60 * 24, //24 hours default
+    userActivationResendLimit: 5,
+    userActivationCacheLifeTime: 1000 * 60 * 60 * 23 * 30,
     pastChallengesCacheLifetime: 24 * 60 * 60 * 1000,
     resetTokenPrefix: 'tokens-',
     resetTokenSuffix: '-reset-token',

queries/get_practice_problems

@@ -5,77 +5,72 @@ FIRST @pageSize@
 FROM table(MULTISET(
 SELECT
   p.problem_id
+, c.component_id 
+, ro.room_id
+, rc.round_id
+, rc.division_id
 , p.name AS problem_name
 , ptl.problem_type_desc AS problem_type
 , CASE WHEN (p.problem_type_id = 1 AND p.proposed_difficulty_id = 1) THEN 'Easy'::nvarchar(50)
        WHEN (p.problem_type_id = 1 AND p.proposed_difficulty_id = 2) THEN 'Medium'::nvarchar(50)
        WHEN (p.problem_type_id = 1 AND p.proposed_difficulty_id = 3) THEN 'Hard'::nvarchar(50)
     END AS difficulty
-, (
-    SELECT DISTINCT rc.points
-    FROM round_component rc
-    INNER JOIN component c ON c.component_id = rc.component_id AND c.problem_id = p.problem_id
-    INNER JOIN round_segment rs ON rs.round_id = rc.round_id AND rs.segment_id = 1
-    WHERE rs.start_time = (SELECT MAX(rss.start_time) FROM round_component rc
-    INNER JOIN component c ON c.component_id = rc.component_id AND c.problem_id = p.problem_id
-    INNER JOIN round_segment rss ON rss.round_id = rc.round_id AND rss.segment_id = 1)
-    )AS points
+, rc.points
 , CASE WHEN EXISTS (
        SELECT 1
        FROM component_state cs
-       INNER JOIN component c ON c.component_id = cs.component_id AND c.problem_id = p.problem_id
        WHERE cs.status_id < 120
+       AND cs.component_id = c.component_id
        AND cs.coder_id = @userId@
        UNION ALL
        SELECT 1
        FROM practice_component_state pcs
-       INNER JOIN component c ON c.component_id = pcs.component_id AND c.problem_id = p.problem_id
        WHERE pcs.status_id < 120
+       AND pcs.component_id = c.component_id
        AND pcs.coder_id = @userId@
      ) THEN 'New'::nvarchar(50)
      WHEN EXISTS (
        SELECT 1
        FROM component_state cs
-       INNER JOIN component c ON c.component_id = cs.component_id AND c.problem_id = p.problem_id
        WHERE cs.status_id = 150
+       AND cs.component_id = c.component_id
        AND cs.coder_id = @userId@
        UNION ALL
        SELECT 1
        FROM practice_component_state pcs
-       INNER JOIN component c ON c.component_id = pcs.component_id AND c.problem_id = p.problem_id
        WHERE pcs.status_id = 150
+       AND pcs.component_id = c.component_id
        AND pcs.coder_id = @userId@
      ) THEN 'Solved'::nvarchar(50)
      WHEN EXISTS (
        SELECT 1
        FROM component_state cs
-       INNER JOIN component c ON c.component_id = cs.component_id AND c.problem_id = p.problem_id
        WHERE cs.status_id >= 120
+       AND cs.component_id = c.component_id
        AND cs.status_id != 150
        AND cs.coder_id = @userId@
        UNION ALL
        SELECT 1
        FROM practice_component_state pcs
-       INNER JOIN component c ON c.component_id = pcs.component_id AND c.problem_id = p.problem_id
        WHERE pcs.status_id >= 120
+       AND pcs.component_id = c.component_id
        AND pcs.status_id != 150
        AND pcs.coder_id = @userId@
      ) THEN 'Viewed'::nvarchar(50)
     END AS status
 , NVL((
     SELECT
-    points
-    FROM component_state cs
-    INNER JOIN component c ON c.component_id = cs.component_id AND c.problem_id = p.problem_id
-    INNER JOIN submission s ON s.submission_number = cs.submission_number AND s.component_state_id = cs.component_state_id
-    WHERE cs.coder_id = @userId@
-    AND s.submit_time = (
-        SELECT MAX(submit_time)
-        FROM component_state cs
-        INNER JOIN submission s ON s.submission_number = cs.submission_number AND s.component_state_id = cs.component_state_id
-        INNER JOIN component c ON c.component_id = cs.component_id AND c.problem_id = p.problem_id)
+      points
+    FROM practice_component_state pcs
+    WHERE pcs.round_id = rc.round_id
+    AND pcs.component_id = c.component_id
+    AND pcs.coder_id = @userId@
     ), 0) AS my_points
 FROM problem p
+INNER JOIN component c ON c.problem_id = p.problem_id
+INNER JOIN round_component rc ON rc.component_id = c.component_id
+INNER JOIN round r ON r.round_id = rc.round_id AND r.status = 'A'
+INNER JOIN room ro ON ro.round_id = rc.round_id AND ro.room_type_id = 3 -- practice room
 INNER JOIN problem_type_lu ptl ON ptl.problem_type_id = p.problem_type_id
 WHERE p.status_id = 90
 )) srp