Merge branch 'dev' of https://github.com/cloudspokes/tc-api into dev

mashannon168 · mashannon168 · commit b2f824422c4e · 2014-09-25T16:51:06.000-05:00
diff --git a/actions/challenges.js b/actions/challenges.js
@@ -1594,7 +1594,7 @@ var uploadForDevelopChallenge = function (api, connection, dbConnectionMap, next
             //Note 2 - this will also cover the case of private challenges
             //User will have role Submitter only if the user belongs to group of private challenge and is registered.
             if (!rows[0].is_user_submitter_for_challenge) {
-                cb(new ForbiddenError('You cannot submit for this challenge as you are not a Submitter.'));
+                cb(new ForbiddenError('You cannot submit for this challenge as you are not a submitter.'));
                 return;
             }
 
diff --git a/actions/rss.js b/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);
diff --git a/initializers/helper.js b/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
  */
diff --git a/queries/get_software_studio_challenges_rss b/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)
diff --git a/test/test.getChallengesRSS.js b/test/test.getChallengesRSS.js
@@ -1,8 +1,10 @@
 /*
  * Copyright (C) 2014 TopCoder Inc., All Rights Reserved.
  *
- * @version 1.0
+ * @version 1.1
  * @author  Ghost_141
+ * Changes in 1.1:
+ * - Add test case for technologies and platforms filter.
  */
 'use strict';
 /*global describe, it, before, beforeEach, after, afterEach */

Original file line number	Diff line number	Diff line change
`@@ -1594,7 +1594,7 @@ var uploadForDevelopChallenge = function (api, connection, dbConnectionMap, next`
`1594`	`1594`	`//Note 2 - this will also cover the case of private challenges`
`1595`	`1595`	`//User will have role Submitter only if the user belongs to group of private challenge and is registered.`
`1596`	`1596`	`if (!rows[0].is_user_submitter_for_challenge) {`
`1597`		`- cb(new ForbiddenError('You cannot submit for this challenge as you are not a Submitter.'));`
	`1597`	`+ cb(new ForbiddenError('You cannot submit for this challenge as you are not a submitter.'));`
`1598`	`1598`	`return;`
`1599`	`1599`	`}`
`1600`	`1600`