TRUNK-6683: Skip full-text search with drugs when a concept is provided (#6346)

Author: ibacher

api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java

@@ -1581,7 +1581,8 @@ private SearchQuery<Drug> newDrugQuery(String drugName, boolean searchKeywords,
 		final Collection<Locale> locales = Collections.singletonList(locale == null ? Context.getLocale() : locale);
 
 		final List<Object> conceptIds;
-		if (searchDrugConceptNames) {
+		// If a concept is supplied, skip the relatively expensive concept-name full-text search
+		if (searchDrugConceptNames && concept == null) {
 			SearchSession searchSession = searchSessionFactory.getSearchSession();
 			SearchScope<ConceptName> scope = searchSession.scope(ConceptName.class);
 

api/src/test/java/org/openmrs/api/db/hibernate/HibernateConceptDAOTest.java

@@ -123,6 +123,39 @@ public void getDrugs_shouldReturnDrugIfPhaseMatchConceptNameNoNeedToMatchBothCon
 
 	}
 
+	/**
+	 * When a concept is supplied, the concept-name full-text lookup is skipped (TRUNK-6683), so drugs
+	 * belonging to other concepts whose names match the phrase are not returned - only the supplied
+	 * concept's drugs and drugs whose own name matches.
+	 *
+	 * @see HibernateConceptDAO#getDrugs(String,Concept,boolean,boolean,boolean,Integer,Integer)
+	 */
+	@Test
+	public void getDrugs_shouldNotSearchConceptNamesWhenConceptIsSupplied() {
+		// concept 3 is "COUGH SYRUP"; "ZEBRACONCEPT" only matches the name of concept 20 (drug "Placebo-X"),
+		// never a drug name. With a concept supplied the concept-name lookup must not run, so Placebo-X is absent.
+		Concept concept = dao.getConcept(3);
+
+		List<Drug> drugList = dao.getDrugs("ZEBRACONCEPT", concept, true, true, false, 0, 10);
+
+		assertEquals(1, drugList.size());
+		assertTrue(drugList.stream().noneMatch(drug -> "Placebo-X".equals(drug.getName())));
+	}
+
+	/**
+	 * The concept-name full-text lookup still runs when no concept is supplied, so a phrase that only
+	 * matches a concept name (not any drug name) still returns that concept's drugs.
+	 *
+	 * @see HibernateConceptDAO#getDrugs(String,Concept,boolean,boolean,boolean,Integer,Integer)
+	 */
+	@Test
+	public void getDrugs_shouldSearchConceptNamesWhenNoConceptIsSupplied() {
+		List<Drug> drugList = dao.getDrugs("ZEBRACONCEPT", null, true, true, false, 0, 10);
+
+		assertEquals(1, drugList.size());
+		assertEquals("Placebo-X", drugList.get(0).getName());
+	}
+
 	/**
 	 * @see HibernateConceptDAO#getDrugs(String,Concept,boolean,boolean,boolean,Integer,Integer)
 	 */

api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateConceptTestDataSet.xml

@@ -43,4 +43,8 @@
   <drug drug_id="14" concept_id="14" name="TEST_DRUG_NAME" combination="true" creator="1" date_created="2008-08-15 15:34:03.0" retired="false" uuid="8e2323fa-0fa0-461f-9b59-9765997d849e"/>
   <drug drug_id="15" concept_id="15" name="TEST_DRUG_NAME_RETIRED" combination="true" creator="1" date_created="2014-05-27 15:48:00.0" retired="true" uuid="8e2323fa-0fa0-461f-9b59-9765997d849f"/>
   <drug drug_id="1584" concept_id="15" name="DRUG_NAME_WITH_SPECIAL_CHARACTERS (" combination="true" creator="1" date_created="2015-11-24 15:48:00.0" retired="false" uuid="8e2574fa-0fa0-461f-9b59-9765997d846"/>
-</dataset>
+  <!-- concept 20 has a distinctive name that no drug_name matches; used to verify the concept-name full-text lookup is skipped when a concept is supplied (TRUNK-6683) -->
+  <concept concept_id="20" retired="false" datatype_id="4" class_id="16" is_set="false" creator="1" date_created="2008-08-15 13:58:36.0" version="" uuid="0abca361-f6bf-49cc-97de-b2f37f099020"/>
+  <concept_name concept_id="20" name="ZEBRACONCEPT" locale="en" creator="1" date_created="2008-08-15 13:58:36.0" concept_name_id="2500" concept_name_type="FULLY_SPECIFIED" locale_preferred="1" voided="false" uuid="b8159118-c97b-4d5a-a63e-d4aa4be0c520"/>
+  <drug drug_id="20" concept_id="20" name="Placebo-X" combination="false" creator="1" date_created="2008-08-15 15:34:03.0" retired="false" uuid="8e2323fa-0fa0-461f-9b59-9765997d8420"/>
+</dataset>