Merge branch 'technology-2014-10-02'

Author: ykohata

actions/rss.js

@@ -1,13 +1,16 @@
 /*
  * Copyright (C) 2014 TopCoder Inc., All Rights Reserved.
  *
- * @version 1.0
+ * @version 1.1
  * @author Ghost_141
+ * Changes in 1.1:
+ * - Add technologies and platforms filter.
  */
 "use strict";
 
 var async = require('async');
 var _ = require('underscore');
+var fs = require('fs');
 var BadRequestError = require('../errors/BadRequestError');
 var UnauthorizedError = require('../errors/UnauthorizedError');
 var ForbiddenError = require('../errors/ForbiddenError');
@@ -17,6 +20,38 @@ var ForbiddenError = require('../errors/ForbiddenError');
  */
 var VALID_CHALLENGE_TYPE = ['develop', 'design', 'data'];
 
+/**
+ * The technology filter for challenges api.
+ * @since 1.1
+ */
+var TECHNOLOGY_FILTER = ' AND EXISTS (SELECT DISTINCT 1 FROM comp_technology ct WHERE ct.comp_vers_id = pi1.value ' +
+    'AND ct.technology_type_id IN (@filter@))';
+
+/**
+ * The platform filter for challenges api.
+ * @since 1.1
+ */
+var PLATFORM_FILTER = ' AND EXISTS (SELECT 1 FROM project_platform pp WHERE pp.project_platform_id IN (@filter@) ' +
+    'AND p.project_id = pp.project_id)';
+
+/**
+ * Add tech filter and platform filter.
+ * @param query
+ * @param techId
+ * @param platformId
+ * @param helper
+ * @returns {*}
+ */
+function addFilter(query, techId, platformId, helper) {
+    if (_.isDefined(techId)) {
+        query = helper.editSql(query, TECHNOLOGY_FILTER, techId.join(','));
+    }
+    if (_.isDefined(platformId)) {
+        query = helper.editSql(query, PLATFORM_FILTER, platformId.join(','));
+    }
+    return query;
+}
+
 /**
  * Get the challenges RSS information.
  *
@@ -30,6 +65,10 @@ function getChallengesRSS(api, connection, next) {
         RSSMaxLength = api.config.tcConfig.maxRSSLength,
         positionsRemain = RSSMaxLength,
         challengeType = connection.params.challengeType,
+        technologies = connection.params.technologies,
+        techId,
+        platforms = connection.params.platforms,
+        platformId,
         listType = (connection.params.listType || helper.ListType.OPEN).toUpperCase(),
         copyToResult = function (queryResults) {
             if (positionsRemain > 0) {
@@ -68,51 +107,78 @@ function getChallengesRSS(api, connection, next) {
                 error = helper.checkContains(VALID_CHALLENGE_TYPE, challengeType.toLowerCase(), 'challengeType');
             }
             error = error || helper.checkContains(helper.VALID_LIST_TYPE, listType, 'listType');
-            if (error) {
-                cb(error);
-                return;
-            }
 
             challengeType = (challengeType || 'all').toLowerCase();
-
+            cb(error);
+        },
+        function (cb) {
+            if (!_.isUndefined(technologies)) {
+                helper.getCatalogCachedValue(technologies.split(','), dbConnectionMap, 'technologies', cb);
+            } else {
+                cb(null, null);
+            }
+        },
+        function (id, cb) {
+            if (_.isDefined(techId)) {
+                techId = id;
+            }
+            if (!_.isUndefined(platforms)) {
+                helper.getCatalogCachedValue(platforms.split(','), dbConnectionMap, 'platforms', cb);
+            } else {
+                cb(null, null);
+            }
+        },
+        function (id, cb) {
+            if (_.isDefined(id)) {
+                platformId = id;
+            }
+            helper.readQuery('get_software_studio_challenges_rss', cb);
+        },
+        function (q, cb) {
+            q = addFilter(q, techId, platformId, helper);
+            // edit the sql
             async.parallel({
                 design: function (cbx) {
                     if (challengeType === 'design' || challengeType === 'all') {
-                        api.dataAccess.executeQuery('get_software_studio_challenges_rss',
+                        api.dataAccess.executeSqlQuery(q,
                             {
                                 page_size: RSSMaxLength,
                                 project_status_id: helper.LIST_TYPE_PROJECT_STATUS_MAP[listType],
                                 project_type_id: helper.studio.category,
                                 registration_phase_status: helper.LIST_TYPE_REGISTRATION_STATUS_MAP[listType]
-                            }, dbConnectionMap, cbx);
+                            }, 'tcs_catalog', dbConnectionMap, cbx);
                     } else {
                         cbx();
                     }
                 },
                 develop: function (cbx) {
                     if (challengeType === 'develop' || challengeType === 'all') {
-                        api.dataAccess.executeQuery('get_software_studio_challenges_rss',
+                        api.dataAccess.executeSqlQuery(q,
                             {
                                 page_size: RSSMaxLength,
                                 project_status_id: helper.LIST_TYPE_PROJECT_STATUS_MAP[listType],
                                 project_type_id: helper.software.category,
                                 registration_phase_status: helper.LIST_TYPE_REGISTRATION_STATUS_MAP[listType]
-                            }, dbConnectionMap, cbx);
+                            }, 'tcs_catalog', dbConnectionMap, cbx);
                     } else {
                         cbx();
                     }
                 },
                 data: function (cbx) {
-                    if (challengeType === 'data' || challengeType === 'all') {
-                        if (listType === helper.ListType.PAST) {
-                            api.dataAccess.executeQuery('get_past_data_challenges_rss', { page_size: RSSMaxLength }, dbConnectionMap, cbx);
-                        } else if (listType === helper.ListType.OPEN || listType === helper.ListType.ACTIVE) {
-                            api.dataAccess.executeQuery('get_open_data_challenges_rss', { page_size: RSSMaxLength }, dbConnectionMap, cbx);
+                    if (_.isDefined(techId) || _.isDefined(platformId)) {
+                        cbx();
+                    } else {
+                        if (challengeType === 'data' || challengeType === 'all') {
+                            if (listType === helper.ListType.PAST) {
+                                api.dataAccess.executeQuery('get_past_data_challenges_rss', { page_size: RSSMaxLength }, dbConnectionMap, cbx);
+                            } else if (listType === helper.ListType.OPEN || listType === helper.ListType.ACTIVE) {
+                                api.dataAccess.executeQuery('get_open_data_challenges_rss', { page_size: RSSMaxLength }, dbConnectionMap, cbx);
+                            } else {
+                                cbx();
+                            }
                         } else {
                             cbx();
                         }
-                    } else {
-                        cbx();
                     }
                 }
             }, cb);

actions/srmChallenges.js

@@ -1,8 +1,8 @@
 /*
  * Copyright (C) 2013-2014 TopCoder Inc., All Rights Reserved.
  *
- * @version 1.5
- * @author Sky_, freegod, panoptimum
+ * @version 1.6
+ * @author Sky_, freegod, panoptimum, Ghost_141
  * changes in 1.1:
  * - implement srm API
  * changes in 1.2:
@@ -20,6 +20,8 @@
  *   - load round access api
  * changes in 1.5
  * - added API for retrieving SRM schedule
+ * Changes in 1.6:
+ * - Update search srm challenges api to use informixoltp database.
  */
 /*jslint node: true, nomen: true */
 "use strict";
@@ -177,17 +179,17 @@ exports.searchSRMChallenges = {
     description: "searchSRMChallenges",
     inputs: {
         required: [],
-        optional: ["pageSize", "pageIndex", "sortColumn", "sortOrder"]
+        optional: ["pageSize", "pageIndex", "sortColumn", "sortOrder", "listType"]
     },
     blockedConnectionTypes: [],
     outputExample: {},
     version: 'v2',
     transaction: 'read', // this action is read-only
-    databases: ["topcoder_dw"],
+    databases: ["informixoltp"],
     run: function (api, connection, next) {
         api.log("Execute searchSRMChallenges#run", 'debug');
-        var helper = api.helper, params = connection.params, sqlParams,
-            pageIndex, pageSize, sortColumn, sortOrder, error, result,
+        var helper = api.helper, params = connection.params, sqlParams, listType,
+            pageIndex, pageSize, sortColumn, sortOrder, error, result, status,
             dbConnectionMap = connection.dbConnectionMap;
         if (!dbConnectionMap) {
             helper.handleNoConnection(api, connection, next);
@@ -202,11 +204,18 @@ exports.searchSRMChallenges = {
         }
         pageIndex = Number(params.pageIndex || 1);
         pageSize = Number(params.pageSize || DEFAULT_PAGE_SIZE);
+        listType = (params.listType || 'ACTIVE').toUpperCase();
 
         if (!_.isDefined(params.sortOrder) && sortColumn === "roundid") {
             sortOrder = "desc";
         }
 
+        if (listType === helper.ListType.ACTIVE) {
+            status = 'A';
+        } else {
+            status = 'F';
+        }
+
         async.waterfall([
             function (cb) {
                 var allowedSort = helper.getLowerCaseList(ALLOWABLE_SORT_COLUMN);
@@ -219,6 +228,7 @@ exports.searchSRMChallenges = {
                     helper.checkPageIndex(pageIndex, "pageIndex") ||
                     helper.checkPositiveInteger(pageSize, "pageSize") ||
                     helper.checkContains(["asc", "desc"], sortOrder, "sortOrder") ||
+                    helper.checkContains([helper.ListType.ACTIVE, helper.ListType.UPCOMING], listType, 'listType') ||
                     helper.checkContains(allowedSort, sortColumn, "sortColumn");
                 if (error) {
                     cb(error);
@@ -233,7 +243,8 @@ exports.searchSRMChallenges = {
                     firstRowIndex: (pageIndex - 1) * pageSize,
                     pageSize: pageSize,
                     sortColumn: helper.getSortColumnDBName(sortColumn),
-                    sortOrder: sortOrder
+                    sortOrder: sortOrder,
+                    status: status
                 };
 
                 async.parallel({

apiary.apib

@@ -6341,7 +6341,7 @@ Request
 ### View Algorithm SRM Challenges [GET]
 
 + Parameters
-    + listType (optional, string, `Active`) ... The type of challenges to search. It can only be 'ACTIVE', 'OPEN', 'PAST' or 'UPCOMING'. If it's null, 'Active' will be used.
+    + listType (optional, string, `Active`) ... The type of challenges to search. It can only be 'ACTIVE' or 'UPCOMING'. If it's null, 'Active' will be used.
     + filter (optional, string, `type`) ... Key of the filter key-value pair
     + value (optional, string, `Development`) ... Value of the filter key-value pair
     + pageIndex (optional, number, `1`) ... The paging number, 1-based, -1 if no paging. It can be null.

config/servers/web.js

@@ -54,6 +54,9 @@ exports.default = {
                 // When true, returnErrorCodes will modify the response header for http(s) clients if connection.error is not null.
                 //  You can also set connection.rawConnection.responseHttpCode to specify a code per request.
                 returnErrorCodes: false
+                ,
+                // http(s).Server#timeout
+                timeout: 4 * 60 * 1000
             };
         }
     }

initializers/configurator.js

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2013 - 2014 TopCoder Inc., All Rights Reserved.
+ *
+ * @version 1.0
+ * @author kohata
+ */
+"use strict";
+
+exports.configurator = function(api, next){
+
+	api.configurator = {
+		_start: function(api, next){
+			this.configWeb(api);
+			next();
+		},
+		configWeb: function(api){
+			if(!api.servers || !api.servers.servers['web'] || !api.servers.servers['web'].server) {
+				api.log('[configurator] web server has not been created.', 'warning');
+				return;
+			}
+			
+			var timeout = api.config.servers.web.timeout || 10 * 60 * 1000;
+			
+			api.servers.servers['web'].server.timeout = timeout;
+		    api.log('[configurator] web.server#timeout => '+timeout, 'info');
+		}
+	};
+
+	next();
+}

initializers/helper.js

@@ -6,7 +6,7 @@
 /**
  * This module contains helper functions.
  * @author Sky_, Ghost_141, muzehyun, kurtrips, isv, LazyChild, hesibo, panoptimum, flytoj2ee
- * @version 1.37
+ * @version 1.38
  * changes in 1.1:
  * - add mapProperties
  * changes in 1.2:
@@ -99,6 +99,8 @@
  * - Updated apiName2dbNameMap to add entries for registration_start_date and challenge_community columns
  * - Updated formatDateWithTimezone function to accept optional 'format' parameter.
  * - Updated checkDates function to accept optional 'errorMessage' parameter.
+ * Changes in 1.38:
+ * - Add method editSql, readQuery and constant QUERY_PATH.
  */
 "use strict";
 
@@ -1699,6 +1701,41 @@ helper.checkSortColumn = function (sortColumns, sortColumn) {
     return null;
 };
 
+/**
+ * Add template into sql.
+ * @param {String} sql - the sql query.
+ * @param {String} template - the template that will insert into sql
+ * @param {String} content - the content that need in template.
+ * @since 1.38
+ */
+helper.editSql = function (sql, template, content) {
+    // For empty sql just return it.
+    if (sql.length === 0) {
+        return sql;
+    }
+    var index = sql.toLowerCase().indexOf('order by');
+    if (!_.isUndefined(template)) {
+        template = template.replace('@filter@', content);
+    }
+    return sql.slice(0, index) + template + sql.slice(index, sql.length);
+};
+
+/**
+ * The path that store all query files.
+ * @since 1.38
+ */
+helper.QUERY_PATH = './queries/';
+
+/**
+ * Read the query from file name.
+ * @param {String} name - The file that store the query under queries folder.
+ * @param {Function} cb - The callback function.
+ * @since 1.38
+ */
+helper.readQuery = function (name, cb) {
+    fs.readFile(helper.QUERY_PATH + name, 'utf8', cb);
+};
+
 /*
  * this is the random int generator class
  */

package.json

@@ -26,7 +26,7 @@
     "bigdecimal": "0.6.x",
     "bignum": "0.6.x",
     "java": "0.3.x",
-    "informix-wrapper": "git://github.com/cloudspokes/informix-wrapper.git#33e1a9a1a8131b4a9580ca959f8b597ae22351d3",
+    "informix-wrapper": "git://github.com/cloudspokes/informix-wrapper.git#469300dbd4913c5d467b6957bc4610d95c3923ed",
     "forums-wrapper": "git://github.com/cloudspokes/forums-wrapper.git#12b57be495c2e10431173522bc9eff60e0575959",
     "asn1": "*",
     "crypto": "0.0.x",

queries/get_software_studio_challenges_rss

@@ -10,6 +10,7 @@ FIRST @page_size@
 , pcl.project_type_id
 FROM project p
 INNER JOIN project_category_lu pcl ON pcl.project_category_id = p.project_category_id
+INNER JOIN project_info pi1 ON pi1.project_id = p.project_id AND pi1.project_info_type_id = 1
 INNER JOIN project_info pi ON pi.project_info_type_id = 6 AND p.project_id = pi.project_id
 INNER JOIN project_phase pp1 ON pp1.project_id = p.project_id AND pp1.phase_type_id = 1
 LEFT JOIN project_spec ps ON ps.project_id = p.project_id and ps.version = (select max(version) from project_spec where project_id = p.project_id)