O3-4632: Changing the request calls for medication orders (#99)

* O3-4632: Changing the request calls for medication orders

* O3-4632: Changing the request calls for medication orders

* Formatting changes

* Formatting changes

Author: jayg2002

src/test/java/org/openmrs/performance/http/DoctorHttpService.java

@@ -145,22 +145,32 @@ public HttpRequestActionBuilder getAllActiveOrders(String patientUuid) {
 		    "/openmrs/ws/rest/v1/order?patient=" + patientUuid + "&careSetting=" + CARE_SETTING_UUID + "&status=ACTIVE");
 	}
 
-	public HttpRequestActionBuilder getDrugOrders(String patientUuid) {
+	public HttpRequestActionBuilder getDrugOrdersExceptCancelledAndExpired(String patientUuid) {
 		String customRepresentation = """
-		        custom:(uuid,dosingType,orderNumber,accessionNumber,
-		        	patient:ref,action,careSetting:ref,previousOrder:ref,dateActivated,scheduledDate,dateStopped,autoExpireDate,
-		        	orderType:ref,encounter:ref,
-		        	orderer:(uuid,display,person:(display)),
-		        	orderReason,orderReasonNonCoded,orderType,urgency,instructions,
-		        	commentToFulfiller,
-		        	drug:(uuid,display,strength,
-		        		dosageForm:(display,uuid),concept),
-		        		dose,doseUnits:ref,
-		        	frequency:ref,asNeeded,asNeededCondition,quantity,quantityUnits:ref,numRefills,dosingInstructions,
-		        	duration,durationUnits:ref,route:ref,brandName,dispenseAsWritten)
+		        custom:(uuid,dosingType,orderNumber,accessionNumber,patient:ref,action,careSetting:ref,
+		        previousOrder:ref,dateActivated,scheduledDate,dateStopped,autoExpireDate,orderType:ref,
+		        encounter:ref,orderer:(uuid,display,person:(display)),orderReason,orderReasonNonCoded,
+		        orderType,urgency,instructions,commentToFulfiller,drug:(uuid,display,strength,dosageForm:(display,uuid),concept),
+		        dose,doseUnits:ref,frequency:ref,asNeeded,asNeededCondition,quantity,quantityUnits:ref,
+		        numRefills,dosingInstructions,duration,durationUnits:ref,route:ref,brandName,dispenseAsWritten)
 		        """;
-		return http("Get Orders").get("/openmrs/ws/rest/v1/order" + "?patient=" + patientUuid + "&careSetting="
-		        + CARE_SETTING_UUID + "&status=any&orderType=" + DRUG_ORDER + "&v=" + customRepresentation);
+		return http("Get Drug Orders except the cancelled and expired").get(
+		    "/openmrs/ws/rest/v1/order" + "?patient=" + patientUuid + "&careSetting=" + CARE_SETTING_UUID
+		            + "&status=any&orderType=" + DRUG_ORDER + "&excludeCanceledAndExpired=true&v=" + customRepresentation);
+	}
+
+	public HttpRequestActionBuilder getDrugOrdersExceptDiscontinuedOrders(String patientUuid) {
+		String customRepresentation = """
+		        custom:(uuid,dosingType,orderNumber,accessionNumber,patient:ref,action,careSetting:ref,
+		        previousOrder:ref,dateActivated,scheduledDate,dateStopped,autoExpireDate,orderType:ref,
+		        encounter:ref,orderer:(uuid,display,person:(display)),orderReason,orderReasonNonCoded,
+		        orderType,urgency,instructions,commentToFulfiller,drug:(uuid,display,strength,dosageForm:(display,uuid),concept),
+		        dose,doseUnits:ref,frequency:ref,asNeeded,asNeededCondition,quantity,quantityUnits:ref,
+		        numRefills,dosingInstructions,duration,durationUnits:ref,route:ref,brandName,dispenseAsWritten)
+		        """;
+		return http("Get Drug Orders except the discontinued orders").get("/openmrs/ws/rest/v1/order" + "?patient="
+		        + patientUuid + "&careSetting=" + CARE_SETTING_UUID + "&status=any&orderType=" + DRUG_ORDER + "&v="
+		        + customRepresentation + "&excludeDiscontinueOrders=true");
 	}
 
 	public HttpRequestActionBuilder getAllergies(String patientUuid) {

src/test/java/org/openmrs/performance/registries/DoctorRegistry.java

@@ -68,7 +68,9 @@ public ChainBuilder recordVitals(String patientUuid) {
 	}
 
 	public ChainBuilder openMedicationsTab(String patientUuid) {
-		return exec(httpService.getDrugOrders(patientUuid));
+		return exec(httpService.getDrugOrdersExceptCancelledAndExpired(patientUuid))
+		        .exec(httpService.getDrugOrdersExceptDiscontinuedOrders(patientUuid))
+		        .exec(httpService.getActiveVisitOfPatient(patientUuid));
 	}
 
 	public ChainBuilder openOrdersTab(String patientUuid) {