Skip to content

fix: O3-5473 Optimize Queue Module database queries (Fix N+1 fetching and duplicate queries) #98

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

fix: O3-5473 Optimize Queue Module database queries (Fix N+1 fetching and duplicate queries) #98

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
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
10 changes: 4 additions & 6 deletions api/src/main/java/org/openmrs/module/queue/model/Queue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.List;
import java.util.stream.Collectors;

import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
Expand All @@ -34,7 +33,6 @@
import org.openmrs.Concept;
import org.openmrs.Location;

@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Setter
@Getter
Expand All @@ -49,19 +47,19 @@ public class Queue extends BaseChangeableOpenmrsMetadata {
@Column(name = "queue_id")
private Integer queueId;

@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "location_id", nullable = false)
private Location location;

@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "service", referencedColumnName = "concept_id", nullable = false)
private Concept service;

@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "priority_concept_set", referencedColumnName = "concept_id")
private Concept priorityConceptSet;

@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "status_concept_set", referencedColumnName = "concept_id")
private Concept statusConceptSet;

Expand Down
25 changes: 15 additions & 10 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 @@ -11,6 +11,7 @@

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
Expand All @@ -21,7 +22,6 @@

import java.util.Date;

import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
Expand All @@ -33,7 +33,6 @@
import org.openmrs.Provider;
import org.openmrs.Visit;

@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Setter
@Getter
Expand All @@ -50,26 +49,30 @@ public class QueueEntry extends BaseChangeableOpenmrsData {
private Integer queueEntryId;

@ToString.Exclude
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "queue_id", nullable = false)
private Queue queue;

@ManyToOne
@ToString.Exclude
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "patient_id", nullable = false)
private Patient patient;

@ManyToOne
@ToString.Exclude
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "visit_id")
private Visit visit;

@ManyToOne
@ToString.Exclude
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "priority", referencedColumnName = "concept_id", nullable = false)
private Concept priority;

@Column(name = "priority_comment")
private String priorityComment;

@ManyToOne
@ToString.Exclude
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "status", referencedColumnName = "concept_id", nullable = false)
private Concept status;

Expand All @@ -78,18 +81,20 @@ public class QueueEntry extends BaseChangeableOpenmrsData {
private Double sortWeight = 0.0;

//The Location the patient is waiting for, if any.
@ManyToOne
@ToString.Exclude
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "location_waiting_for", referencedColumnName = "location_id")
private Location locationWaitingFor;

//The Provider the patient is waiting for, if any.
@ManyToOne
@ToString.Exclude
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "provider_waiting_for", referencedColumnName = "provider_id")
private Provider providerWaitingFor;

//The queue the patient is coming from, if any.
@ToString.Exclude
@OneToOne
@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "queue_coming_from", referencedColumnName = "queue_id")
private Queue queueComingFrom;

Expand Down
5 changes: 2 additions & 3 deletions api/src/main/java/org/openmrs/module/queue/model/QueueRoom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,19 @@

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;

import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.openmrs.BaseChangeableOpenmrsMetadata;

@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Setter
@Getter
Expand All @@ -39,7 +38,7 @@ public class QueueRoom extends BaseChangeableOpenmrsMetadata {
@Column(name = "queue_room_id")
private Integer queueRoom;

@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "queue_id", nullable = false)
private Queue queue;

Expand Down