Merge remote-tracking branch 'origin/technology-2014-12-11'

Author: ykohata

actions/memberStatistics.js

@@ -296,6 +296,7 @@ function getBasicUserProfile(api, handle, privateInfoEligibility, dbConnectionMa
                 address;
 
             result = {
+                uid: connection.caller.userId,
                 handle: basic.handle,
                 country: basic.country,
                 memberSince: basic.member_since,

actions/rss.js

@@ -79,17 +79,10 @@ function getChallengesRSS(api, connection, next) {
                         challengeType: row.challenge_type.trim(),
                         challengeName: row.challenge_name,
                         challengeId: row.challenge_id,
-                        detailedRequirements: row.detailed_requirements || '',
                         registrationStartDate: row.registration_start_date,
                         challengeCommunity: row.challenge_community,
                         projectId: row.project_id
                     };
-                    if (_.isDefined(row.software_detailed_requirements)) {
-                        res.detailedRequirements = row.software_detailed_requirements || '';
-                    }
-                    if (_.isDefined(row.studio_detailed_requirements)) {
-                        res.detailedRequirements = row.studio_detailed_requirements || '';
-                    }
                     if (row.project_type_id === helper.studio.category[0]) {
                         res.challengeCommunity = helper.studio.community;
                     } else {

actions/sourceCodeImage.js

@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2014 TopCoder Inc., All Rights Reserved.
+ *
+ * The api to convert the source code to image.
+ *
+ * @version 1.0
+ * @author TCASSEMBLER
+ */
+/*jslint node: true, nomen: true, plusplus: true, unparam: true */
+"use strict";
+var async = require('async');
+var _ = require('underscore');
+var IllegalArgumentError = require('../errors/IllegalArgumentError');
+var highlight = require('highlight.js');
+var wkhtmltoimage = require('wkhtmltoimage');
+var BadRequestError = require('../errors/BadRequestError');
+var exec = require('child_process').exec;
+
+// The style name array.
+var STYLE_NAMES = ['arta', 'ascetic', 'atelier-dune.dark', 'atelier-dune.light', 'atelier-forest.dark', 'atelier-forest.light',
+    'atelier-heath.dark', 'atelier-heath.light', 'atelier-lakeside.dark', 'atelier-lakeside.light', 'atelier-seaside.dark',
+    'atelier-seaside.light', 'brown_paper', 'codepen-embed', 'color-brewer', 'dark', 'default', 'docco',
+    'far', 'foundation', 'github', 'googlecode', 'hybrid', 'idea', 'ir_black', 'kimbie.dark', 'kimbie.light', 'magula',
+    'mono-blue', 'monokai', 'monokai_sublime', 'obsidian', 'paraiso.dark', 'paraiso.light', 'pojoaque', 'railscasts',
+    'rainbow', 'school_book', 'solarized_dark', 'solarized_light', 'sunburst', 'tomorrow-night-blue',
+    'tomorrow-night-bright', 'tomorrow-night-eighties', 'tomorrow-night', 'tomorrow', 'vs', 'xcode', 'zenburn'];
+
+/**
+ * Convert the source code to image.
+ *
+ * @param api - the api instance
+ * @param connection - the request connection instance
+ * @param next - the callback method.
+ */
+var convertSourceCodeToImage = function (api, connection, next) {
+    var helper = api.helper,
+        highlightResult = '',
+        emptyStr = '',
+        code = connection.params.code + emptyStr,
+        style = connection.params.style,
+        language = connection.params.lang;
+
+    async.waterfall([
+        function (cb) {
+            if (_.isNull(language) || _.isEmpty(language) || !highlight.getLanguage(language + emptyStr)) {
+                cb(new IllegalArgumentError("The language name is invalid."));
+                return;
+            }
+
+            if (!_.isUndefined(style) && !_.isNull(style) && !_.isEmpty(style) && !_.contains(STYLE_NAMES, style + emptyStr)) {
+                cb(new IllegalArgumentError("The style name is invalid."));
+                return;
+            }
+
+            exec(api.config.tcConfig.generateSourceCodeImage.wkhtmltoimageCommandPath + ' -H', function(error, stdout, stderr) {
+                if (stderr !== null && stderr !== '') {
+                    cb(new IllegalArgumentError('The wkhtmltoimageCommandPath in configuration is invalid. The return error is ' + stderr));
+                    return;
+                }
+                cb();
+            });
+        }, function (cb) {
+            var styleLink = api.config.tcConfig.generateSourceCodeImage.styleLink;
+            if (!_.isUndefined(style) && !_.isNull(language) && !_.isEmpty(language)) {
+                styleLink = styleLink.replace('%OVERRIDE_STYLE_NAME%', style);
+            } else {
+                styleLink = styleLink.replace('%OVERRIDE_STYLE_NAME%', 'default');
+            }
+            highlight.configure({ 'useBR': true });
+            highlightResult = highlight.highlight(language, code, true).value;
+            highlightResult = '<html><head><link rel="stylesheet" href="' + styleLink + '"></head><body><pre>' + highlightResult;
+            highlightResult = highlightResult + '</pre></body></html>';
+            cb();
+        }, function (cb) {
+            var response = connection.rawConnection.res,
+                tempFileName = new Date().getTime() + (Math.floor(Math.random() * 1000) + '.jpg');
+
+            response.writeHead(200, {
+                'Content-Type': 'image/jpeg',
+                'Content-Disposition': 'inline; filename=' + tempFileName
+            });
+
+            wkhtmltoimage.setCommand(api.config.tcConfig.generateSourceCodeImage.wkhtmltoimageCommandPath);
+            wkhtmltoimage.generate(highlightResult, api.config.tcConfig.generateSourceCodeImage.wkhtmlToImageOptions, function (code, signal) {
+                if (code !== null && code === 0) {
+                    // all success
+                    cb();
+                } else {
+                    cb(new BadRequestError("Failed to generate the image, the return code is " + code));
+                }
+
+            }).pipe(response);
+        }
+    ], function (err) {
+        if (err) {
+            helper.handleError(api, connection, err);
+            next(connection, true);
+        } else {
+            next(connection, false); //false = response has been set
+        }
+    });
+};
+
+/**
+ * The API for converted source code to image.
+ */
+exports.convertSourceCodeToImage = {
+    name: "convertSourceCodeToImage",
+    description: "Convert source code to image",
+    inputs: {
+        required: ['code', 'lang'],
+        optional: ['style']
+    },
+    blockedConnectionTypes: [],
+    cacheEnabled: false,
+    outputExample: {},
+    version: 'v2',
+    run: function (api, connection, next) {
+        api.log("Execute convertSourceCodeToImage#run", 'debug');
+        convertSourceCodeToImage(api, connection, next);
+    }
+};

actions/srmRoundQuestions.js

@@ -1,13 +1,15 @@
 /*
  * Copyright (C) 2014 TopCoder Inc., All Rights Reserved.
  */
- /** 
+/**
  * - Implement the srm round questions / answers / survey api.
  * Changes in version 1.1 (Module Assembly - Web Arena - Match Configurations):
  * - Updated getRoundQuestions to send roundId with response
+ * Changes in 1.2:
+ * - Added actions for modifying/deleting round question answers.
  *
- * @version 1.1
- * @author TCSASSEMBLER
+ * @version 1.2
+ * @author isv
  */
 
 /*jslint node: true, nomen: true, plusplus: true, stupid: true, unparam: true */
@@ -16,6 +18,7 @@ var async = require('async');
 var _ = require('underscore');
 var moment = require('moment');
 var IllegalArgumentError = require('../errors/IllegalArgumentError');
+var NotFoundError = require('../errors/NotFoundError');
 
 var DATE_FORMAT = "YYYY-MM-DD HH:mm";
 
@@ -327,7 +330,8 @@ function checkAnswerValues(api, text, sortOrder, correct, callback) {
             error = helper.checkStringParameter(text, "text", 250);
 
             if (!error && _.isDefined(sortOrder)) {
-                error = helper.checkPositiveInteger(sortOrder, "sortOrder");
+                error = helper.checkPositiveInteger(sortOrder, "sortOrder")
+                    || helper.checkMaxInt(sortOrder, "sortOrder");
             }
 
             if (!error && _.isDefined(correct)) {
@@ -609,8 +613,8 @@ var modifyRoundQuestion = function (api, connection, dbConnectionMap, next) {
  */
 var deleteRoundQuestion = function (api, connection, dbConnectionMap, next) {
     var helper = api.helper,
-      sqlParams = {},
-      questionId = Number(connection.params.questionId);
+        sqlParams = {},
+        questionId = Number(connection.params.questionId);
 
     async.waterfall([
         function (cb) {
@@ -631,6 +635,115 @@ var deleteRoundQuestion = function (api, connection, dbConnectionMap, next) {
     });
 };
 
+/**
+ * Checks if answer with specified ID exists in database.
+ *
+ * @param api the api instance.
+ * @param dbConnectionMap the database connection map.
+ * @param answerId - the answerId parameter.
+ * @param callback the callback method.
+ */
+function checkAnswerId(api, dbConnectionMap, answerId, callback) {
+    var helper = api.helper,
+        error = helper.checkIdParameter(answerId, "answerId");
+
+    async.waterfall([
+        function (cb) {
+            if (!error) {
+                api.dataAccess.executeQuery("get_answer_id", {answerId: answerId}, dbConnectionMap, cb);
+            } else {
+                cb(null, null);
+            }
+        }, function (results, cb) {
+            if (!error) {
+                if (results.length === 0) {
+                    error = new NotFoundError("The answerId does not exist in database.");
+                }
+            }
+            cb(error);
+        }
+    ], function (err) {
+        if (err) {
+            callback(err);
+            return;
+        }
+
+        callback(null, error);
+    });
+}
+
+/**
+ * Modify Round Question Answer.
+ *
+ * @param api the api instance.
+ * @param connection the connection instance.
+ * @param dbConnectionMap the database connection map.
+ * @param next the callback method.
+ */
+var modifyRoundQuestionAnswer = function (api, connection, dbConnectionMap, next) {
+    var helper = api.helper,
+        sqlParams = {},
+        answerId = Number(connection.params.answerId),
+        text = connection.params.text,
+        sortOrder = connection.params.sortOrder,
+        correct = connection.params.correct;
+
+    async.waterfall([
+        function (cb) {
+            cb(helper.checkAdmin(connection, 'Authorized information needed.', 'Admin access only.'));
+        }, function (cb) {
+            checkAnswerValues(api, text, sortOrder, correct, cb);
+        }, function (error, cb) {
+            checkAnswerId(api, dbConnectionMap, answerId, cb);
+        }, function (error, cb) {
+            sqlParams.answerId = answerId;
+            sqlParams.answerText = text;
+            sqlParams.sortOrder = sortOrder;
+            sqlParams.correct = (correct === true || correct.toLowerCase() === "true") ? 1 : 0;
+            api.dataAccess.executeQuery("update_answer", sqlParams, dbConnectionMap, cb);
+        }
+    ], function (err) {
+        if (err) {
+            helper.handleError(api, connection, err);
+        } else {
+            connection.response = {"success": true};
+        }
+        next(connection, true);
+    });
+};
+
+/**
+ * Delete Round Question Answer.
+ *
+ * @param api the api instance.
+ * @param connection the connection instance.
+ * @param dbConnectionMap the database connection map.
+ * @param next the callback method.
+ */
+var deleteRoundQuestionAnswer = function (api, connection, dbConnectionMap, next) {
+    var helper = api.helper,
+        sqlParams = {},
+        answerId = Number(connection.params.answerId);
+
+    async.waterfall([
+        function (cb) {
+            cb(helper.checkAdmin(connection, 'Authorized information needed.', 'Admin access only.'));
+        }, function (cb) {
+            cb(helper.checkIdParameter(answerId, 'answerId'));
+        }, function (cb) {
+            sqlParams.answerId = answerId;
+            api.dataAccess.executeQuery("delete_answer", sqlParams, dbConnectionMap, cb);
+        }
+    ], function (err, result) {
+        if (err) {
+            helper.handleError(api, connection, err);
+        } else {
+            connection.response = {"success": result > 0};
+        }
+        next(connection, true);
+    });
+};
+
 /**
  * The API for get Round Questions API.
  */
@@ -802,3 +915,54 @@ exports.deleteRoundQuestion = {
         }
     }
 };
+
+
+/**
+ * The API for Modify Round Question Answer API.
+ */
+exports.modifyRoundQuestionAnswer = {
+    name: "modifyRoundQuestionAnswer",
+    description: "Modify Round Question Answer",
+    inputs: {
+        required: ['answerId', 'text', 'sortOrder', 'correct'],
+        optional: []
+    },
+    blockedConnectionTypes: [],
+    outputExample: {},
+    version: 'v2',
+    transaction: 'write',
+    databases: ["informixoltp"],
+    run: function (api, connection, next) {
+        if (connection.dbConnectionMap) {
+            api.log("Execute modifyRoundQuestionAnswer#run", 'debug');
+            modifyRoundQuestionAnswer(api, connection, connection.dbConnectionMap, next);
+        } else {
+            api.helper.handleNoConnection(api, connection, next);
+        }
+    }
+};
+
+/**
+ * The API for Delete Round Question Answer API.
+ */
+exports.deleteRoundQuestionAnswer = {
+    name: "deleteRoundQuestionAnswer",
+    description: "Delete Round Question Answer",
+    inputs: {
+        required: ['answerId'],
+        optional: []
+    },
+    blockedConnectionTypes: [],
+    outputExample: {},
+    version: 'v2',
+    transaction: 'write',
+    databases: ["informixoltp"],
+    run: function (api, connection, next) {
+        if (connection.dbConnectionMap) {
+            api.log("Execute deleteRoundQuestionAnswer#run", 'debug');
+            deleteRoundQuestionAnswer(api, connection, connection.dbConnectionMap, next);
+        } else {
+            api.helper.handleNoConnection(api, connection, next);
+        }
+    }
+};

actions/user.js

@@ -365,10 +365,14 @@ function getUserIdentityByAuth0Id(api, connection, next) {
             }
         },
         function (result, cb) {
+            if (!result[0]) {
+                cb(notfound);
+            } else {
             userid = result[0].user_id
             api.dataAccess.executeQuery('get_user_email_and_handle', 
                 { userId: userid }, 
                 dbConnectionMap, cb);
+            }
         },
         function (rs, cb) {
             if (!rs[0]) {