-
Notifications
You must be signed in to change notification settings - Fork 211
Clean up logs / PM-2525 #7134
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Clean up logs / PM-2525 #7134
Changes from all commits
2bfdd6d
71a7ac1
d614389
7afc90e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,9 @@ import moment from 'moment'; | |
| * @return {Date} | ||
| */ | ||
| export function phaseEndDate(phase) { | ||
| if (phase.actualEndDate) { | ||
| return new Date(phase.actualEndDate); | ||
| } | ||
| // Case 1: phase is still open. take the `scheduledEndDate` | ||
| // Case 2: phase is not open but `scheduledStartDate` is a future date. | ||
| // This means phase is not yet started. So take the `scheduledEndDate` | ||
|
|
@@ -17,7 +20,7 @@ export function phaseEndDate(phase) { | |
| return new Date(phase.scheduledEndDate); | ||
| } | ||
| // for other cases, take the `actualEndDate` as phase is already closed | ||
| return new Date(phase.scheduledEndDate || phase.actualEndDate); | ||
| return new Date(phase.actualEndDate || phase.scheduledEndDate); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -26,12 +29,15 @@ export function phaseEndDate(phase) { | |
| * @return {Date} | ||
| */ | ||
| export function phaseStartDate(phase) { | ||
| if (phase.actualStartDate) { | ||
| return new Date(phase.actualStartDate); | ||
| } | ||
| // Case 1: Phase is not yet started. take the `scheduledStartDate` | ||
| if (phase.isOpen !== true && moment(phase.scheduledStartDate).isAfter()) { | ||
| return new Date(phase.scheduledStartDate); | ||
| } | ||
| // For all other cases, take the `actualStartDate` as phase is already started | ||
| return new Date(phase.scheduledStartDate || phase.actualStartDate); | ||
| return new Date(phase.actualStartDate || phase.scheduledStartDate); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [❗❗ |
||
| } | ||
|
|
||
| /** | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[❗❗
correctness]The change in logic from
phase.scheduledEndDate || phase.actualEndDatetophase.actualEndDate || phase.scheduledEndDatecould potentially alter the behavior of the function. Ensure that this change is intentional and thatactualEndDateshould indeed take precedence overscheduledEndDatein all scenarios.