Merge branch 'dev' of github.com:appirio-tech/tc-api into dev

Author: mdesiderio

actions/challenges.js

@@ -2237,7 +2237,7 @@ exports.getChallengeTerms = {
     description: "getChallengeTerms",
     inputs: {
         required: ["challengeId"],
-        optional: ["role"]
+        optional: ["role", "noauth"]
     },
     blockedConnectionTypes: [],
     outputExample: {},
@@ -2251,14 +2251,26 @@ exports.getChallengeTerms = {
             var challengeId = Number(connection.params.challengeId), role = connection.params.role, error;
             async.waterfall([
                 function (cb) {
-                    api.challengeHelper.getChallengeTerms(
-                        connection,
-                        challengeId,
-                        role,
-                        true,
-                        connection.dbConnectionMap,
-                        cb
-                    );
+                    if (connection.params.noauth) {
+                      api.challengeHelper.getChallengeTermsNoAuth(
+                          connection,
+                          challengeId,
+                          role,
+                          true,
+                          connection.dbConnectionMap,
+                          cb
+                      );
+                    }
+                    else {
+                      api.challengeHelper.getChallengeTerms(
+                          connection,
+                          challengeId,
+                          role,
+                          true,
+                          connection.dbConnectionMap,
+                          cb
+                      );
+                    }
                 }, function (results, cb) {
                     var res = _.find(results, function (row) {
                         return row.agreeabilityType === 'DocuSignable' && !row.templateId;

actions/terms.js

@@ -49,24 +49,25 @@ function validateTermsOfUseId(connection, helper, sqlParams, callback) {
 var getTermsOfUse = function (api, connection, dbConnectionMap, next) {
     var helper = api.helper,
         sqlParams = {},
-        result = {};
+        result = {},
+        noauth = connection.params.noauth == "true";
 
     //Check if the user is logged-in
-    if (connection.caller.accessLevel === "anon") {
+    if (!noauth && connection.caller.accessLevel === "anon") {
         helper.handleError(api, connection, new UnauthorizedError("Authentication credential was missing."));
         next(connection, true);
         return;
     }
 
-    sqlParams.userId = connection.caller.userId;
+    sqlParams.userId = connection.caller ? connection.caller.userId || '' : '';
 
     async.waterfall([
         function (cb) {
             // validate termsOfUseId parameter and set sql parameter
             validateTermsOfUseId(connection, helper, sqlParams, cb);
         },
         function (cb) {
-            api.dataAccess.executeQuery("get_terms_of_use", sqlParams, dbConnectionMap, cb);
+            api.dataAccess.executeQuery(noauth ? "get_terms_of_use_noauth" : "get_terms_of_use", sqlParams, dbConnectionMap, cb);
         }, function (rows, cb) {
             if (rows.length === 0) {
                 cb(new NotFoundError('No such terms of use exists.'));
@@ -211,7 +212,7 @@ exports.getTermsOfUse = {
     description: "getTermsOfUse",
     inputs: {
         required: ["termsOfUseId"],
-        optional: []
+        optional: ["noauth"]
     },
     blockedConnectionTypes: [],
     outputExample: {},

initializers/challengeHelper.js

@@ -228,7 +228,96 @@ exports.challengeHelper = function (api, next) {
                 }
                 next(null, result.terms);
             });
+        },
+        getChallengeTermsNoAuth : function (connection, challengeId, role, requireRegOpen, dbConnectionMap, next) {
+
+            var helper = api.helper,
+                sqlParams = {},
+                result = {},
+                userId = connection.caller.userId;
+
+            async.waterfall([
+                function (cb) {
+
+                    //Simple validations of the incoming parameters
+                    var error = helper.checkPositiveInteger(challengeId, 'challengeId') ||
+                        helper.checkMaxInt(challengeId, 'challengeId');
+
+                    if (error) {
+                        cb(error);
+                        return;
+                    }
+
+                    sqlParams.challengeId = challengeId;
+
+                    // We are here. So all validations have passed.
+                    // Next we get all roles
+                    api.dataAccess.executeQuery("all_resource_roles", {}, dbConnectionMap, cb);
+                }, function (rows, cb) {
+                    // Prepare a comma separated string of resource role names that must match
+                    var commaSepRoleIds = "",
+                        compiled = _.template("<%= resource_role_id %>,"),
+                        ctr = 0,
+                        resourceRoleFound;
+                    if (_.isUndefined(role)) {
+                        rows.forEach(function (row) {
+                            commaSepRoleIds += compiled({resource_role_id: row.resource_role_id});
+                            ctr += 1;
+                            if (ctr === rows.length) {
+                                commaSepRoleIds = commaSepRoleIds.slice(0, -1);
+                            }
+                        });
+                    } else {
+                        resourceRoleFound = _.find(rows, function (row) {
+                            return (row.name === role);
+                        });
+                        if (_.isUndefined(resourceRoleFound)) {
+                            //The role passed in is not recognized
+                            cb(new BadRequestError("The role: " + role + " was not found."));
+                            return;
+                        }
+                        commaSepRoleIds = resourceRoleFound.resource_role_id;
+                    }
+
+                    // Get the terms
+                    sqlParams.resourceRoleIds = commaSepRoleIds;
+                    api.dataAccess.executeQuery("challenge_terms_of_use_noauth", sqlParams, dbConnectionMap, cb);
+                }, function (rows, cb) {
+                    //We could just have down result.data = rows; but we need to change keys to camel case as per requirements
+                    result.terms = [];
+                    _.each(rows, function (row) {
+
+                        result.terms.push({
+                            termsOfUseId: row.terms_of_use_id,
+                            title: row.title,
+                            url: row.url,
+                            agreeabilityType: row.agreeability_type,
+                            agreed: row.agreed,
+                            templateId: row.docusign_template_id
+                        });
+                    });
+
+                    var ids = {};
+                    result.terms = result.terms.filter(function(row) {
+                      if (ids[row.termsOfUseId]) {
+                        return false;
+                      } else {
+                        ids[row.termsOfUseId] = true;
+                        return true;
+                      }
+                    });
+
+                    cb();
+                }
+            ], function (err) {
+                if (err) {
+                    next(err);
+                    return;
+                }
+                next(null, result.terms);
+            });
         }
+
     };
 
     next();

local/docker-compose.yml

@@ -0,0 +1,6 @@
+version: '2'
+services:
+    tc-api:
+        image: "node"
+        ports:
+            - "7777:7777"

queries/challenge_registration_validations

@@ -48,8 +48,10 @@ left outer join (
 -- Check coder's country
 left outer join (
 	informixoltp:coder coder join informixoltp:country country
-	on coder.comp_country_code=country.country_code
-	and country.country_name in ( "Iran", "North Korea", "Cuba", "Sudan", "Syria" )
+	on (
+        coder.comp_country_code=country.country_code OR
+        coder.home_country_code=country.country_code
+  ) and country.country_name in ( "Iran", "North Korea", "Cuba", "Sudan", "Syria" )
 ) on coder.coder_id = @userId@
 -- Get coder to check comp_country_code
 left outer join informixoltp:coder coder2 on coder2.coder_id = @userId@

queries/challenge_terms_of_use_noauth

@@ -0,0 +1,13 @@
+SELECT 	tou.terms_of_use_id as terms_of_use_id,
+	tou.title as title, 
+	tou.url as url,
+	touat.name as agreeability_type,
+    dtx.docusign_template_id
+FROM project_role_terms_of_use_xref
+INNER JOIN terms_of_use tou ON project_role_terms_of_use_xref.terms_of_use_id = tou.terms_of_use_id
+INNER JOIN terms_of_use_agreeability_type_lu touat ON touat.terms_of_use_agreeability_type_id = tou.terms_of_use_agreeability_type_id
+LEFT JOIN user_terms_of_use_xref utuox ON utuox.terms_of_use_id = tou.terms_of_use_id
+LEFT JOIN terms_of_use_docusign_template_xref dtx ON dtx.terms_of_use_id = project_role_terms_of_use_xref.terms_of_use_id
+WHERE project_id = @challengeId@ AND 
+resource_role_id IN (@resourceRoleIds@)
+ORDER BY group_ind, sort_order

queries/challenge_terms_of_use_noauth.json

@@ -0,0 +1,5 @@
+{
+    "name"    : "challenge_terms_of_use_noauth",
+    "db"      : "common_oltp",
+    "sqlfile" : "challenge_terms_of_use_noauth"
+}

queries/get_terms_of_use_noauth

@@ -0,0 +1,10 @@
+SELECT 	tou.terms_of_use_id as terms_of_use_id,
+	tou.title as title, 
+	tou.url as url,
+  tou.terms_text as text,
+    touat.terms_of_use_agreeability_type_id as agreeability_type_id,
+    toudtx.docusign_template_id as docusign_template_id
+FROM terms_of_use tou
+INNER JOIN terms_of_use_agreeability_type_lu touat ON touat.terms_of_use_agreeability_type_id = tou.terms_of_use_agreeability_type_id
+LEFT JOIN terms_of_use_docusign_template_xref toudtx ON toudtx.terms_of_use_id = tou.terms_of_use_id
+WHERE tou.terms_of_use_id = @termsOfUseId@

queries/get_terms_of_use_noauth.json

@@ -0,0 +1,5 @@
+{
+    "name"    : "get_terms_of_use_noauth",
+    "db"      : "common_oltp",
+    "sqlfile" : "get_terms_of_use_noauth"
+}

queries/get_user_basic_profile_achievements

@@ -4,7 +4,8 @@ SELECT
 , -1 as id
 FROM user_achievement ua
 JOIN coder AS c ON c.coder_id = ua.coder_id
-WHERE ua.achievement_type_id in (1,4,5,6,7,8,9) AND handle_lower = LOWER('@handle@') AND c.status = 'A'
+INNER JOIN achievement_type_lu atl ON atl.achievement_type_id = ua.achievement_type_id
+WHERE atl.badge = 1 AND handle_lower = LOWER('@handle@') AND c.status = 'A'
 
 UNION
 SELECT