Skip to content

Fix queue entry search regression and correct duplicate detection logic #93

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
shubhangiisinghh wants to merge 5 commits into
base: main
Choose a base branch
from
+38 −74
Open

Fix queue entry search regression and correct duplicate detection logic #93

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aaef9cc
Optimize getQueueEntries query to reduce joins from 59 to 11
shubhangiisinghh Feb 12, 2026
b60e373
Fix: Remove duplicate results from JOIN FETCH query
shubhangiisinghh Feb 18, 2026
13fc8d2
Fix: Deduplicate JOIN FETCH results using LinkedHashSet
shubhangiisinghh Feb 18, 2026
520ff21
Fix queue search regression and duplicate validation logic
shubhangiisinghh Feb 22, 2026
0860389
Simplify Hibernate Order usage by adding import and removing fully qu…
shubhangiisinghh Feb 25, 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
112 changes: 38 additions & 74 deletions api/src/main/java/org/openmrs/module/queue/api/dao/impl/QueueEntryDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,44 +9,40 @@
*/
package org.openmrs.module.queue.api.dao.impl;

import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.validation.constraints.NotNull;

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

import org.hibernate.Criteria;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
import org.openmrs.Patient;
import org.hibernate.query.Query;
import org.openmrs.module.queue.api.dao.QueueEntryDao;
import org.openmrs.module.queue.api.search.QueueEntrySearchCriteria;
import org.openmrs.module.queue.model.Queue;
import org.openmrs.module.queue.model.QueueEntry;
import org.springframework.beans.factory.annotation.Qualifier;

@SuppressWarnings("unchecked")
public class QueueEntryDaoImpl extends AbstractBaseQueueDaoImpl<QueueEntry> implements QueueEntryDao {

public QueueEntryDaoImpl(@Qualifier("sessionFactory") SessionFactory sessionFactory) {
super(sessionFactory);
}

@Override
@SuppressWarnings("unchecked")
public List<QueueEntry> getQueueEntries(QueueEntrySearchCriteria searchCriteria) {
Criteria c = createCriteriaFromSearchCriteria(searchCriteria);
c.addOrder(Order.desc("qe.sortWeight"));
c.addOrder(Order.asc("qe.startedAt"));
c.addOrder(Order.asc("qe.dateCreated"));
c.addOrder(Order.asc("qe.queueEntryId"));
return c.list();

Criteria criteria = createCriteriaFromSearchCriteria(searchCriteria);

criteria.addOrder(Order.desc("qe.sortWeight"));
criteria.addOrder(Order.asc("qe.startedAt"));
criteria.addOrder(Order.asc("qe.dateCreated"));
criteria.addOrder(Order.asc("qe.queueEntryId"));

return criteria.list();
}

@Override
Expand All @@ -57,81 +53,48 @@ public Long getCountOfQueueEntries(QueueEntrySearchCriteria searchCriteria) {
}

@Override
public List<QueueEntry> getOverlappingQueueEntries(QueueEntrySearchCriteria searchCriteria) {
Session session = getSessionFactory().getCurrentSession();
CriteriaBuilder cb = session.getCriteriaBuilder();
CriteriaQuery<QueueEntry> query = cb.createQuery(QueueEntry.class);
Root<QueueEntry> root = query.from(QueueEntry.class);
List<Predicate> predicates = new ArrayList<>();

predicates.add(cb.equal(root.get("voided"), false));

Collection<Queue> queues = searchCriteria.getQueues();
if (queues != null) {
if (queues.isEmpty()) {
predicates.add(root.get("queue").isNull());
} else {
predicates.add(root.get("queue").in(searchCriteria.getQueues()));
}
}
public boolean updateIfUnmodified(QueueEntry entity, Date lastModified) {

Patient patient = searchCriteria.getPatient();
if (patient != null) {
predicates.add(cb.equal(root.get("patient"), patient));
}
QueueEntry existing = getCurrentSession().get(QueueEntry.class, entity.getQueueEntryId());

Date startedAt = searchCriteria.getStartedOn();
if (startedAt != null) {
// any queue entries that have either not ended or end after this queue entry starts
predicates.add(cb.or(root.get("endedAt").isNull(), cb.greaterThan(root.get("endedAt"), startedAt)));
if (existing == null) {
return false;
}

query.where(cb.and(predicates.toArray(new Predicate[0])));
Date existingDate = existing.getDateChanged();

if (existingDate != null && lastModified != null && !existingDate.equals(lastModified)) {
return false;
}

return session.createQuery(query).list();
getCurrentSession().merge(entity);
return true;
}

@Override
public void flushSession() {
getSessionFactory().getCurrentSession().flush();
getCurrentSession().flush();
}

@Override
public boolean updateIfUnmodified(QueueEntry queueEntry, Date expectedDateChanged) {
Session session = getSessionFactory().getCurrentSession();

// Evict the entity to prevent Hibernate from auto-flushing changes
session.evict(queueEntry);

// Build conditional update query - only succeeds if dateChanged matches expected value
StringBuilder jpql = new StringBuilder();
jpql.append("UPDATE QueueEntry qe SET ");
jpql.append("qe.endedAt = :endedAt ");
jpql.append("WHERE qe.queueEntryId = :id ");

if (expectedDateChanged == null) {
jpql.append("AND qe.dateChanged IS NULL");
} else {
jpql.append("AND qe.dateChanged = :expectedDateChanged");
}
public List<QueueEntry> getOverlappingQueueEntries(@NotNull QueueEntrySearchCriteria searchCriteria) {

javax.persistence.Query query = session.createQuery(jpql.toString());
query.setParameter("endedAt", queueEntry.getEndedAt());
query.setParameter("id", queueEntry.getQueueEntryId());
if (expectedDateChanged != null) {
query.setParameter("expectedDateChanged", expectedDateChanged);
}
String hql = "SELECT qe FROM QueueEntry qe " + "WHERE qe.patient = :patient " + "AND qe.queue IN (:queues) "
+ "AND qe.voided = false " + "AND qe.endedAt IS NULL";

Query<QueueEntry> query = getCurrentSession().createQuery(hql, QueueEntry.class);

int rowsUpdated = query.executeUpdate();
return rowsUpdated > 0;
query.setParameter("patient", searchCriteria.getPatient());
query.setParameterList("queues", searchCriteria.getQueues());

return query.list();
}

/**
* Convert the given {@link QueueEntrySearchCriteria} into ORM criteria
*/
private Criteria createCriteriaFromSearchCriteria(QueueEntrySearchCriteria searchCriteria) {

Criteria c = getCurrentSession().createCriteria(QueueEntry.class, "qe");
c.createAlias("queue", "q");

includeVoidedObjects(c, searchCriteria.isIncludedVoided());
limitByCollectionProperty(c, "queue", searchCriteria.getQueues());
limitByCollectionProperty(c, "q.location", searchCriteria.getLocations());
Expand All @@ -145,20 +108,21 @@ private Criteria createCriteriaFromSearchCriteria(QueueEntrySearchCriteria searc
limitByCollectionProperty(c, "qe.queueComingFrom", searchCriteria.getQueuesComingFrom());
limitToGreaterThanOrEqualToProperty(c, "qe.startedAt", searchCriteria.getStartedOnOrAfter());
limitToLessThanOrEqualToProperty(c, "qe.startedAt", searchCriteria.getStartedOnOrBefore());
limitToEqualsProperty(c, "qe.startedAt", searchCriteria.getStartedOn());
limitToGreaterThanOrEqualToProperty(c, "qe.endedAt", searchCriteria.getEndedOnOrAfter());
limitToLessThanOrEqualToProperty(c, "qe.endedAt", searchCriteria.getEndedOnOrBefore());
limitToEqualsProperty(c, "qe.endedAt", searchCriteria.getEndedOn());

if (searchCriteria.getHasVisit() == Boolean.TRUE) {
c.add(Restrictions.isNotNull("qe.visit"));
} else if (searchCriteria.getHasVisit() == Boolean.FALSE) {
c.add(Restrictions.isNull("qe.visit"));
}

if (searchCriteria.getIsEnded() == Boolean.TRUE) {
c.add(Restrictions.isNotNull("qe.endedAt"));
} else if (searchCriteria.getIsEnded() == Boolean.FALSE) {
c.add(Restrictions.isNull("qe.endedAt"));
}

return c;
}
}