HSC-379: Rename order type uuid config names

Author: VaishSiddharth

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/routes/resources/MedicationRequestRouter.java

@@ -15,7 +15,7 @@
 @Setter
 public class MedicationRequestRouter extends BaseFhirResourceRouter {
 
-	@Value("${eip.drug.order.concept.uuid:" + DRUG_ORDER_TYPE_UUID + "}")
+	@Value("${eip.drug.order.type.uuid:" + DRUG_ORDER_TYPE_UUID + "}")
 	private String drugOrderTypeUuid;
 
 	MedicationRequestRouter() {

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/routes/resources/ProcedureRouter.java

@@ -29,7 +29,7 @@ public class ProcedureRouter extends BaseFhirResourceRouter {
 	@Value("${openmrs.baseUrl}")
 	private String openmrsBaseUrl;
 
-	@Value("${eip.procedure.order.concept.uuid:" + PROCEDURE_ORDER_TYPE_UUID + "}")
+	@Value("${eip.procedure.order.type.uuid:" + PROCEDURE_ORDER_TYPE_UUID + "}")
 	private String procedureOrderTypeUuid;
 
 	@Autowired

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/routes/resources/ServiceRequestRouter.java

@@ -16,10 +16,10 @@
 @Setter
 public class ServiceRequestRouter extends BaseFhirResourceRouter {
 
-	@Value("${eip.test.order.concept.uuid:" + TEST_ORDER_TYPE_UUID + "}")
+	@Value("${eip.test.order.type.uuid:" + TEST_ORDER_TYPE_UUID + "}")
 	private String testOrderTypeUuid;
 
-	@Value("${eip.imaging.order.concept.uuid:" + IMAGING_ORDER_TYPE_UUID + "}")
+	@Value("${eip.imaging.order.type.uuid:" + IMAGING_ORDER_TYPE_UUID + "}")
 	private String imagingOrderTypeUuid;
 
 	ServiceRequestRouter() {

camel-openmrs-fhir/src/main/java/org/openmrs/eip/fhir/routes/resources/SupplyRequestRouter.java

@@ -29,7 +29,7 @@ public class SupplyRequestRouter extends BaseFhirResourceRouter {
 	@Value("${openmrs.baseUrl}")
 	private String openmrsBaseUrl;
 
-	@Value("${eip.supplyrequest.order.concept.uuid:" + SUPPLY_REQUEST_ORDER_TYPE_UUID + "}")
+	@Value("${eip.supplyrequest.order.type.uuid:" + SUPPLY_REQUEST_ORDER_TYPE_UUID + "}")
 	private String supplyRequestOrderTypeUuid;
 
 	@Autowired

camel-openmrs-fhir/src/main/resources/application.properties

@@ -5,9 +5,9 @@ openmrs.password=${eip.fhir.password}
 # ----------------------------------------------------------------------------------------------------------------------
 
 # *********************** EIP Configuration ********************************************************************
-eip.test.order.concept.uuid=${EIP_TEST_ORDER_CONCEPT_UUID:}
-eip.imaging.order.concept.uuid=${EIP_IMAGING_ORDER_CONCEPT_UUID:}
-eip.procedure.order.concept.uuid=${EIP_PROCEDURE_ORDER_CONCEPT_UUID:}
-eip.supplyrequest.order.concept.uuid=${EIP_SUPPLYREQUEST_ORDER_CONCEPT_UUID:}
-eip.drug.order.concept.uuid=${EIP_DRUG_ORDER_CONCEPT_UUID:}
+eip.test.order.type.uuid=${EIP_TEST_ORDER_TYPE_UUID:}
+eip.imaging.order.type.uuid=${EIP_IMAGING_ORDER_TYPE_UUID:}
+eip.procedure.order.type.uuid=${EIP_PROCEDURE_ORDER_TYPE_UUID:}
+eip.supplyrequest.order.type.uuid=${EIP_SUPPLYREQUEST_ORDER_TYPE_UUID:}
+eip.drug.order.type.uuid=${EIP_DRUG_ORDER_TYPE_UUID:}
 # ----------------------------------------------------------------------------------------------------------------------

camel-openmrs-fhir/src/test/resources/application-test.properties

@@ -11,9 +11,9 @@ eip.fhir.password=password
 # ----------------------------------------------------------------------------------------------------------------------
 
 # *********************** EIP Configuration ********************************************************************
-eip.test.order.concept.uuid=52a447d3-a64a-11e3-9aeb-50e549534c5e
-eip.imaging.order.concept.uuid=8d2aff07-55e6-4a4a-8878-72b9eb36a3b8
-eip.procedure.order.concept.uuid=67a92e56-0f88-11ea-8d71-362b9e155667
-eip.supplyrequest.order.concept.uuid=67a92bd6-0f88-11ea-8d71-362b9e155667
-eip.drug.order.concept.uuid=131168f4-15f5-102d-96e4-000c29c2a5d7
+eip.test.order.type.uuid=52a447d3-a64a-11e3-9aeb-50e549534c5e
+eip.imaging.order.type.uuid=8d2aff07-55e6-4a4a-8878-72b9eb36a3b8
+eip.procedure.order.type.uuid=67a92e56-0f88-11ea-8d71-362b9e155667
+eip.supplyrequest.order.type.uuid=67a92bd6-0f88-11ea-8d71-362b9e155667
+eip.drug.order.type.uuid=131168f4-15f5-102d-96e4-000c29c2a5d7
 # ----------------------------------------------------------------------------------------------------------------------