From ca5200c6c59a7d46d18afec08aa217a07f356081 Mon Sep 17 00:00:00 2001 From: achabill Date: Fri, 14 Oct 2016 00:46:08 +0100 Subject: [PATCH] RAD-375: Order report templates by title RAD-375: Source formatting on PR #496 formatting changes --- .../template/HibernateMrrtReportTemplateDAO.java | 2 ++ .../report/template/MrrtReportTemplateService.java | 1 + .../MrrtReportTemplateServiceComponentTest.java | 11 +++++++++-- .../MrrtReportTemplateServiceComponentTestDataset.xml | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/org/openmrs/module/radiology/report/template/HibernateMrrtReportTemplateDAO.java b/api/src/main/java/org/openmrs/module/radiology/report/template/HibernateMrrtReportTemplateDAO.java index 8a74c72d8..5ca794947 100644 --- a/api/src/main/java/org/openmrs/module/radiology/report/template/HibernateMrrtReportTemplateDAO.java +++ b/api/src/main/java/org/openmrs/module/radiology/report/template/HibernateMrrtReportTemplateDAO.java @@ -15,6 +15,7 @@ import org.hibernate.Criteria; import org.hibernate.SessionFactory; import org.hibernate.criterion.MatchMode; +import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; /** @@ -76,6 +77,7 @@ public List getMrrtReportTemplates(MrrtReportTemplateSearchC final Criteria crit = sessionFactory.getCurrentSession() .createCriteria(MrrtReportTemplate.class); + crit.addOrder(Order.asc("dcTermsTitle")); if (searchCriteria.getTitle() != null) { crit.add(Restrictions.ilike("dcTermsTitle", searchCriteria.getTitle() + "%", MatchMode.ANYWHERE)); diff --git a/api/src/main/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateService.java b/api/src/main/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateService.java index d76ddcdab..3a7aec061 100644 --- a/api/src/main/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateService.java +++ b/api/src/main/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateService.java @@ -110,6 +110,7 @@ public interface MrrtReportTemplateService extends OpenmrsService { /** * Get all {@code MrrtReportTemplate's} matching a variety of (nullable) criteria. + * Returns results ordered by dcTermsTitle. * * @param mrrtReportTemplateSearchCriteria the object containing search parameters * @return the mrrt report templates matching the given criteria diff --git a/api/src/test/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateServiceComponentTest.java b/api/src/test/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateServiceComponentTest.java index d774801db..bc882c463 100644 --- a/api/src/test/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateServiceComponentTest.java +++ b/api/src/test/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateServiceComponentTest.java @@ -74,7 +74,7 @@ public class MrrtReportTemplateServiceComponentTest extends BaseModuleContextSen private static final String NON_EXISTING_UUID = "invalid uuid"; - private static final String EXISTING_TEMPLATE_TITLE = "title1"; + private static final String EXISTING_TEMPLATE_TITLE = "CT"; private static final String NON_EXISTING_TEMPLATE_TITLE = "invalid"; @@ -393,7 +393,14 @@ public void getMrrtReportTemplates_shouldReturnAllMrrtReportTemplatesThatMatchGi .build(); List templates = mrrtReportTemplateService.getMrrtReportTemplates(searchCriteria); assertNotNull(templates); - assertThat(templates.size(), is(1)); + assertThat(templates.size(), is(2)); + assertThat(templates.get(0) + .getDcTermsTitle(), + is("CT Cardiac Bypass Graft")); + assertThat(templates.get(1) + .getDcTermsTitle(), + is("CT Chest Pulmonary Embolism")); + } /** diff --git a/api/src/test/resources/org/openmrs/module/radiology/include/MrrtReportTemplateServiceComponentTestDataset.xml b/api/src/test/resources/org/openmrs/module/radiology/include/MrrtReportTemplateServiceComponentTestDataset.xml index b85487f3c..bbf8623af 100644 --- a/api/src/test/resources/org/openmrs/module/radiology/include/MrrtReportTemplateServiceComponentTestDataset.xml +++ b/api/src/test/resources/org/openmrs/module/radiology/include/MrrtReportTemplateServiceComponentTestDataset.xml @@ -13,7 +13,7 @@ - - + +