Merge branch 'master' into develop

Author: James Cori

src/common/helper.js

@@ -758,7 +758,7 @@ async function getProjectDefaultTerms (projectId) {
  * @param {Number} projectId The id of the project for which to get the default terms of use
  * @returns {Promise<Number>} The billing account ID
  */
-async function getProjectBillingInformation (projectId) { 
+async function getProjectBillingInformation (projectId) {
   const token = await getM2MToken()
   const projectUrl = `${config.PROJECTS_API_URL}/${projectId}/billingAccount`
   try {
@@ -865,7 +865,11 @@ async function _filterChallengesByGroupsAccess (currentUser, challenges) {
 async function ensureAccessibleByGroupsAccess (currentUser, challenge) {
   const filtered = await _filterChallengesByGroupsAccess(currentUser, [challenge])
   if (filtered.length === 0) {
-    throw new errors.ForbiddenError(`You don't have access to this group!`)
+    throw new errors.ForbiddenError(`helper ensureAcessibilityToModifiedGroups :: You don't have access to this group!
+      Current user: ${JSON.stringify(currentUser)}
+      Challenge: ${JSON.stringify(challenge)}
+      Filtered: ${JSON.stringify(filtered)}
+    `)
   }
 }
 

src/common/logger.js

@@ -90,14 +90,14 @@ logger.decorateWithLogging = (service) => {
   _.each(service, (method, name) => {
     const params = method.params || getParams(method)
     service[name] = async function () {
-      logger.debug(`ENTER ${name}`)
-      logger.debug('input arguments')
+      // logger.debug(`ENTER ${name}`)
+      // logger.debug('input arguments')
       const args = Array.prototype.slice.call(arguments)
       logger.debug(util.inspect(_sanitizeObject(_combineObject(params, args))))
       try {
         const result = await method.apply(this, arguments)
-        logger.debug(`EXIT ${name}`)
-        logger.debug('output arguments')
+        // logger.debug(`EXIT ${name}`)
+        // logger.debug('output arguments')
         if (result !== null && result !== undefined) {
           logger.debug(util.inspect(_sanitizeObject(result)))
         }
@@ -146,7 +146,7 @@ logger.decorateWithValidators = function (service) {
  */
 logger.buildService = (service) => {
   logger.decorateWithValidators(service)
-  logger.decorateWithLogging(service)
+  // logger.decorateWithLogging(service)
 }
 
 module.exports = logger

src/scripts/seed/TimelineTemplate.json

@@ -48,36 +48,10 @@
       {
         "phaseId": "aa5a3f78-79e0-4bf7-93ff-b11e8f5b398b",
         "predecessor": "6950164f-3c5e-4bdc-abc8-22aaf5a1bd49",
-        "defaultDuration": 259200
-      },
-      {
-        "phaseId": "1c24cfb3-5b0a-4dbd-b6bd-4b0dff5349c6",
-        "predecessor": "aa5a3f78-79e0-4bf7-93ff-b11e8f5b398b",
-        "defaultDuration": 86400
-      },
-      {
-        "phaseId": "797a6af7-cd3f-4436-9fca-9679f773bee9",
-        "predecessor": "1c24cfb3-5b0a-4dbd-b6bd-4b0dff5349c6",
-        "defaultDuration": 57600
-      },
-      {
-        "phaseId": "3e2afca6-9542-4763-a135-96b33f12c082",
-        "predecessor": "797a6af7-cd3f-4436-9fca-9679f773bee9",
-        "defaultDuration": 86400
-      },
-      {
-        "phaseId": "f3acaf26-1dd5-42ae-9f0d-8eb0fd24ae59",
-        "predecessor": "3e2afca6-9542-4763-a135-96b33f12c082",
-        "defaultDuration": 86400
-      },
-      {
-        "phaseId": "ad985cff-ad3e-44de-b54e-3992505ba0ae",
-        "predecessor": "f3acaf26-1dd5-42ae-9f0d-8eb0fd24ae59",
         "defaultDuration": 172800
       }
     ]
   },
-
   {
     "id": "6969125a-a12f-4b89-8de6-e66b0056f36b",
     "name": "Marathon Match",

src/services/ChallengeService.js

@@ -88,7 +88,11 @@ async function filterChallengesByGroupsAccess (currentUser, challenges) {
 async function ensureAccessibleByGroupsAccess (currentUser, challenge) {
   const filtered = await filterChallengesByGroupsAccess(currentUser, [challenge])
   if (filtered.length === 0) {
-    throw new errors.ForbiddenError(`You don't have access to this group!`)
+    throw new errors.ForbiddenError(`ensureAccessibleByGroupsAccess :: You don't have access to this group!
+      Current User: ${JSON.stringify(currentUser)}
+      Challenge: ${JSON.stringify(challenge)}
+      Filtered: ${JSON.stringify(filtered)}
+    `)
   }
 }
 
@@ -108,7 +112,12 @@ async function ensureAcessibilityToModifiedGroups (currentUser, data, challenge)
   const updatedGroups = _.difference(_.union(challenge.groups, data.groups), _.intersection(challenge.groups, data.groups))
   const filtered = updatedGroups.filter(g => !userGroupsIds.includes(g))
   if (filtered.length > 0) {
-    throw new errors.ForbiddenError(`You don't have access to this group!`)
+    throw new errors.ForbiddenError(`ensureAcessibilityToModifiedGroups :: You don't have access to this group!
+      Current User: ${JSON.stringify(currentUser)}
+      Data: ${JSON.stringify(data)}
+      Challenge: ${JSON.stringify(challenge)}
+      Filtered: ${JSON.stringify(filtered)}
+    `)
   }
 }
 
@@ -2054,4 +2063,4 @@ module.exports = {
   deleteChallenge
 }
 
-// logger.buildService(module.exports)
+logger.buildService(module.exports)