O3-1494: Changes after 1st code review

openmrs · Feb 21, 2024 · 533d2b5 · 533d2b5
1 parent aca2b85
commit 533d2b5
Show file tree

Hide file tree

Showing 15 changed files with 293 additions and 81 deletions.
diff --git a/api-tests/src/test/java/org/openmrs/module/reporting/report/service/ReportServiceTest.java b/api-tests/src/test/java/org/openmrs/module/reporting/report/service/ReportServiceTest.java
@@ -27,6 +27,7 @@
 import org.openmrs.module.reporting.report.ReportProcessorConfiguration;
 import org.openmrs.module.reporting.report.ReportRequest;
 import org.openmrs.module.reporting.report.ReportRequest.Priority;
+import org.openmrs.module.reporting.report.ReportRequestDTO;
 import org.openmrs.module.reporting.report.definition.ReportDefinition;
 import org.openmrs.module.reporting.report.definition.service.ReportDefinitionService;
 import org.openmrs.module.reporting.report.processor.LoggingReportProcessor;
@@ -42,14 +43,17 @@
 
 import java.io.File;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class ReportServiceTest extends BaseModuleContextSensitiveTest {
 
@@ -521,4 +525,76 @@ public void purgeReportDesignsForReportDefinition_shouldDeleteAllAssociatedRepor
  assertNull(rs.getReportDesignByUuid("d7a82b63-1066-4c1d-9b43-b405851fc467"));
  assertNull(rs.getReportDesignByUuid("e7a82b63-1066-4c1d-9b43-b405851fc467"));
  }
-}
+
+ @Test
+ public void getReportRequestsWithPagination_shouldReturnAllReportRequestsPagedWithCorrectTotalCount() {
+ final ReportService rs = Context.getService(ReportService.class);
+ final ReportRequestDTO result = rs.getReportRequestsWithPagination(null, null, null, 1,2);
+
+ assertEquals(4, result.getReportRequestCount());
+ assertEquals(2, result.getReportRequests().size());
+
+ final List<String> resultUuids = mapToReportRequestUuids(result.getReportRequests());
+ assertTrue(resultUuids.contains("fce15a1b-4618-4f65-bfe9-8bb60a85c110"));
+ assertTrue(resultUuids.contains("b0a82b63-1066-4c1d-9b43-b405851fc467"));
+ }
+
+ @Test
+ public void getReportRequestsWithPagination_shouldReturnReportRequestsForGivenReportDefinitionPaged() {
+ final ReportService rs = Context.getService(ReportService.class);
+ final ReportDefinition testReportDefinition =
+ rs.getReportDesignByUuid("d7a82b63-1066-4c1d-9b43-b405851fc467").getReportDefinition();
+ final ReportRequestDTO result = rs.getReportRequestsWithPagination(testReportDefinition, null, null, 1,2);
+
+ assertEquals(2, result.getReportRequestCount());
+ assertEquals(2, result.getReportRequests().size());
+
+ final List<String> resultUuids = mapToReportRequestUuids(result.getReportRequests());
+ assertTrue(resultUuids.contains("h8a82b63-1066-4c1d-9b43-b405851fc467"));
+ assertTrue(resultUuids.contains("b0a82b63-1066-4c1d-9b43-b405851fc467"));
+ }
+
+ @Test
+ public void getReportRequestsWithPagination_shouldReturnReportRequestsForRequestedWithinDatesPaged() {
+ final ReportService rs = Context.getService(ReportService.class);
+ final Date from = newDate(2013, Calendar.JANUARY, 21, 14, 8, 48);
+ final Date to = newDate(2013, Calendar.JANUARY, 21, 14, 8, 49);
+ final ReportRequestDTO result = rs.getReportRequestsWithPagination(null, from, to, 1,2);
+
+ assertEquals(2, result.getReportRequestCount());
+ assertEquals(2, result.getReportRequests().size());
+
+ final List<String> resultUuids = mapToReportRequestUuids(result.getReportRequests());
+ assertTrue(resultUuids.contains("b0a82b63-1066-4c1d-9b43-b405851fc467"));
+ assertTrue(resultUuids.contains("d9a82b63-1066-4c1d-9b43-b405851fc467"));
+ }
+
+ @Test
+ public void getReportRequestsWithPagination_shouldReturnAPartialPageOfReportRequests() {
+ final ReportService rs = Context.getService(ReportService.class);
+ final ReportRequestDTO result = rs.getReportRequestsWithPagination(null, null, null, 1, 2, ReportRequest.Status.FAILED);
+
+ assertEquals(1, result.getReportRequestCount());
+ assertEquals(1, result.getReportRequests().size());
+
+ final List<String> resultUuids = mapToReportRequestUuids(result.getReportRequests());
+ assertTrue(resultUuids.contains("fce15a1b-4618-4f65-bfe9-8bb60a85c110"));
+ }
+
+ private List<String> mapToReportRequestUuids(List<ReportRequest> reportRequests) {
+ List<String> reportRequestUuids = new ArrayList<String>();
+
+ for (ReportRequest reportRequest : reportRequests) {
+ reportRequestUuids.add(reportRequest.getUuid());
+ }
+
+ return reportRequestUuids;
+ }
+
+ private Date newDate(int year, int month, int day, int hour, int minute, int second) {
+ final Calendar cal = Calendar.getInstance();
+ cal.clear();
+ cal.set(year, month, day, hour, minute, second);
+ return cal.getTime();
+ }
+}
diff --git a/...rc/test/resources/org/openmrs/module/reporting/include/ReportTestDataset-openmrs-1.10.xml b/...rc/test/resources/org/openmrs/module/reporting/include/ReportTestDataset-openmrs-1.10.xml
@@ -523,11 +523,21 @@
  properties="#Mon Jan 21 14:08:47 CET 2013" creator="1"
  date_created="2013-01-21 14:08:47" retired="0" />
 
- <reporting_report_request id="1" uuid="h8a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
- <reporting_report_request id="2" uuid="d9a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
- <reporting_report_request id="3" uuid="b0a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
-
-</dataset>
+ <reporting_report_request id="1" uuid="h8a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:47" />
+ <reporting_report_request id="2" uuid="d9a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:48" />
+ <reporting_report_request id="3" uuid="b0a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:49" />
+ <reporting_report_request id="4" uuid="fce15a1b-4618-4f65-bfe9-8bb60a85c110"
+ report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873925"
+ process_automatically="1" priority="LOW" status="FAILED" requested_by="1"
+ request_datetime="2013-01-21 14:08:50" />
+
+</dataset>
diff --git a/...rc/test/resources/org/openmrs/module/reporting/include/ReportTestDataset-openmrs-1.11.xml b/...rc/test/resources/org/openmrs/module/reporting/include/ReportTestDataset-openmrs-1.11.xml
@@ -545,11 +545,21 @@
  properties="#Mon Jan 21 14:08:47 CET 2013" creator="1"
  date_created="2013-01-21 14:08:47" retired="0" />
 
- <reporting_report_request id="1" uuid="h8a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
- <reporting_report_request id="2" uuid="d9a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
- <reporting_report_request id="3" uuid="b0a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
+ <reporting_report_request id="1" uuid="h8a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:47" />
+ <reporting_report_request id="2" uuid="d9a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:48" />
+ <reporting_report_request id="3" uuid="b0a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:49" />
+ <reporting_report_request id="4" uuid="fce15a1b-4618-4f65-bfe9-8bb60a85c110"
+ report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873925"
+ process_automatically="1" priority="LOW" status="FAILED" requested_by="1"
+ request_datetime="2013-01-21 14:08:50" />
 
-</dataset>
+</dataset>
diff --git a/...rc/test/resources/org/openmrs/module/reporting/include/ReportTestDataset-openmrs-1.12.xml b/...rc/test/resources/org/openmrs/module/reporting/include/ReportTestDataset-openmrs-1.12.xml
@@ -545,11 +545,21 @@
  properties="#Mon Jan 21 14:08:47 CET 2013" creator="1"
  date_created="2013-01-21 14:08:47" retired="0" />
 
- <reporting_report_request id="1" uuid="h8a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
- <reporting_report_request id="2" uuid="d9a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
- <reporting_report_request id="3" uuid="b0a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
+ <reporting_report_request id="1" uuid="h8a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:47" />
+ <reporting_report_request id="2" uuid="d9a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:48" />
+ <reporting_report_request id="3" uuid="b0a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:49" />
+ <reporting_report_request id="4" uuid="fce15a1b-4618-4f65-bfe9-8bb60a85c110"
+ report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873925"
+ process_automatically="1" priority="LOW" status="FAILED" requested_by="1"
+ request_datetime="2013-01-21 14:08:50" />
 
-</dataset>
+</dataset>
diff --git a/...src/test/resources/org/openmrs/module/reporting/include/ReportTestDataset-openmrs-1.9.xml b/...src/test/resources/org/openmrs/module/reporting/include/ReportTestDataset-openmrs-1.9.xml
@@ -529,11 +529,21 @@
  properties="#Mon Jan 21 14:08:47 CET 2013" creator="1"
  date_created="2013-01-21 14:08:47" retired="0" />
 
- <reporting_report_request id="1" uuid="h8a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
- <reporting_report_request id="2" uuid="d9a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
- <reporting_report_request id="3" uuid="b0a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
+ <reporting_report_request id="1" uuid="h8a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:47" />
+ <reporting_report_request id="2" uuid="d9a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:48" />
+ <reporting_report_request id="3" uuid="b0a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:49" />
+ <reporting_report_request id="4" uuid="fce15a1b-4618-4f65-bfe9-8bb60a85c110"
+ report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873925"
+ process_automatically="1" priority="LOW" status="FAILED" requested_by="1"
+ request_datetime="2013-01-21 14:08:50" />
 
 </dataset>
diff --git a/...src/test/resources/org/openmrs/module/reporting/include/ReportTestDataset-openmrs-2.0.xml b/...src/test/resources/org/openmrs/module/reporting/include/ReportTestDataset-openmrs-2.0.xml
@@ -553,11 +553,21 @@
  properties="#Mon Jan 21 14:08:47 CET 2013" creator="1"
  date_created="2013-01-21 14:08:47" retired="0" />
 
- <reporting_report_request id="1" uuid="h8a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
- <reporting_report_request id="2" uuid="d9a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
- <reporting_report_request id="3" uuid="b0a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
-
-</dataset>
+ <reporting_report_request id="1" uuid="h8a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:47" />
+ <reporting_report_request id="2" uuid="d9a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:48" />
+ <reporting_report_request id="3" uuid="b0a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:49" />
+ <reporting_report_request id="4" uuid="fce15a1b-4618-4f65-bfe9-8bb60a85c110"
+ report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873925"
+ process_automatically="1" priority="LOW" status="FAILED" requested_by="1"
+ request_datetime="2013-01-21 14:08:50" />
+
+</dataset>
diff --git a/...src/test/resources/org/openmrs/module/reporting/include/ReportTestDataset-openmrs-2.1.xml b/...src/test/resources/org/openmrs/module/reporting/include/ReportTestDataset-openmrs-2.1.xml
@@ -553,12 +553,22 @@
  properties="#Mon Jan 21 14:08:47 CET 2013" creator="1"
  date_created="2013-01-21 14:08:47" retired="0" />
 
- <reporting_report_request id="1" uuid="h8a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
- <reporting_report_request id="2" uuid="d9a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
- <reporting_report_request id="3" uuid="b0a82b63-1066-4c1d-9b43-b405851fc467" report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
- process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1" request_datetime="2013-01-21 14:08:47" />
-
-
-</dataset>
+ <reporting_report_request id="1" uuid="h8a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:47" />
+ <reporting_report_request id="2" uuid="d9a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:48" />
+ <reporting_report_request id="3" uuid="b0a82b63-1066-4c1d-9b43-b405851fc467"
+ report_definition_uuid="c11f5354-9567-4cc5-b3ef-163e28873926"
+ process_automatically="1" priority="LOW" status="REQUESTED" requested_by="1"
+ request_datetime="2013-01-21 14:08:49" />
+ <reporting_report_request id="4" uuid="fce15a1b-4618-4f65-bfe9-8bb60a85c110"
+ report_definition_uuid="d11f5354-9567-4cc5-b3ef-163e28873925"
+ process_automatically="1" priority="LOW" status="FAILED" requested_by="1"
+ request_datetime="2013-01-21 14:08:50" />
+
+
+</dataset>