-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove VisitQueueEntry as a separate entity in favor of an optional p…
…roperty on QueueEntry; add additional searching capabilities; adjust web service resources to reflect changes.
- Loading branch information
Showing
38 changed files
with
1,071 additions
and
1,713 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
151 changes: 151 additions & 0 deletions
151
api/src/main/java/org/openmrs/module/queue/api/QueueServicesWrapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| /* | ||
| * This Source Code Form is subject to the terms of the Mozilla Public License, | ||
| * v. 2.0. If a copy of the MPL was not distributed with this file, You can | ||
| * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http://openmrs.org/license. | ||
| * | ||
| * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS | ||
| * graphic logo is a trademark of OpenMRS Inc. | ||
| */ | ||
| package org.openmrs.module.queue.api; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import lombok.Getter; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.openmrs.Concept; | ||
| import org.openmrs.Location; | ||
| import org.openmrs.Patient; | ||
| import org.openmrs.api.ConceptService; | ||
| import org.openmrs.api.LocationService; | ||
| import org.openmrs.api.PatientService; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.beans.factory.annotation.Qualifier; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| @Component | ||
| @Getter | ||
| public class QueueServicesWrapper { | ||
|
|
||
| private final QueueService queueService; | ||
|
|
||
| private final QueueEntryService queueEntryService; | ||
|
|
||
| private final QueueRoomService queueRoomService; | ||
|
|
||
| private final RoomProviderMapService roomProviderMapService; | ||
|
|
||
| private final ConceptService conceptService; | ||
|
|
||
| private final LocationService locationService; | ||
|
|
||
| private final PatientService patientService; | ||
|
|
||
| @Autowired | ||
| public QueueServicesWrapper(@Qualifier("queue.QueueService") QueueService queueService, | ||
| @Qualifier("queue.QueueEntryService") QueueEntryService queueEntryService, | ||
| @Qualifier("queue.QueueRoomService") QueueRoomService queueRoomService, | ||
| @Qualifier("queue.RoomProviderMapService") RoomProviderMapService roomProviderMapService, | ||
| ConceptService conceptService, LocationService locationService, PatientService patientService) { | ||
| this.queueService = queueService; | ||
| this.queueEntryService = queueEntryService; | ||
| this.queueRoomService = queueRoomService; | ||
| this.roomProviderMapService = roomProviderMapService; | ||
| this.conceptService = conceptService; | ||
| this.locationService = locationService; | ||
| this.patientService = patientService; | ||
| } | ||
|
|
||
| /** | ||
| * @param conceptRefs array of concept references | ||
| * @return a List of Concepts matching those references | ||
| */ | ||
| public List<Concept> getConcepts(String[] conceptRefs) { | ||
| List<Concept> ret = new ArrayList<>(); | ||
| for (String conceptRef : conceptRefs) { | ||
| ret.add(getConcept(conceptRef.trim())); | ||
| } | ||
| return ret; | ||
| } | ||
|
|
||
| /** | ||
| * @param conceptRef a uuid, source:mapping, or unique name for the concept to retrieve | ||
| * @return the concept that matches the conceptRef | ||
| */ | ||
| public Concept getConcept(String conceptRef) { | ||
| if (StringUtils.isBlank(conceptRef)) { | ||
| return null; | ||
| } | ||
| Concept c = getConceptService().getConceptByUuid(conceptRef); | ||
| if (c != null) { | ||
| return c; | ||
| } | ||
| //handle mapping | ||
| int idx = conceptRef.indexOf(":"); | ||
| if (idx >= 0 && idx < conceptRef.length() - 1) { | ||
| String conceptSource = conceptRef.substring(0, idx); | ||
| String conceptCode = conceptRef.substring(idx + 1); | ||
| c = getConceptService().getConceptByMapping(conceptCode, conceptSource); | ||
| if (c != null) { | ||
| return c; | ||
| } | ||
| } | ||
| //handle name | ||
| List<Concept> concepts = getConceptService().getConceptsByName(conceptRef); | ||
| if (concepts.size() == 1) { | ||
| return concepts.get(0); | ||
| } else if (concepts.size() > 1) { | ||
| throw new IllegalArgumentException("More than one concept is found with name: " + conceptRef); | ||
| } | ||
| throw new IllegalArgumentException("Unable to find concept: " + conceptRef); | ||
| } | ||
|
|
||
| /** | ||
| * @param locationRefs array of concept references | ||
| * @return a List of Locations matching those references | ||
| */ | ||
| public List<Location> getLocations(String[] locationRefs) { | ||
| List<Location> ret = new ArrayList<>(); | ||
| for (String locationRef : locationRefs) { | ||
| ret.add(getLocation(locationRef.trim())); | ||
| } | ||
| return ret; | ||
| } | ||
|
|
||
| /** | ||
| * @param locationRef a uuid or unique name for the location to retrieve | ||
| * @return the location that matches the locationRef | ||
| */ | ||
| public Location getLocation(String locationRef) { | ||
| if (StringUtils.isBlank(locationRef)) { | ||
| return null; | ||
| } | ||
| Location l = getLocationService().getLocationByUuid(locationRef); | ||
| if (l != null) { | ||
| return l; | ||
| } | ||
| List<Location> locations = getLocationService().getLocations(locationRef); | ||
| if (locations.size() == 1) { | ||
| return locations.get(0); | ||
| } else if (locations.size() > 1) { | ||
| throw new IllegalArgumentException("More than one location is found with name: " + locationRef); | ||
| } | ||
| throw new IllegalArgumentException("Unable to find location: " + locationRef); | ||
| } | ||
|
|
||
| /** | ||
| * @param patientRef a uuid for the patient to retrieve | ||
| * @return the patient that matches the patientRef | ||
| */ | ||
| public Patient getPatient(String patientRef) { | ||
| if (StringUtils.isBlank(patientRef)) { | ||
| return null; | ||
| } | ||
| Patient p = getPatientService().getPatientByUuid(patientRef); | ||
| if (p != null) { | ||
| return p; | ||
| } | ||
| throw new IllegalArgumentException("Unable to find patient: " + patientRef); | ||
| } | ||
| } |
114 changes: 0 additions & 114 deletions
114
api/src/main/java/org/openmrs/module/queue/api/VisitQueueEntryService.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.