Skip to content

Commit 8375f2f

Browse files
authored
Merge pull request #574 from topcoder-platform/fix/phase-update
fix: phases
2 parents 99c8645 + f0f4dd7 commit 8375f2f

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

src/common/phase-helper.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,13 @@ class ChallengePhaseHelper {
185185
};
186186
if (_.isUndefined(phase.predecessor)) {
187187
if (_.isUndefined(_.get(phaseFromInput, "scheduledStartDate"))) {
188-
phase.scheduledStartDate = moment(startDate).toDate();
188+
phase.scheduledStartDate = moment(startDate).toDate().toISOString();
189189
} else {
190-
phase.scheduledStartDate = moment(_.get(phaseFromInput, "scheduledStartDate")).toDate();
190+
phase.scheduledStartDate = moment(_.get(phaseFromInput, "scheduledStartDate")).toDate().toISOString();
191191
}
192192
phase.scheduledEndDate = moment(phase.scheduledStartDate)
193193
.add(phase.duration, "seconds")
194-
.toDate();
194+
.toDate().toISOString();
195195
}
196196
return phase;
197197
});
@@ -209,7 +209,7 @@ class ChallengePhaseHelper {
209209
}
210210
phase.scheduledEndDate = moment(phase.scheduledStartDate)
211211
.add(phase.duration, "seconds")
212-
.toDate();
212+
.toDate().toISOString();
213213
}
214214
return finalPhases;
215215
}
@@ -236,36 +236,36 @@ class ChallengePhaseHelper {
236236
if (!_.isUndefined(phase.actualEndDate)) {
237237
return updatedPhase;
238238
}
239-
if (phase.name === "Iterative Review Phase") {
239+
if (updatedPhase.name === "Iterative Review Phase") {
240240
return updatedPhase;
241241
}
242-
const newPhase = _.find(newPhases, (p) => p.phaseId === phase.phaseId);
242+
const newPhase = _.find(newPhases, (p) => p.phaseId === updatedPhase.phaseId);
243243
if (_.isUndefined(newPhase) && !isBeingActivated) {
244244
return updatedPhase;
245245
}
246-
phase.duration = _.defaultTo(_.get(newPhase, "duration"), phase.duration);
247-
if (_.isUndefined(phase.predecessor)) {
246+
updatedPhase.duration = _.defaultTo(_.get(newPhase, "duration"), updatedPhase.duration);
247+
if (_.isUndefined(updatedPhase.predecessor)) {
248248
if (
249249
isBeingActivated &&
250250
moment(
251-
_.defaultTo(_.get(newPhase, "scheduledStartDate"), phase.scheduledStartDate)
251+
_.defaultTo(_.get(newPhase, "scheduledStartDate"), updatedPhase.scheduledStartDate)
252252
).isSameOrBefore(moment())
253253
) {
254-
phase.isOpen = true;
255-
phase.scheduledStartDate = moment().toDate();
256-
phase.actualStartDate = phase.scheduledStartDate;
254+
updatedPhase.isOpen = true;
255+
updatedPhase.scheduledStartDate = moment().toDate().toISOString();
256+
updatedPhase.actualStartDate = updatedPhase.scheduledStartDate;
257257
} else if (
258-
phase.isOpen === false &&
258+
updatedPhase.isOpen === false &&
259259
!_.isUndefined(_.get(newPhase, "scheduledStartDate"))
260260
) {
261-
phase.scheduledStartDate = moment(newPhase.scheduledStartDate).toDate();
261+
updatedPhase.scheduledStartDate = moment(newPhase.scheduledStartDate).toDate().toISOString();
262262
}
263-
phase.scheduledEndDate = moment(phase.scheduledStartDate)
264-
.add(phase.duration, "seconds")
265-
.toDate();
263+
updatedPhase.scheduledEndDate = moment(updatedPhase.scheduledStartDate)
264+
.add(updatedPhase.duration, "seconds")
265+
.toDate().toISOString();
266266
}
267267
if (!_.isUndefined(newPhase) && !_.isUndefined(newPhase.constraints)) {
268-
phase.constraints = newPhase.constraints;
268+
updatedPhase.constraints = newPhase.constraints;
269269
}
270270
return updatedPhase;
271271
});
@@ -282,7 +282,7 @@ class ChallengePhaseHelper {
282282
phase.scheduledStartDate = precedecessorPhase.scheduledEndDate;
283283
phase.scheduledEndDate = moment(phase.scheduledStartDate)
284284
.add(phase.duration, "seconds")
285-
.toDate();
285+
.toDate().toISOString();
286286
}
287287
return updatedPhases;
288288
}

0 commit comments

Comments
 (0)