Responding to review comments for: Add an OrderFrequencyValidator -

TRUNK-4192
openmrs · Mar 3, 2014 · 73e7b2d · wluyima · Mar 3, 2014 · 73e7b2d
1 parent 518d699
commit 73e7b2d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/api/src/main/java/org/openmrs/OrderFrequency.java b/api/src/main/java/org/openmrs/OrderFrequency.java
@@ -26,6 +26,8 @@ public class OrderFrequency extends BaseOpenmrsMetadata implements Serializable
 
 	private static final long serialVersionUID = 1L;
 
+	public static final String CONCEPT_CLASS_UUID = "8e071bfe-520c-44c0-a89b-538e9129b42a";
+
 	private Integer orderFrequencyId;
 
 	private Double frequencyPerDay;

diff --git a/api/src/main/java/org/openmrs/validator/OrderFrequencyValidator.java b/api/src/main/java/org/openmrs/validator/OrderFrequencyValidator.java
@@ -63,12 +63,8 @@ public void validate(Object obj, Errors errors) {
 
 			Concept concept = orderFrequency.getConcept();
 			if (concept != null) {
-				if (concept.getConceptClass() == null) {
+				if (!OrderFrequency.CONCEPT_CLASS_UUID.equals(concept.getConceptClass().getUuid())) {
 					errors.rejectValue("concept", "OrderFrequency.concept.shouldBeClassFrequency");
-				} else {
-					if (!"Frequency".equals(concept.getConceptClass().getName())) {
-						errors.rejectValue("concept", "OrderFrequency.concept.shouldBeClassFrequency");
-					}
 				}
 
 				OrderFrequency of = Context.getOrderService().getOrderFrequencyByConcept(concept);

diff --git a/api/src/test/resources/org/openmrs/include/standardTestDataset.xml b/api/src/test/resources/org/openmrs/include/standardTestDataset.xml
@@ -51,7 +51,7 @@
   <concept_class concept_class_id="16" name="Program" description="A treatment program" creator="1" date_created="2008-08-15 13:55:59.0" retired="false" uuid="2a3738f5-26f0-4f97-ae7a-f99e42fa6d44"/>
   <concept_class concept_class_id="17" name="Workflow" description="A workflow within a treatment program" creator="1" date_created="2008-08-15 13:56:30.0" retired="false" uuid="dbdf1b12-dbcb-4d41-a8eb-39a551f56e6d"/>
   <concept_class concept_class_id="18" name="State" description="A state within a workflow" creator="1" date_created="2008-08-15 13:56:55.0" retired="false" uuid="ac3feb09-e120-4d8c-97ee-f7544720efb8"/>
-  <concept_class concept_class_id="19" name="Frequency" description="A class for order frequencies" creator="1" date_created="2008-08-15 13:56:55.0" retired="false" uuid="cd9emn09-e120-4d8c-97ee-f7544720efb8"/>
+  <concept_class concept_class_id="19" name="Frequency" description="A class for order frequencies" creator="1" date_created="2008-08-15 13:56:55.0" retired="false" uuid="8e071bfe-520c-44c0-a89b-538e9129b42a"/>
   <concept_datatype concept_datatype_id="1" name="Numeric" hl7_abbreviation="NM" description="Numeric value, including integer or float (e.g., creatinine, weight)" creator="1" date_created="2004-02-02 00:00:00.0" retired="false" uuid="8d4a4488-c2cc-11de-8d13-0010c6dffd0f"/>
   <concept_datatype concept_datatype_id="2" name="Coded" hl7_abbreviation="CWE" description="Value determined by term dictionary lookup (i.e., term identifier)" creator="1" date_created="2004-02-02 00:00:00.0" retired="false" uuid="8d4a48b6-c2cc-11de-8d13-0010c6dffd0f"/>
   <concept_datatype concept_datatype_id="3" name="Text" hl7_abbreviation="ST" description="Free text" creator="1" date_created="2004-02-02 00:00:00.0" retired="false" uuid="8d4a4ab4-c2cc-11de-8d13-0010c6dffd0f"/>