change challenge end date calculation logic

ThomasKranitsas · ThomasKranitsas · commit 766986ff7907 · 2022-02-11T13:40:23.000+02:00
diff --git a/src/common/helper.js b/src/common/helper.js
@@ -843,7 +843,7 @@ function calculateChallengeEndDate (challenge, data) {
   if (!data) {
     data = challenge
   }
-  let phase = data.phases.slice(-1)[0]
+  let phase = data.phases[data.phases.length - 1]
   if (!phase || (!data.startDate && !challenge.startDate)) {
     return data.startDate || challenge.startDate
   }
@@ -854,7 +854,7 @@ function calculateChallengeEndDate (challenge, data) {
   let result = moment(data.startDate || challenge.startDate)
   while (phase) {
     result.add(phase.duration || 0, 'seconds')
-    phase = phase.predecessor && phases[phase.predecessor]
+    phase = phase.predecessor ? phases[phase.predecessor] : null
   }
   return result.toDate()
 }

Original file line number	Diff line number	Diff line change
`@@ -843,7 +843,7 @@ function calculateChallengeEndDate (challenge, data) {`
`843`	`843`	`if (!data) {`
`844`	`844`	`data = challenge`
`845`	`845`	`}`
`846`		`- let phase = data.phases.slice(-1)[0]`
	`846`	`+ let phase = data.phases[data.phases.length - 1]`
`847`	`847`	`if (!phase \|\| (!data.startDate && !challenge.startDate)) {`
`848`	`848`	`return data.startDate \|\| challenge.startDate`
`849`	`849`	`}`
`@@ -854,7 +854,7 @@ function calculateChallengeEndDate (challenge, data) {`
`854`	`854`	`let result = moment(data.startDate \|\| challenge.startDate)`
`855`	`855`	`while (phase) {`
`856`	`856`	`result.add(phase.duration \|\| 0, 'seconds')`
`857`		`- phase = phase.predecessor && phases[phase.predecessor]`
	`857`	`+ phase = phase.predecessor ? phases[phase.predecessor] : null`
`858`	`858`	`}`
`859`	`859`	`return result.toDate()`
`860`	`860`	`}`