RESTWS-655: Program Enrollment Resource should not return voided pati…

…ent programs
oslynn · May 26, 2017 · e8b6ee1 · e8b6ee1
1 parent 2044bde
commit e8b6ee1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/...webservices/rest/web/v1_0/controller/openmrs1_10/ProgramEnrollmentController1_10Test.java b/...webservices/rest/web/v1_0/controller/openmrs1_10/ProgramEnrollmentController1_10Test.java
@@ -78,7 +78,18 @@ public void shouldGetAll() throws Exception {
 		SimpleObject result = deserialize(handle(req));
 
 		Patient patient = patientService.getPatientByUuid(RestTestConstants1_8.PATIENT_IN_A_PROGRAM_UUID);
-		List<PatientProgram> patientPrograms = service.getPatientPrograms(patient, null, null, null, null, null, true);
+		List<PatientProgram> patientPrograms = service.getPatientPrograms(patient, null, null, null, null, null, false);
+		Assert.assertEquals(patientPrograms.size(), Util.getResultsSize(result));
+	}
+
+	@Test
+	public void shouldExcludeRetired() throws Exception {
+		MockHttpServletRequest req = request(RequestMethod.GET, getURI());
+		req.setParameter("patient", RestTestConstants1_8.PATIENT_WITH_VOIDED_PROGRAM_UUID);
+		SimpleObject result = deserialize(handle(req));
+
+		Patient patient = patientService.getPatientByUuid(RestTestConstants1_8.PATIENT_WITH_VOIDED_PROGRAM_UUID);
+		List<PatientProgram> patientPrograms = service.getPatientPrograms(patient, null, null, null, null, null, false);
 		Assert.assertEquals(patientPrograms.size(), Util.getResultsSize(result));
 	}
 

diff --git a/...rs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ProgramEnrollmentResource1_8.java b/...rs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ProgramEnrollmentResource1_8.java
@@ -113,7 +113,7 @@ public DelegatingResourceDescription getCreatableProperties() {
 	}
 
 	/**
-	 * Gets all the programs (including voided) of the given patient
+	 * Gets all the programs (excluding voided) of the given patient
 	 * 
 	 * @param context
 	 * @return all programs of the given patient
@@ -129,7 +129,7 @@ protected PageableResult doSearch(RequestContext context) {
 			}
 
 			List<PatientProgram> patientPrograms = Context.getProgramWorkflowService().getPatientPrograms(patient, null,
-			    null, null, null, null, true);
+			    null, null, null, null, false);
 			return new NeedsPaging<PatientProgram>(patientPrograms, context);
 		}
 		return super.doSearch(context);

diff --git a/omod-1.8/src/test/java/org/openmrs/module/webservices/rest/web/RestTestConstants1_8.java b/omod-1.8/src/test/java/org/openmrs/module/webservices/rest/web/RestTestConstants1_8.java
@@ -93,6 +93,8 @@ public class RestTestConstants1_8 {
 
 	public static final String PATIENT_IN_A_PROGRAM_UUID = "da7f524f-27ce-4bb2-86d6-6d1d05312bd5";
 
+	public static final String PATIENT_WITH_VOIDED_PROGRAM_UUID = "8adf539e-4b5a-47aa-80c0-ba1025c957fa";
+
 	public static final String STATE_UUID = "92584cdc-6a20-4c84-a659-e035e45d36b0";
 
 	public static final String PATIENT_STATE_UUID = "ea89deaa-23cc-4840-92fe-63d199c37e4c";

diff --git a/...e/webservices/rest/web/v1_0/controller/openmrs1_9/ProgramEnrollmentController1_9Test.java b/...e/webservices/rest/web/v1_0/controller/openmrs1_9/ProgramEnrollmentController1_9Test.java
@@ -84,6 +84,17 @@ public void shouldGetAll() throws Exception {
 		Assert.assertEquals(patientPrograms.size(), Util.getResultsSize(result));
 	}
 
+	@Test
+	public void shouldExcludeRetired() throws Exception {
+		MockHttpServletRequest req = request(RequestMethod.GET, getURI());
+		req.setParameter("patient", RestTestConstants1_8.PATIENT_WITH_VOIDED_PROGRAM_UUID);
+		SimpleObject result = deserialize(handle(req));
+
+		Patient patient = patientService.getPatientByUuid(RestTestConstants1_8.PATIENT_WITH_VOIDED_PROGRAM_UUID);
+		List<PatientProgram> patientPrograms = service.getPatientPrograms(patient, null, null, null, null, null, false);
+		Assert.assertEquals(patientPrograms.size(), Util.getResultsSize(result));
+	}
+
 	@Test
 	public void shouldGetTheDefaultRepresentationOfPatientProgram() throws Exception {
 		MockHttpServletRequest req = request(RequestMethod.GET, getURI() + "/" + getUuid());