Skip to content

O3-5485 Fix NaN average wait time when all queue entries have null endedAt #102

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
RoshanMadival08 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

O3-5485 Fix NaN average wait time when all queue entries have null endedAt #102

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
10 changes: 9 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 @@ -62,16 +62,24 @@ public static double computeAverageWaitTimeInMinutes(List<QueueEntry> queueEntri
if (queueEntries != null && !queueEntries.isEmpty()) {
double totalWaitTime = 0.0;
int numEntries = 0;

for (QueueEntry e : queueEntries) {
LocalDateTime startedAt = convertToLocalDateTimeInSystemDefaultTimezone(e.getStartedAt());
LocalDateTime endedAt = convertToLocalDateTimeInSystemDefaultTimezone(e.getEndedAt());

if (startedAt != null && endedAt != null) {
totalWaitTime += Duration.between(startedAt, endedAt).toMinutes();
numEntries++;
}
}
averageWaitTime = totalWaitTime / numEntries;

if (numEntries == 0) {
averageWaitTime = 0.0;
} else {
averageWaitTime = totalWaitTime / numEntries;
}
}

return averageWaitTime;
}

Expand Down
28 changes: 28 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,12 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;

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

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

public class QueueUtilsTest {

Expand Down Expand Up @@ -52,4 +55,29 @@ public void shouldReturnTrueIfDatesOverlap() {
assertThat(QueueUtils.datesOverlap(AUG_3, AUG_4, AUG_1, AUG_2), is(false)); // one after two
assertThat(QueueUtils.datesOverlap(AUG_1, AUG_2, AUG_1, AUG_3), is(true)); // one starts when two starts
}

@Test
public void shouldReturnZeroWhenQueueEntriesListIsEmpty() {

List<QueueEntry> entries = new ArrayList<>();

double result = QueueUtils.computeAverageWaitTimeInMinutes(entries);

assertThat(result, is(0.0));
}

@Test
public void shouldReturnZeroWhenAllEntriesHaveNullEndedAt() {

QueueEntry entry = new QueueEntry();
entry.setStartedAt(new Date());
entry.setEndedAt(null);

List<QueueEntry> entries = new ArrayList<>();
entries.add(entry);

double result = QueueUtils.computeAverageWaitTimeInMinutes(entries);

assertThat(result, is(0.0));
}
}