Skip to content

Commit 6360b0e

Browse files
wluyimawluyima
committedDec 17, 2013
Cleared all methods from OrderService
·
latest1.10.0-alpha
1 parent b66bc5c commit 6360b0e

29 files changed

+62
-3050
lines changed
 

‎api/src/main/java/org/openmrs/api/OrderService.java

+1-541
Large diffs are not rendered by default.

‎api/src/main/java/org/openmrs/api/db/OrderDAO.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.openmrs.OrderType;
2222
import org.openmrs.Patient;
2323
import org.openmrs.User;
24-
import org.openmrs.api.OrderService.ORDER_STATUS;
2524

2625
/**
2726
* Order-related database functions
@@ -76,12 +75,10 @@ public interface OrderDAO {
7675

7776
/**
7877
* @see org.openmrs.api.OrderService#getOrders(java.lang.Class, java.util.List, java.util.List,
79-
* org.openmrs.api.OrderService.ORDER_STATUS, java.util.List, java.util.List,
80-
* java.util.List)
78+
* java.util.List, java.util.List, java.util.List)
8179
*/
8280
public <Ord extends Order> List<Ord> getOrders(Class<Ord> orderClassType, List<Patient> patients,
83-
List<Concept> concepts, ORDER_STATUS status, List<User> orderers, List<Encounter> encounters,
84-
List<OrderType> orderTypes);
81+
List<Concept> concepts, List<User> orderers, List<Encounter> encounters, List<OrderType> orderTypes);
8582

8683
/**
8784
* Auto generated method comment

‎api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java

+3-11
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.openmrs.OrderType;
2727
import org.openmrs.Patient;
2828
import org.openmrs.User;
29-
import org.openmrs.api.OrderService.ORDER_STATUS;
3029
import org.openmrs.api.db.DAOException;
3130
import org.openmrs.api.db.OrderDAO;
3231

@@ -139,16 +138,13 @@ public <Ord extends Order> Ord getOrder(Integer orderId, Class<Ord> orderClassTy
139138

140139
/**
141140
* @see org.openmrs.api.db.OrderDAO#getOrders(java.lang.Class, java.util.List, java.util.List,
142-
* org.openmrs.api.OrderService.ORDER_STATUS, java.util.List, java.util.List,
143-
* java.util.List)
141+
* java.util.List, java.util.List, java.util.List)
144142
* @see org.openmrs.api.OrderService#getOrders(java.lang.Class, java.util.List, java.util.List,
145-
* org.openmrs.api.OrderService.ORDER_STATUS, java.util.List, java.util.List,
146-
* java.util.List)
143+
* java.util.List, java.util.List, java.util.List)
147144
*/
148145
@SuppressWarnings("unchecked")
149146
public <Ord extends Order> List<Ord> getOrders(Class<Ord> orderClassType, List<Patient> patients,
150-
List<Concept> concepts, ORDER_STATUS status, List<User> orderers, List<Encounter> encounters,
151-
List<OrderType> orderTypes) {
147+
List<Concept> concepts, List<User> orderers, List<Encounter> encounters, List<OrderType> orderTypes) {
152148

153149
Criteria crit = sessionFactory.getCurrentSession().createCriteria(orderClassType);
154150

@@ -158,10 +154,6 @@ public <Ord extends Order> List<Ord> getOrders(Class<Ord> orderClassType, List<P
158154
if (concepts.size() > 0)
159155
crit.add(Expression.in("concept", concepts));
160156

161-
// only the "ANY" status cares about voided Orders. All others
162-
// do not want voided orders included in the list
163-
if (status != ORDER_STATUS.ANY)
164-
crit.add(Expression.eq("voided", false));
165157
// we are not checking the other status's here because they are
166158
// algorithm dependent
167159

‎api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.openmrs.aop.RequiredDataAdvice;
2727
import org.openmrs.api.EncounterService;
2828
import org.openmrs.api.OrderService;
29-
import org.openmrs.api.OrderService.ORDER_STATUS;
3029
import org.openmrs.api.context.Context;
3130

3231
/**
@@ -65,14 +64,14 @@ public void handle(Patient patient, User originalVoidingUser, Date origParentVoi
6564
OrderService os = Context.getOrderService();
6665
List<Patient> patients = new ArrayList<Patient>();
6766
patients.add(patient);
68-
List<Order> orders = os.getOrders(Order.class, patients, null, ORDER_STATUS.ANY, null, null, null);
67+
/*List<Order> orders = os.getOrders(Order.class, patients, null, ORDER_STATUS.ANY, null, null, null);
6968
if (CollectionUtils.isNotEmpty(orders)) {
7069
for (Order order : orders) {
7170
if (order.isVoided() && order.getDateVoided().equals(origParentVoidedDate)
7271
&& order.getVoidedBy().equals(originalVoidingUser))
7372
os.unvoidOrder(order);
7473
}
75-
}
74+
}*/
7675
}
7776
}
7877
}

‎api/src/main/java/org/openmrs/api/handler/PatientDataVoidHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ public void handle(Patient patient, User voidingUser, Date voidedDate, String vo
6666
}
6767
//void all the orders associated with this patient
6868
OrderService os = Context.getOrderService();
69-
List<Order> orders = os.getOrdersByPatient(patient);
69+
/*List<Order> orders = os.getOrdersByPatient(patient);
7070
if (CollectionUtils.isNotEmpty(orders)) {
7171
for (Order order : orders) {
7272
if (!order.isVoided()) {
7373
order.setDateVoided(patient.getDateVoided());
7474
os.voidOrder(order, voidReason);
7575
}
7676
}
77-
}
77+
}*/
7878
}
7979
}

‎api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ public Encounter voidEncounter(Encounter encounter, String reason) {
307307
OrderService orderService = Context.getOrderService();
308308
for (Order o : encounter.getOrders()) {
309309
if (!o.isVoided()) {
310-
orderService.voidOrder(o, reason);
310+
//orderService.voidOrder(o, reason);
311311
}
312312
}
313313

@@ -339,8 +339,8 @@ public Encounter unvoidEncounter(Encounter encounter) throws APIException {
339339

340340
OrderService orderService = Context.getOrderService();
341341
for (Order o : encounter.getOrders()) {
342-
if (voidReason.equals(o.getVoidReason()))
343-
orderService.unvoidOrder(o);
342+
//if (voidReason.equals(o.getVoidReason()))
343+
//orderService.unvoidOrder(o);
344344
}
345345

346346
encounter.setVoided(false);

‎api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java

-577
Large diffs are not rendered by default.

‎api/src/main/java/org/openmrs/order/OrderUtil.java

+9-13
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.openmrs.Patient;
3030
import org.openmrs.api.APIException;
3131
import org.openmrs.api.OrderService;
32-
import org.openmrs.api.OrderService.ORDER_STATUS;
3332
import org.openmrs.api.context.Context;
3433
import org.openmrs.api.context.ContextAuthenticationException;
3534
import org.openmrs.util.OpenmrsUtil;
@@ -47,7 +46,6 @@ public class OrderUtil {
4746
* @param patient
4847
* @param discontinueReason
4948
* @param discontinueDate
50-
* @see OrderService#discontinueOrder(org.openmrs.Order, Concept, Date)
5149
* @should discontinue all orders for the given patient if none are yet discontinued
5250
* @should not affect orders that were already discontinued on the specified date
5351
* @should not affect orders that end before the specified date
@@ -60,7 +58,7 @@ public static void discontinueAllOrders(Patient patient, Concept discontinueReas
6058

6159
OrderService orderService = Context.getOrderService();
6260

63-
List<DrugOrder> drugOrders = orderService.getDrugOrdersByPatient(patient, ORDER_STATUS.CURRENT);
61+
/*List<DrugOrder> drugOrders = orderService.getDrugOrdersByPatient(patient, ORDER_STATUS.CURRENT);
6462
6563
// loop over all of this patient's drug orders to discontinue each
6664
if (drugOrders != null) {
@@ -70,7 +68,7 @@ public static void discontinueAllOrders(Patient patient, Concept discontinueReas
7068
// do the stuff to the database
7169
orderService.discontinueOrder(drugOrder, discontinueReason, discontinueDate);
7270
}
73-
}
71+
}*/
7472
}
7573

7674
/**
@@ -80,16 +78,14 @@ public static void discontinueAllOrders(Patient patient, Concept discontinueReas
8078
* @param patient
8179
* @param drugSetId
8280
* @param voidReason
83-
* @param status
8481
* @should void all drug orders of the given type when status is null
8582
* @should void drug orders of the given type for status of CURRENT
8683
* @should void drug orders of the given type for status of COMPLETE
8784
* @should not affect drug orders that are already voided
8885
*/
89-
public static void voidDrugSet(Patient patient, String drugSetId, String voidReason, ORDER_STATUS status) {
86+
public static void voidDrugSet(Patient patient, String drugSetId, String voidReason) {
9087
if (log.isDebugEnabled())
91-
log.debug("Voiding drug sets for patient: " + patient + " drugSetId: " + drugSetId + " reason: " + voidReason
92-
+ " status: " + status);
88+
log.debug("Voiding drug sets for patient: " + patient + " drugSetId: " + drugSetId + " reason: " + voidReason);
9389

9490
// do some null pointer checks
9591

@@ -104,7 +100,7 @@ public static void voidDrugSet(Patient patient, String drugSetId, String voidRea
104100

105101
OrderService orderService = Context.getOrderService();
106102

107-
List<DrugOrder> currentOrders = orderService.getDrugOrdersByPatient(patient, status);
103+
/*List<DrugOrder> currentOrders = orderService.getDrugOrdersByPatient(patient, status);
108104
109105
Map<String, List<DrugOrder>> ordersBySetId = getDrugSetsByDrugSetIdList(currentOrders, drugSetId, ",");
110106
@@ -116,7 +112,7 @@ public static void voidDrugSet(Patient patient, String drugSetId, String voidRea
116112
orderService.voidOrder(order, voidReason);
117113
}
118114
}
119-
}
115+
}*/
120116
}
121117

122118
/**
@@ -151,7 +147,7 @@ public static void discontinueDrugSet(Patient patient, String drugSetId, Concept
151147

152148
OrderService orderService = Context.getOrderService();
153149

154-
List<DrugOrder> currentOrders = orderService.getDrugOrdersByPatient(patient, ORDER_STATUS.CURRENT);
150+
/*List<DrugOrder> currentOrders = orderService.getDrugOrdersByPatient(patient, ORDER_STATUS.CURRENT);
155151
Map<String, List<DrugOrder>> ordersBySetId = getDrugSetsByDrugSetIdList(currentOrders, drugSetId, ",");
156152
157153
// loop over all of the orders and discontinue each of them
@@ -166,8 +162,8 @@ public static void discontinueDrugSet(Patient patient, String drugSetId, Concept
166162
}
167163
} else {
168164
log.debug("no ordersBySetId returned for " + drugSetId);
169-
}
170-
165+
}*/
166+
171167
}
172168

173169
/**

‎api/src/main/java/org/openmrs/propertyeditor/OrderEditor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ public void setAsText(String text) throws IllegalArgumentException {
4444
OrderService ps = Context.getOrderService();
4545
if (StringUtils.hasText(text)) {
4646
try {
47-
setValue(ps.getOrder(Integer.valueOf(text)));
47+
//setValue(ps.getOrder(Integer.valueOf(text)));
4848
}
4949
catch (Exception ex) {
50-
Order order = ps.getOrderByUuid(text);
50+
/*Order order = ps.getOrderByUuid(text);
5151
setValue(order);
5252
if (order == null) {
5353
log.error("Error setting text: " + text, ex);
5454
throw new IllegalArgumentException("Order not found: " + ex.getMessage());
55-
}
55+
}*/
5656
}
5757
} else {
5858
setValue(null);

‎api/src/main/java/org/openmrs/propertyeditor/OrderTypeEditor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ public void setAsText(String text) throws IllegalArgumentException {
4545
OrderService os = Context.getOrderService();
4646
if (StringUtils.hasText(text)) {
4747
try {
48-
setValue(os.getOrderType(Integer.valueOf(text)));
48+
//setValue(os.getOrderType(Integer.valueOf(text)));
4949
}
5050
catch (Exception ex) {
51-
OrderType orderType = os.getOrderTypeByUuid(text);
51+
/*OrderType orderType = os.getOrderTypeByUuid(text);
5252
setValue(orderType);
5353
if (orderType == null) {
5454
log.error("Error setting text: " + text, ex);
5555
throw new IllegalArgumentException("Order type not found: " + ex.getMessage());
56-
}
56+
}*/
5757
}
5858
} else {
5959
setValue(null);

‎api/src/test/java/org/openmrs/api/EncounterServiceTest.java

+11-7
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ public void purgeEncounter_shouldCascadePurgeToObsAndOrders() throws Exception {
302302
assertNull(obsService.getObs(1));
303303
assertNull(obsService.getObs(2));
304304
assertNull(obsService.getObs(3));
305-
306-
assertNull(Context.getOrderService().getOrder(1));
305+
//TODO To be fixed in order entry sprint
306+
//assertNull(Context.getOrderService().getOrder(1));
307307
}
308308

309309
/**
@@ -508,9 +508,11 @@ public void saveEncounter_shouldNotOverwriteObsAndOrdersCreatorOrDateCreated() t
508508

509509
// make sure the order date created and creator are the same as what we
510510
// set
511-
Order createdOrder = Context.getOrderService().getOrder(order.getOrderId());
511+
//TODO To be fixed in order entry sprint
512+
/*Order createdOrder = Context.getOrderService().getOrder(order.getOrderId());
512513
assertEquals(date, createdOrder.getDateCreated());
513514
assertEquals(creator, createdOrder.getCreator());
515+
*/
514516
}
515517

516518
/**
@@ -634,10 +636,11 @@ public void voidEncounter_shouldCascadeToOrders() throws Exception {
634636
// get a nonvoided encounter that has some obs
635637
Encounter encounter = encounterService.getEncounter(1);
636638
encounterService.voidEncounter(encounter, "Just Testing");
637-
639+
//TODO To be fixed in order entry sprint
640+
/*
638641
Order order = Context.getOrderService().getOrder(1);
639642
assertTrue(order.isVoided());
640-
assertEquals("Just Testing", order.getVoidReason());
643+
assertEquals("Just Testing", order.getVoidReason());*/
641644
}
642645

643646
/**
@@ -668,10 +671,11 @@ public void unvoidEncounter_shouldCascadeUnvoidToOrders() throws Exception {
668671
// get a voided encounter that has some voided obs
669672
Encounter encounter = encounterService.getEncounter(2);
670673
encounterService.unvoidEncounter(encounter);
671-
674+
//TODO To be fixed in order entry sprint
675+
/*
672676
Order order = Context.getOrderService().getOrder(2);
673677
assertFalse(order.isVoided());
674-
assertNull(order.getVoidReason());
678+
assertNull(order.getVoidReason());*/
675679
}
676680

677681
/**

‎api/src/test/java/org/openmrs/api/OrderServiceTest.java

-133
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@
2020

2121
import org.junit.Assert;
2222
import org.junit.Test;
23-
import org.openmrs.DrugOrder;
24-
import org.openmrs.Obs;
25-
import org.openmrs.Order;
26-
import org.openmrs.OrderType;
27-
import org.openmrs.Patient;
28-
import org.openmrs.api.OrderService.ORDER_STATUS;
2923
import org.openmrs.api.context.Context;
3024
import org.openmrs.test.BaseContextSensitiveTest;
3125
import org.openmrs.test.Verifies;
@@ -37,133 +31,6 @@ public class OrderServiceTest extends BaseContextSensitiveTest {
3731

3832
protected static final String DRUG_ORDERS_DATASET_XML = "org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml";
3933

40-
/**
41-
* @see {@link OrderService#saveOrder(Order)}
42-
*/
43-
@Test(expected = APIException.class)
44-
@Verifies(value = "should not save order if order doesnt validate", method = "saveOrder(Order)")
45-
public void saveOrder_shouldNotSaveOrderIfOrderDoesntValidate() throws Exception {
46-
OrderService orderService = Context.getOrderService();
47-
Order order = new Order();
48-
order.setPatient(null);
49-
orderService.saveOrder(order);
50-
}
51-
52-
/**
53-
* @see {@link OrderService#getOrderByUuid(String)}
54-
*
55-
*/
56-
@Test
57-
@Verifies(value = "should find object given valid uuid", method = "getOrderByUuid(String)")
58-
public void getOrderByUuid_shouldFindObjectGivenValidUuid() throws Exception {
59-
String uuid = "921de0a3-05c4-444a-be03-e01b4c4b9142";
60-
Order order = Context.getOrderService().getOrderByUuid(uuid);
61-
Assert.assertEquals(1, (int) order.getOrderId());
62-
}
63-
64-
/**
65-
* @see {@link OrderService#getOrderByUuid(String)}
66-
*
67-
*/
68-
@Test
69-
@Verifies(value = "should return null if no object found with given uuid", method = "getOrderByUuid(String)")
70-
public void getOrderByUuid_shouldReturnNullIfNoObjectFoundWithGivenUuid() throws Exception {
71-
Assert.assertNull(Context.getOrderService().getOrderByUuid("some invalid uuid"));
72-
}
73-
74-
/**
75-
* @see {@link OrderService#getOrderTypeByUuid(String)}
76-
*
77-
*/
78-
@Test
79-
@Verifies(value = "should find object given valid uuid", method = "getOrderTypeByUuid(String)")
80-
public void getOrderTypeByUuid_shouldFindObjectGivenValidUuid() throws Exception {
81-
String uuid = "84ce45a8-5e7c-48f7-a581-ca1d17d63a62";
82-
OrderType orderType = Context.getOrderService().getOrderTypeByUuid(uuid);
83-
Assert.assertEquals(1, (int) orderType.getOrderTypeId());
84-
}
85-
86-
/**
87-
* @see {@link OrderService#getOrderTypeByUuid(String)}
88-
*
89-
*/
90-
@Test
91-
@Verifies(value = "should return null if no object found with given uuid", method = "getOrderTypeByUuid(String)")
92-
public void getOrderTypeByUuid_shouldReturnNullIfNoObjectFoundWithGivenUuid() throws Exception {
93-
Assert.assertNull(Context.getOrderService().getOrderTypeByUuid("some invalid uuid"));
94-
}
95-
96-
/**
97-
* @see {@link OrderService#saveOrder(Order)}
98-
*/
99-
@Test
100-
@Verifies(value = "when saving a discontinuedReasonNonCoded parameter the value is correctly stored to the database", method = "saveOrder(Order)")
101-
public void saveOrder_shouldSaveDiscontinuedReasonNonCoded() throws Exception {
102-
String uuid = "921de0a3-05c4-444a-be03-e01b4c4b9142";
103-
Order order = Context.getOrderService().getOrderByUuid(uuid);
104-
String discontinuedReasonNonCoded = "Non coded discontinued reason";
105-
106-
order.setDiscontinuedReasonNonCoded(discontinuedReasonNonCoded);
107-
OrderService orderService = Context.getOrderService();
108-
orderService.saveOrder(order);
109-
110-
order = Context.getOrderService().getOrderByUuid(uuid);
111-
112-
Assert.assertEquals(discontinuedReasonNonCoded, order.getDiscontinuedReasonNonCoded());
113-
}
114-
115-
/**
116-
* @see {@link OrderService#getDrugOrdersByPatient(Patient, ORDER_STATUS, boolean)}
117-
*/
118-
@Test
119-
@Verifies(value = "return list of drug orders with given status", method = "getDrugOrdersByPatient(Patient, ORDER_STATUS, boolean)")
120-
public void getDrugOrdersByPatient_shouldReturnListOfDrugOrdersWithGivenStatus() throws Exception {
121-
executeDataSet(DRUG_ORDERS_DATASET_XML);
122-
Patient p = Context.getPatientService().getPatient(2);
123-
List<DrugOrder> drugOrders = Context.getOrderService().getDrugOrdersByPatient(p, ORDER_STATUS.CURRENT_AND_FUTURE,
124-
Boolean.FALSE);
125-
Assert.assertEquals(4, drugOrders.size());
126-
}
127-
128-
@Test
129-
public void voidDrugSet_shouldNotVoidThePatient() throws Exception {
130-
Patient p = Context.getPatientService().getPatient(2);
131-
Assert.assertFalse(p.isVoided());
132-
Context.getOrderService().voidDrugSet(p, "1", "Reason", OrderService.SHOW_ALL);
133-
Assert.assertFalse(p.isVoided());
134-
}
135-
136-
@Test
137-
public void purgeOrder_shouldDeleteObsThatReference() throws Exception {
138-
executeDataSet("org/openmrs/api/include/OrderServiceTest-deleteObsThatReference.xml");
139-
final String ordUuid = "0c96f25c-4949-4f72-9931-d808fbcdb612";
140-
final String obsUuid = "be3a4d7a-f9ab-47bb-aaad-bc0b452fcda4";
141-
ObsService os = Context.getObsService();
142-
OrderService service = Context.getOrderService();
143-
144-
Obs obs = os.getObsByUuid(obsUuid);
145-
Assert.assertNotNull(obs);
146-
147-
Order order = service.getOrderByUuid(ordUuid);
148-
Assert.assertNotNull(order);
149-
150-
//sanity check to ensure that the obs and order are actually related
151-
Assert.assertEquals(order, obs.getOrder());
152-
153-
//Ensure that passing false does not delete the related obs
154-
service.purgeOrder(order, false);
155-
Assert.assertNotNull(os.getObsByUuid(obsUuid));
156-
157-
service.purgeOrder(order, true);
158-
159-
//Ensure that actually the order got purged
160-
Assert.assertNull(service.getOrderByUuid(ordUuid));
161-
162-
//Ensure that the related obs got deleted
163-
Assert.assertNull(os.getObsByUuid(obsUuid));
164-
165-
}
166-
16734
/**
16835
* @see {@link OrderNumberGenerator#getNewOrderNumber()}
16936
*/

‎api/src/test/java/org/openmrs/api/PatientServiceTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2609,19 +2609,19 @@ public void mergePatients_shouldAuditCreatedOrders() throws Exception {
26092609
Patient notPreferred = patientService.getPatient(2);
26102610

26112611
//retrieve order for notPreferred patient
2612-
Order order = Context.getOrderService().getOrdersByPatient(notPreferred).get(0);
2612+
//Order order = Context.getOrderService().getOrdersByPatient(notPreferred).get(0);
26132613

26142614
//merge the two patients and retrieve the audit object
26152615
PersonMergeLog audit = mergeAndRetrieveAudit(preferred, notPreferred);
26162616

26172617
//find the UUID of the order that was created for preferred patient as a result of the merge
26182618
String addedOrderUuid = null;
2619-
List<Order> orders = Context.getOrderService().getOrdersByPatient(preferred);
2619+
/*List<Order> orders = Context.getOrderService().getOrdersByPatient(preferred);
26202620
for (Order o : orders) {
26212621
if (o.getInstructions().equals(order.getInstructions())) {
26222622
addedOrderUuid = o.getUuid();
26232623
}
2624-
}
2624+
}*/
26252625
Assert.assertNotNull("expected new order was not found for the preferred patient after the merge", addedOrderUuid);
26262626
Assert.assertTrue("order creation not audited", isValueInList(addedOrderUuid, audit.getPersonMergeLogData()
26272627
.getCreatedOrders()));

‎api/src/test/java/org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.openmrs.User;
2727
import org.openmrs.api.EncounterService;
2828
import org.openmrs.api.OrderService;
29-
import org.openmrs.api.OrderService.ORDER_STATUS;
3029
import org.openmrs.api.context.Context;
3130
import org.openmrs.test.BaseContextSensitiveTest;
3231
import org.openmrs.test.TestUtil;
@@ -61,6 +60,8 @@ public void handle_shouldUnvoidTheOrdersAndEncountersAssociatedWithThePatient()
6160
OrderService os = Context.getOrderService();
6261
List<Patient> patients = new ArrayList<Patient>();
6362
patients.add(patient);
63+
//TODO To be fixed in order entry sprint
64+
/*
6465
List<Order> orders = os.getOrders(Order.class, patients, null, ORDER_STATUS.ANY, null, null, null);
6566
Assert.assertTrue(CollectionUtils.isNotEmpty(orders));
6667
//all order void related fields should be null
@@ -86,7 +87,7 @@ public void handle_shouldUnvoidTheOrdersAndEncountersAssociatedWithThePatient()
8687
Assert.assertNull(order.getDateVoided());
8788
Assert.assertNull(order.getVoidedBy());
8889
Assert.assertNull(order.getVoidReason());
89-
}
90+
}*/
9091
}
9192

9293
/**
@@ -112,7 +113,8 @@ public void handle_shouldNotUnvoidTheOrdersAndEncountersThatNeverGotVoidedWithTh
112113
Assert.assertTrue(testEncounter.isVoided());
113114

114115
//void one of the unvoided orders for testing purposes
115-
Order testOrder = os.getOrdersByPatient(patient).get(0);
116+
//TODO To be fixed in order entry sprint
117+
/*Order testOrder = os.getOrdersByPatient(patient).get(0);
116118
Assert.assertNotNull(testOrder);
117119
Assert.assertNull(testOrder.getDateVoided());
118120
Assert.assertNull(testOrder.getVoidedBy());
@@ -139,7 +141,7 @@ public void handle_shouldNotUnvoidTheOrdersAndEncountersThatNeverGotVoidedWithTh
139141
Assert.assertTrue(testOrder.isVoided());
140142
Assert.assertNotNull(testOrder.getDateVoided());
141143
Assert.assertNotNull(testOrder.getVoidedBy());
142-
Assert.assertNotNull(testOrder.getVoidReason());
143-
144+
Assert.assertNotNull(testOrder.getVoidReason());*/
145+
144146
}
145147
}

‎api/src/test/java/org/openmrs/api/handler/PatientDataVoidHandlerTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public void handle_shouldVoidTheOrdersEncountersAndObservationsAssociatedWithThe
4444

4545
List<Encounter> encounters = Context.getEncounterService().getEncountersByPatient(patient);
4646
List<Obs> observations = Context.getObsService().getObservationsByPerson(patient);
47-
List<Order> orders = Context.getOrderService().getOrdersByPatient(patient);
47+
//TODO To be fixed in order entry sprint
48+
/*List<Order> orders = Context.getOrderService().getOrdersByPatient(patient);
4849
4950
//we should have some unvoided encounters, obs and orders for the test to be concrete
5051
Assert.assertTrue(CollectionUtils.isNotEmpty(encounters));
@@ -99,6 +100,6 @@ public void handle_shouldVoidTheOrdersEncountersAndObservationsAssociatedWithThe
99100
100101
Assert.assertTrue(CollectionUtils.isEmpty(encounters));
101102
Assert.assertTrue(CollectionUtils.isEmpty(observations));
102-
Assert.assertTrue(CollectionUtils.isEmpty(orders));
103+
Assert.assertTrue(CollectionUtils.isEmpty(orders));*/
103104
}
104105
}

‎api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ public void validate_shouldPassValidationIfAllFieldsAreCorrect() throws Exceptio
8585
DrugOrder order = new DrugOrder();
8686
order.setConcept(Context.getConceptService().getConcept(88));
8787
order.setPatient(Context.getPatientService().getPatient(2));
88-
order.setOrderType(Context.getOrderService().getOrderType(1));
88+
//TODO To be fixed in order entry sprint
89+
//order.setOrderType(Context.getOrderService().getOrderType(1));
8990
Calendar cal = Calendar.getInstance();
9091
cal.set(Calendar.DAY_OF_MONTH, cal.get(Calendar.DAY_OF_MONTH) - 1);
9192
order.setStartDate(cal.getTime());

‎api/src/test/java/org/openmrs/validator/OrderValidatorTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void validate_shouldFailValidationIfOrderAndEncounterHaveDifferentPatient
3939
Order order = new Order();
4040
order.setConcept(Context.getConceptService().getConcept(88));
4141
order.setPatient(Context.getPatientService().getPatient(2));
42-
order.setOrderType(Context.getOrderService().getOrderType(1));
42+
//order.setOrderType(Context.getOrderService().getOrderType(1));
4343
order.setEncounter(Context.getEncounterService().getEncounter(3));
4444

4545
Errors errors = new BindException(order, "order");
@@ -58,7 +58,7 @@ public void validate_shouldFailValidationIfDiscontinuedIsNull() throws Exception
5858
order.setDiscontinued(null);
5959
order.setConcept(Context.getConceptService().getConcept(88));
6060
order.setPatient(Context.getPatientService().getPatient(2));
61-
order.setOrderType(Context.getOrderService().getOrderType(1));
61+
//order.setOrderType(Context.getOrderService().getOrderType(1));
6262

6363
Errors errors = new BindException(order, "order");
6464
new OrderValidator().validate(order, errors);
@@ -79,7 +79,7 @@ public void validate_shouldFailValidationIfVoidedIsNull() throws Exception {
7979
order.setVoided(null);
8080
order.setConcept(Context.getConceptService().getConcept(88));
8181
order.setPatient(Context.getPatientService().getPatient(2));
82-
order.setOrderType(Context.getOrderService().getOrderType(1));
82+
//order.setOrderType(Context.getOrderService().getOrderType(1));
8383

8484
Errors errors = new BindException(order, "order");
8585
new OrderValidator().validate(order, errors);
@@ -99,7 +99,7 @@ public void validate_shouldFailValidationIfVoidedIsNull() throws Exception {
9999
public void validate_shouldFailValidationIfConceptIsNull() throws Exception {
100100
Order order = new Order();
101101
order.setPatient(Context.getPatientService().getPatient(2));
102-
order.setOrderType(Context.getOrderService().getOrderType(1));
102+
//order.setOrderType(Context.getOrderService().getOrderType(1));
103103

104104
Errors errors = new BindException(order, "order");
105105
new OrderValidator().validate(order, errors);
@@ -118,7 +118,7 @@ public void validate_shouldFailValidationIfConceptIsNull() throws Exception {
118118
public void validate_shouldFailValidationIfPatientIsNull() throws Exception {
119119
Order order = new Order();
120120
order.setConcept(Context.getConceptService().getConcept(88));
121-
order.setOrderType(Context.getOrderService().getOrderType(1));
121+
//order.setOrderType(Context.getOrderService().getOrderType(1));
122122

123123
Errors errors = new BindException(order, "order");
124124
new OrderValidator().validate(order, errors);
@@ -159,7 +159,7 @@ public void validate_shouldFailValidationIfStartDateAfterDiscontinuedDate() thro
159159
;
160160
order.setConcept(Context.getConceptService().getConcept(88));
161161
order.setPatient(Context.getPatientService().getPatient(2));
162-
order.setOrderType(Context.getOrderService().getOrderType(1));
162+
//order.setOrderType(Context.getOrderService().getOrderType(1));
163163
Calendar cal = Calendar.getInstance();
164164
cal.set(Calendar.DAY_OF_MONTH, cal.get(Calendar.DAY_OF_MONTH) - 1);
165165
order.setStartDate(new Date());
@@ -181,7 +181,7 @@ public void validate_shouldFailValidationIfStartDateAfterAutoExpireDate() throws
181181
Order order = new Order();
182182
order.setConcept(Context.getConceptService().getConcept(88));
183183
order.setPatient(Context.getPatientService().getPatient(2));
184-
order.setOrderType(Context.getOrderService().getOrderType(1));
184+
//order.setOrderType(Context.getOrderService().getOrderType(1));
185185
Calendar cal = Calendar.getInstance();
186186
cal.set(Calendar.DAY_OF_MONTH, cal.get(Calendar.DAY_OF_MONTH) - 1);
187187
order.setStartDate(new Date());
@@ -203,7 +203,7 @@ public void validate_shouldPassValidationIfAllFieldsAreCorrect() throws Exceptio
203203
Order order = new Order();
204204
order.setConcept(Context.getConceptService().getConcept(88));
205205
order.setPatient(Context.getPatientService().getPatient(2));
206-
order.setOrderType(Context.getOrderService().getOrderType(1));
206+
//order.setOrderType(Context.getOrderService().getOrderType(1));
207207
Calendar cal = Calendar.getInstance();
208208
cal.set(Calendar.DAY_OF_MONTH, cal.get(Calendar.DAY_OF_MONTH) - 1);
209209
order.setStartDate(cal.getTime());

‎web/src/main/java/org/openmrs/web/controller/PortletController.java

-21
Original file line numberDiff line numberDiff line change
@@ -297,27 +297,6 @@ else if (heightConcept.getUnits().equals("in"))
297297
}
298298
model.put("patientReasonForExit", reasonForExitObs);
299299

300-
if (Context.hasPrivilege(PrivilegeConstants.VIEW_ORDERS)) {
301-
List<DrugOrder> drugOrderList = Context.getOrderService().getDrugOrdersByPatient(p);
302-
model.put("patientDrugOrders", drugOrderList);
303-
List<DrugOrder> currentDrugOrders = new ArrayList<DrugOrder>();
304-
List<DrugOrder> discontinuedDrugOrders = new ArrayList<DrugOrder>();
305-
Date rightNow = new Date();
306-
for (Iterator<DrugOrder> iter = drugOrderList.iterator(); iter.hasNext();) {
307-
DrugOrder next = iter.next();
308-
if (next.isCurrent() || next.isFuture())
309-
currentDrugOrders.add(next);
310-
if (next.isDiscontinued(rightNow))
311-
discontinuedDrugOrders.add(next);
312-
}
313-
model.put("currentDrugOrders", currentDrugOrders);
314-
model.put("completedDrugOrders", discontinuedDrugOrders);
315-
316-
List<RegimenSuggestion> standardRegimens = Context.getOrderService().getStandardRegimens();
317-
if (standardRegimens != null)
318-
model.put("standardRegimens", standardRegimens);
319-
}
320-
321300
if (Context.hasPrivilege(PrivilegeConstants.VIEW_PROGRAMS)
322301
&& Context.hasPrivilege(PrivilegeConstants.VIEW_PATIENT_PROGRAMS)) {
323302
model.put("patientPrograms", Context.getProgramWorkflowService().getPatientPrograms(p, null,

‎web/src/main/java/org/openmrs/web/controller/order/OrderByUserListController.java

-163
This file was deleted.

‎web/src/main/java/org/openmrs/web/controller/order/OrderDrugFormController.java

-125
This file was deleted.

‎web/src/main/java/org/openmrs/web/controller/order/OrderDrugListController.java

-151
This file was deleted.

‎web/src/main/java/org/openmrs/web/controller/order/OrderFormController.java

-179
This file was deleted.

‎web/src/main/java/org/openmrs/web/controller/order/OrderListByPatientController.java

-212
This file was deleted.

‎web/src/main/java/org/openmrs/web/controller/order/OrderListController.java

-146
This file was deleted.

‎web/src/main/java/org/openmrs/web/controller/order/OrderTypeFormController.java

-100
This file was deleted.

‎web/src/main/java/org/openmrs/web/controller/order/OrderTypeListController.java

-147
This file was deleted.

‎web/src/main/java/org/openmrs/web/controller/order/OrderTypeValidator.java

-22
This file was deleted.

‎web/src/main/java/org/openmrs/web/dwr/DWROrderService.java

-408
This file was deleted.

‎web/src/main/java/org/openmrs/web/taglib/fieldgen/OrderTypeHandler.java

-56
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.