-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BAH-3860 | Enhancements in Appointments module (#153)
* BAH-3350: Appointments: search endpoint stack traces when a patient has more than one identifier of the same time (#142) * Ability to Filter on Appointments with multi-value support for search keys Ability to Filter on Awaiting Appointments with multiple values for same keys * Added test cases to increase branch coverage & set threshold to 0.60 (#152) Added test cases to increase branch coverage & set threshold to 0.60 (#152) * Kavitha|Awaiting appointments code refactor (#151) * BAH-3479 | Backend changes for dateless appointments (#145) * Kavitha, Umair | A-1204370983916597| add database column and api changes for priority (#104) * add database column and api changes for priority Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com> * add priority to appointment audit Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com> * fixed test failure for priority * add tests for code coverage --------- Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com> * Kavitha | A-1204361352115416 | removed invalid priority and related tests (#106) * removed invalid priority and related tests * added testcase for invalid priority * Backend migration to create dateless appointments (#105) * allow dateless appointments if status is waitlist (#108) * Kavitha, Umair | A-1204370983916597| add database column and api changes for priority (#104) * add database column and api changes for priority * add priority to appointment audit * fixed test failure for priority * add tests for code coverage --------- Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com> * Kavitha | A-1204361352115416 | removed invalid priority and related tests (#106) * removed invalid priority and related tests * added testcase for invalid priority * Backend migration to create dateless appointments (#105) * allow dateless appointments if status is waitlist (#108) * Add logic to filter DateLess Appointments * add. appointment creation date in response (#109) * Add tests to filter DateLess Appointments * Update POM files * Fix failing Tests for Search appointments * Kavitha | add date check and tests for waitlist appointments * Kavitha | removed Invalid priority * Kavitha | added missed tests from master branch * Kavitha | rename datelessAppointments to appointmentsWithoutDates * Kavitha | add default null value to date columns in appt * Kavitha | removed status check in appointment json * Kavitha | removed sorting based on status * Kavitha | removed unused imports --------- Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com> Co-authored-by: Phanindra-tw <v.tadikonda@thoughtworks.com> Co-authored-by: Arjun G <91885483+Arjun-Go@users.noreply.github.com> * Kavitha | refactor search API for appointments without dates * Kavitha|lowered test coverage ratio * add specific imports --------- Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com> Co-authored-by: Phanindra-tw <v.tadikonda@thoughtworks.com> Co-authored-by: Arjun G <91885483+Arjun-Go@users.noreply.github.com> * BAH-3860 | repeated imports in tests * BAH-3860 | fix. tests in AppointmentMapper --------- Co-authored-by: Mark Goodrich <mgoodrich@pih.org> Co-authored-by: Umair Fayaz <59157924+umair-fayaz@users.noreply.github.com> Co-authored-by: kalai-tw <104360355+kalai-tw@users.noreply.github.com> Co-authored-by: kavitha-sundararajan <90255023+kavitha-sundararajan@users.noreply.github.com> Co-authored-by: Umair Fayaz <omayrfayaz@gmail.com> Co-authored-by: Phanindra-tw <v.tadikonda@thoughtworks.com>
- Loading branch information
7 people
authored
Jun 4, 2024
1 parent
552a579
commit 5b5dd73
Showing
14 changed files
with
349 additions
and
80 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
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
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
90 changes: 90 additions & 0 deletions
90
api/src/main/java/org/openmrs/module/appointments/model/AppointmentSearchRequestModel.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,90 @@ | ||
| package org.openmrs.module.appointments.model; | ||
|
|
||
| import org.codehaus.jackson.annotate.JsonIgnoreProperties; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @JsonIgnoreProperties | ||
| public class AppointmentSearchRequestModel { | ||
| private List<String> providerUuids; | ||
| private List<String> serviceUuids; | ||
| private List<String> serviceTypeUuids; | ||
| private List<String> locationUuids; | ||
| private List<String> patientUuids; | ||
| private String status; | ||
| private List<String> priorities; | ||
| private String appointmentKind; | ||
| private Boolean withoutDates = false; | ||
|
|
||
| public List<String> getProviderUuids() { | ||
| return providerUuids; | ||
| } | ||
|
|
||
| public void setProviderUuids(List<String> providerUuids) { | ||
| this.providerUuids = providerUuids; | ||
| } | ||
|
|
||
| public List<String> getServiceUuids() { | ||
| return serviceUuids; | ||
| } | ||
|
|
||
| public void setServiceUuids(List<String> serviceUuids) { | ||
| this.serviceUuids = serviceUuids; | ||
| } | ||
|
|
||
| public List<String> getServiceTypeUuids() { | ||
| return serviceTypeUuids; | ||
| } | ||
|
|
||
| public void setServiceTypeUuids(List<String> serviceTypeUuids) { | ||
| this.serviceTypeUuids = serviceTypeUuids; | ||
| } | ||
|
|
||
| public List<String> getLocationUuids() { | ||
| return locationUuids; | ||
| } | ||
|
|
||
| public void setLocationUuids(List<String> locationUuids) { | ||
| this.locationUuids = locationUuids; | ||
| } | ||
|
|
||
| public List<String> getPatientUuids() { | ||
| return patientUuids; | ||
| } | ||
|
|
||
| public void setPatientUuids(List<String> patientUuids) { | ||
| this.patientUuids = patientUuids; | ||
| } | ||
|
|
||
| public String getStatus() { | ||
| return status; | ||
| } | ||
|
|
||
| public void setStatus(String status) { | ||
| this.status = status; | ||
| } | ||
|
|
||
| public String getAppointmentKind() { | ||
| return appointmentKind; | ||
| } | ||
|
|
||
| public void setAppointmentKind(String appointmentKind) { | ||
| this.appointmentKind = appointmentKind; | ||
| } | ||
|
|
||
| public Boolean isWithoutDates() { | ||
| return withoutDates; | ||
| } | ||
|
|
||
| public void setWithoutDates(Boolean withoutDates) { | ||
| this.withoutDates = withoutDates; | ||
| } | ||
|
|
||
| public List<String> getPriorities() { | ||
| return priorities; | ||
| } | ||
|
|
||
| public void setPriorities(List<String> priorities) { | ||
| this.priorities = priorities; | ||
| } | ||
| } |
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
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.