Merge pull request #431 from appirio-tech/revert-427-SUP-509-design-challenges-on-apple

Revert "SUP-605 show challenges where name includes technology"

Author: thabofletcher

actions/challenges.js

@@ -125,9 +125,7 @@ var QUERY_PATH = './queries/';
  */
 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@))';
-    
-var EXT_TECHNOLOGY_FILTER = ' AND (pn.value LIKE ("%@tech@%") OR 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.23
@@ -747,15 +745,14 @@ function transferResultV2(src, helper) {
  * @param {String} content - the content that need in template.
  * @since 1.23
  */
-var editSql = function (sql, template, content, tech) {
+var 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);
-        template = template.replace('@tech@', tech);
     }
     return sql.slice(0, index) + template + sql.slice(index, sql.length);
 };
@@ -779,13 +776,8 @@ var addFilter = function (sql, filter, isMyChallenges, helper, caller) {
 
     if (_.isDefined(filter.technologies)) {
         technology = filter.technologies.join(', ');
-        if (filter.tech) {
-            sql.count = editSql(sql.count, EXT_TECHNOLOGY_FILTER, technology, filter.tech);
-            sql.data = editSql(sql.data, EXT_TECHNOLOGY_FILTER, technology, filter.tech);            
-        } else {
-            sql.count = editSql(sql.count, TECHNOLOGY_FILTER, technology);
-            sql.data = editSql(sql.data, TECHNOLOGY_FILTER, technology);
-        }
+        sql.count = editSql(sql.count, TECHNOLOGY_FILTER, technology);
+        sql.data = editSql(sql.data, TECHNOLOGY_FILTER, technology);
     }
 
     if (_.isDefined(filter.challengeType)) {
@@ -3716,10 +3708,6 @@ var getChallenges = function (api, connection, listType, isMyChallenges, next) {
         },
         function (cb) {
             validateInputParameterV2(helper, caller, type, query, filter, pageIndex, pageSize, sortColumn, sortOrder, listType, dbConnectionMap, cb);
-            
-            if (filter.technologies) {
-                filter.tech = filter.technologies.split(',')[0];
-            }
         }, function (cb) {
             if (pageIndex === -1) {
                 pageIndex = 1;