Skip to content

O3-5696: Fix Wrong ORM mapping, duplicate DB lookup & null crash #115

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
UjjawalPrabhat wants to merge 3 commits into
base: main
Choose a base branch
from
Open

O3-5696: Fix Wrong ORM mapping, duplicate DB lookup & null crash #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70b8582
O3-5696: Fix ORM mapping, duplicate UUID query and null-patient displ…
UjjawalPrabhat Jun 3, 2026
e0c6da7
O3-5696: Apply the null-patient display guard to QueueEntrySubResource
UjjawalPrabhat Jul 30, 2026
e79b625
O3-5696: Cover the no-unvoided-name display branch
UjjawalPrabhat Aug 16, 2026
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
1 change: 0 additions & 1 deletion api/src/main/java/org/openmrs/module/queue/api/dao/impl/AbstractBaseQueueDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ public Optional<Q> get(int id) {
public Optional<Q> get(@NotNull String uuid) {
Criteria criteria = getCurrentSession().createCriteria(getClazz());
includeVoidedObjects(criteria, false);
criteria.add(eq("uuid", uuid)).uniqueResult();
return Optional.ofNullable((Q) criteria.add(eq("uuid", uuid)).uniqueResult());
}

Expand Down
3 changes: 1 addition & 2 deletions api/src/main/java/org/openmrs/module/queue/model/QueueEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToOne;
import javax.persistence.Table;

import java.util.Date;
Expand Down Expand Up @@ -89,7 +88,7 @@ public class QueueEntry extends BaseChangeableOpenmrsData {

//The queue the patient is coming from, if any.
@ToString.Exclude
@OneToOne
@ManyToOne
Comment thread
UjjawalPrabhat marked this conversation as resolved.
@JoinColumn(name = "queue_coming_from", referencedColumnName = "queue_id")
private Queue queueComingFrom;

Expand Down
9 changes: 7 additions & 2 deletions omod/src/main/java/org/openmrs/module/queue/web/resources/QueueEntryResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import io.swagger.models.properties.StringProperty;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.openmrs.Patient;
import org.openmrs.PersonName;
import org.openmrs.api.context.Context;
import org.openmrs.module.queue.api.QueueServicesWrapper;
Expand Down Expand Up @@ -281,8 +282,12 @@ private void addSharedResourceDescriptionProperties(DelegatingResourceDescriptio

@PropertyGetter("display")
public String getDisplay(QueueEntry queueEntry) {
PersonName personName = queueEntry.getPatient().getPersonName();
return (personName == null ? queueEntry.getPatient().toString() : personName.getFullName());
Patient patient = queueEntry.getPatient();
if (patient == null) {
return queueEntry.getUuid();
}
Comment thread
UjjawalPrabhat marked this conversation as resolved.
PersonName personName = patient.getPersonName();
return (personName == null ? patient.toString() : personName.getFullName());
}

@PropertyGetter("previousQueueEntry")
Expand Down
10 changes: 7 additions & 3 deletions omod/src/main/java/org/openmrs/module/queue/web/resources/QueueEntrySubResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import io.swagger.models.ModelImpl;
import io.swagger.models.properties.*;
import lombok.Setter;
import org.openmrs.Patient;
import org.openmrs.PersonName;
import org.openmrs.api.context.Context;
import org.openmrs.module.queue.api.QueueServicesWrapper;
import org.openmrs.module.queue.api.search.QueueEntrySearchCriteria;
Expand Down Expand Up @@ -232,10 +234,12 @@ public Model getGETModel(Representation rep) {
@PropertyGetter("display")
public String getDisplay(QueueEntry queueEntry) {
//Display patient name
if (queueEntry.getPatient().getPerson().getPersonName() == null) {
return "";
Patient patient = queueEntry.getPatient();
if (patient == null) {
return queueEntry.getUuid();
}
return queueEntry.getPatient().getPerson().getPersonName().getFullName();
PersonName personName = patient.getPersonName();
return (personName == null ? patient.toString() : personName.getFullName());
}

@Override
Expand Down
14 changes: 14 additions & 0 deletions omod/src/test/java/org/openmrs/module/queue/web/resources/QueueEntryResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,20 @@ public void shouldSearchQueueEntriesByIncludeVoidedFalse() {
assertThat(criteria.isIncludedVoided(), equalTo(false));
}

@Test
public void shouldReturnUuidForDisplayWhenPatientIsNull() {
assertThat(resource.getDisplay(queueEntry), is(QUEUE_ENTRY_UUID));
}

@Test
public void shouldReturnPatientToStringForDisplayWhenPatientHasNoUnvoidedName() {
Patient patient = new Patient();
patient.setPatientId(7);
queueEntry.setPatient(patient);

assertThat(resource.getDisplay(queueEntry), is("Patient#7"));
}

@Test
public void shouldInstantiateNewDelegate() {
assertThat(getResource().newDelegate(), notNullValue());
Expand Down
15 changes: 15 additions & 0 deletions omod/src/test/java/org/openmrs/module/queue/web/resources/QueueEntrySubResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.openmrs.Patient;
import org.openmrs.api.ConceptService;
import org.openmrs.api.LocationService;
import org.openmrs.api.PatientService;
Expand Down Expand Up @@ -143,6 +144,20 @@ public void shouldCreateNewResource() {
assertThat(newlyCreatedObject.getUuid(), is(QUEUE_ENTRY_UUID));
}

@Test
public void shouldReturnUuidForDisplayWhenPatientIsNull() {
assertThat(getResource().getDisplay(queueEntry), is(QUEUE_ENTRY_UUID));
}

@Test
public void shouldReturnPatientToStringForDisplayWhenPatientHasNoUnvoidedName() {
Patient patient = new Patient();
patient.setPatientId(7);
when(queueEntry.getPatient()).thenReturn(patient);

assertThat(getResource().getDisplay(queueEntry), is("Patient#7"));
}

@Test
public void shouldInstantiateNewDelegate() {
assertThat(getResource().newDelegate(), notNullValue());
Expand Down