Skip to content

Commit aacf589

Browse files
authored
Merge pull request #607 from topcoder-platform/feat/constraint-sync
feat: sync phase constraints
2 parents ebc4b34 + 92c02f1 commit aacf589

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/common/phase-helper.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ class ChallengePhaseHelper {
5252
);
5353
if (
5454
!_.isUndefined(fixedStartDate) &&
55-
moment(scheduledStartDate).isBefore(moment(fixedStartDate))
55+
moment(scheduledStartDate).isSameOrBefore(moment(fixedStartDate))
5656
) {
57-
scheduledStartDate = fixedStartDate;
57+
scheduledStartDate = moment(fixedStartDate).add(5, "minutes").toDate().toISOString();
5858
}
5959
phase.scheduledStartDate = moment(scheduledStartDate).toDate().toISOString();
6060
phase.scheduledEndDate = moment(phase.scheduledStartDate)
@@ -108,7 +108,7 @@ class ChallengePhaseHelper {
108108
if (updatedPhase.name === "Post-Mortem") {
109109
updatedPhase.predecessor = "a93544bc-c165-4af4-b55e-18f3593b457a";
110110
}
111-
if (_.isUndefined(updatedPhase.actualEndDate) && updatedPhase.name !== "Iterative Review") {
111+
if (_.isUndefined(updatedPhase.actualEndDate)) {
112112
updatedPhase.duration = _.defaultTo(_.get(newPhase, "duration"), updatedPhase.duration);
113113
}
114114
if (_.isUndefined(updatedPhase.predecessor)) {
@@ -118,9 +118,9 @@ class ChallengePhaseHelper {
118118
);
119119
if (
120120
!_.isUndefined(fixedStartDate) &&
121-
moment(scheduledStartDate).isBefore(moment(fixedStartDate))
121+
moment(scheduledStartDate).isSameOrBefore(moment(fixedStartDate))
122122
) {
123-
scheduledStartDate = fixedStartDate;
123+
scheduledStartDate = moment(fixedStartDate).add(5, "minutes").toDate().toISOString();
124124
}
125125
if (isBeingActivated && moment(scheduledStartDate).isSameOrBefore(moment())) {
126126
updatedPhase.isOpen = true;
@@ -134,7 +134,11 @@ class ChallengePhaseHelper {
134134
.toDate()
135135
.toISOString();
136136
}
137-
if (!_.isUndefined(newPhase) && !_.isUndefined(newPhase.constraints)) {
137+
if (
138+
_.isUndefined(phase.actualEndDate) &&
139+
!_.isUndefined(newPhase) &&
140+
!_.isUndefined(newPhase.constraints)
141+
) {
138142
updatedPhase.constraints = newPhase.constraints;
139143
}
140144
if (_.isUndefined(fixedStartDate)) {

0 commit comments

Comments
 (0)