Skip to content

fix: O3-5485 Fix NaN return from computeAverageWaitTimeInMinutes when no entries have endedAt #99

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.

Sign up for GitHub

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

Open
sanks011 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: O3-5485 Fix NaN return from computeAverageWaitTimeInMinutes when no entries have endedAt #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion api/src/main/java/org/openmrs/module/queue/utils/QueueUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ public static double computeAverageWaitTimeInMinutes(List<QueueEntry> queueEntri
numEntries++;
}
}
averageWaitTime = totalWaitTime / numEntries;
if (numEntries > 0) {
averageWaitTime = totalWaitTime / numEntries;
}
}
return averageWaitTime;
}
Expand Down
57 changes: 57 additions & 0 deletions api/src/test/java/org/openmrs/module/queue/utils/QueueUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;

import org.junit.Test;
import org.openmrs.module.queue.model.QueueEntry;

public class QueueUtilsTest {

Expand All @@ -28,6 +32,59 @@ public class QueueUtilsTest {

private static final Date AUG_4 = QueueUtils.parseDate("2023-08-04 10:00:00");

@Test
public void computeAverageWaitTime_shouldReturnZeroForNullList() {
assertThat(QueueUtils.computeAverageWaitTimeInMinutes(null), is(0.0));
}

@Test
public void computeAverageWaitTime_shouldReturnZeroForEmptyList() {
assertThat(QueueUtils.computeAverageWaitTimeInMinutes(Collections.emptyList()), is(0.0));
}

@Test
public void computeAverageWaitTime_shouldReturnZeroWhenAllEntriesHaveNullEndedAt() {
QueueEntry entry = new QueueEntry();
entry.setStartedAt(AUG_1);
entry.setEndedAt(null);
List<QueueEntry> entries = Collections.singletonList(entry);
assertThat(QueueUtils.computeAverageWaitTimeInMinutes(entries), is(0.0));
}

@Test
public void computeAverageWaitTime_shouldReturnCorrectAverageForEntriesWithEndedAt() {
// AUG_1 to AUG_2 = 1440 minutes (24 hours)
QueueEntry entry1 = new QueueEntry();
entry1.setStartedAt(AUG_1);
entry1.setEndedAt(AUG_2);
// AUG_1 to AUG_3 = 2880 minutes (48 hours)
QueueEntry entry2 = new QueueEntry();
entry2.setStartedAt(AUG_1);
entry2.setEndedAt(AUG_3);
List<QueueEntry> entries = new ArrayList<>();
entries.add(entry1);
entries.add(entry2);
// Average = (1440 + 2880) / 2 = 2160
assertThat(QueueUtils.computeAverageWaitTimeInMinutes(entries), is(2160.0));
}

@Test
public void computeAverageWaitTime_shouldSkipEntriesWithNullEndedAt() {
// AUG_1 to AUG_2 = 1440 minutes
QueueEntry entry1 = new QueueEntry();
entry1.setStartedAt(AUG_1);
entry1.setEndedAt(AUG_2);
// This one has null endedAt, should be skipped
QueueEntry entry2 = new QueueEntry();
entry2.setStartedAt(AUG_1);
entry2.setEndedAt(null);
List<QueueEntry> entries = new ArrayList<>();
entries.add(entry1);
entries.add(entry2);
// Only entry1 counts: average = 1440 / 1 = 1440
assertThat(QueueUtils.computeAverageWaitTimeInMinutes(entries), is(1440.0));
}

@Test
public void shouldReturnTrueIfDatesOverlap() {
// Test that nulls are handled as open-ended dates
Expand Down