Merge pull request #466 from topcoder-platform/develop

Hot fixes

Author: ThomasKranitsas

src/common/helper.js

@@ -843,20 +843,22 @@ function calculateChallengeEndDate (challenge, data) {
   if (!data) {
     data = challenge
   }
-  let phase = data.phases.slice(-1)[0]
-  if (!phase || (!data.startDate && !challenge.startDate)) {
-    return data.startDate || challenge.startDate
-  }
-  const phases = (challenge.phases || []).reduce((obj, elem) => {
-    obj[elem.id] = elem
-    return obj
-  }, {})
-  let result = moment(data.startDate || challenge.startDate)
-  while (phase) {
-    result.add(phase.duration || 0, 'seconds')
-    phase = phase.predecessor && phases[phase.predecessor]
-  }
-  return result.toDate()
+  let lastPhase = data.phases[data.phases.length - 1]
+  return lastPhase.actualEndDate || lastPhase.scheduledEndDate
+  // let phase = data.phases[data.phases.length - 1]
+  // if (!phase || (!data.startDate && !challenge.startDate)) {
+  //   return data.startDate || challenge.startDate
+  // }
+  // const phases = (challenge.phases || []).reduce((obj, elem) => {
+  //   obj[elem.id] = elem
+  //   return obj
+  // }, {})
+  // let result = moment(data.startDate || challenge.startDate)
+  // while (phase) {
+  //   result.add(phase.duration || 0, 'seconds')
+  //   phase = phase.predecessor ? phases[phase.predecessor] : null
+  // }
+  // return result.toDate()
 }
 
 /**

src/services/ChallengeService.js

@@ -590,7 +590,16 @@ async function searchChallenges (currentUser, criteria) {
               }
             },
             { bool: { must: { match_phrase: { 'createdBy': currentUser.handle } } } },
-          ] : [])
+          ] : [
+            {
+              bool: {
+                should: [
+                  { bool: { must: { match_phrase: { 'status': constants.challengeStatuses.Active } } } },
+                  { bool: { must: { match_phrase: { 'status': constants.challengeStatuses.Completed } } } },
+                ]
+              }
+            }
+          ])
         ]
       }
     })