Sorting reports and updating tests, plus enable multiple -c in report-diff

Author: Matus Kasak

dspace-api/src/main/java/org/dspace/app/reportdiff/ReportDiff.java

@@ -262,6 +262,11 @@ public void internalRun() throws Exception {
 
             defaultReportIds(context);
 
+            if (sourceReportId == null || targetReportId == null) {
+                handler.logInfo("Need at least 2 reports in the database to perform a comparison. Aborting.");
+                return;
+            }
+
             if (!validateReportIdSelection()) {
                 return;
             }
@@ -353,6 +358,9 @@ private void defaultReportIds(Context context) {
                 return;
             }
 
+            // findAll() does not guarantee ordering; sort by lastModified ascending so the
+            // newest reports are at the end of the list.
+            allReports.sort(Comparator.comparing(ReportResult::getLastModified));
             int size = allReports.size();
 
             if (Objects.isNull(targetReportId) && size > 0) {
@@ -376,6 +384,9 @@ private void displayReportDates() {
         try (Context context = new Context()) {
             context.setCurrentUser(ePersonService.find(context, getEpersonIdentifier()));
             List<ReportResult> allReports = reportResultService.findAll(context);
+            // findAll() does not guarantee ordering; sort by lastModified ascending so the
+            // newest reports are at the end of the list.
+            allReports.sort(Comparator.comparing(ReportResult::getLastModified));
             // Determine how many reports to process, respecting maxEntries if it's within valid range
             long limitCount = (maxEntries > 0 && maxEntries < allReports.size()) ? maxEntries : allReports.size();
             Map<String, List<DateWithArgs>> reportDatesMap = new HashMap<>();

dspace-api/src/main/java/org/dspace/app/reportdiff/ReportDiffScriptConfiguration.java

@@ -7,6 +7,7 @@
  */
 package org.dspace.app.reportdiff;
 
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.dspace.app.healthreport.HealthReport;
 import org.dspace.scripts.configuration.ScriptConfiguration;
@@ -38,11 +39,13 @@ public Options getOptions() {
             options.addOption("e", "email", true,
                     "Send report to this email address.");
             options.getOption("e").setType(String.class);
-            options.addOption("c", "check", true,
-                    String.format("Filter comparison to a specific check by index (0 to %d). " +
-                            "Only the specified check will be compared from both reports.",
-                            HealthReport.getNumberOfChecks() - 1));
-            options.getOption("c").setType(String.class);
+            Option checkOption = Option.builder("c").longOpt("check").hasArgs()
+                    .desc(String.format("Filter comparison to one or more specific checks by index (0 to %d). " +
+                            "Repeat the flag (e.g. -c 1 -c 3) to compare multiple checks from both reports.",
+                            HealthReport.getNumberOfChecks() - 1))
+                    .type(String.class)
+                    .build();
+            options.addOption(checkOption);
 
             options.addOption("l", "list", false,
                     "List available reports (ID, timestamp, args). Use to find report IDs.");

dspace-api/src/test/java/org/dspace/scripts/HealthReportIT.java

@@ -255,20 +255,21 @@ public void testReportFileSaved() throws Exception {
         String content = Files.readString(tempFile.toPath());
         assertThat("Report file must contain health report header", content, containsString("HEALTH REPORT:"));
     }
-        @Test
-        public void testStoredArgsContainAllCheckOptions() throws Exception {
-                ReportResultService reportResultService = ContentServiceFactory.getInstance().getReportResultService();
-
-                TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
-                String[] args = new String[] { "health-report", "-c", "2", "-c", "3" };
-                ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
-
-                context.reloadEntity(eperson);
-                List<ReportResult> allReports = reportResultService.findAll(context);
-                ReportResult latest = allReports.get(allReports.size() - 1);
-
-                assertThat(handler.getErrorMessages(), empty());
-                assertThat(latest.getArgs(), containsString("-c: 2"));
-                assertThat(latest.getArgs(), containsString("-c: 3"));
-        }
+
+    @Test
+    public void testStoredArgsContainAllCheckOptions() throws Exception {
+        ReportResultService reportResultService = ContentServiceFactory.getInstance().getReportResultService();
+
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+        String[] args = new String[] { "health-report", "-c", "2", "-c", "3" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+
+        context.reloadEntity(eperson);
+        List<ReportResult> allReports = reportResultService.findAll(context);
+        ReportResult latest = allReports.get(allReports.size() - 1);
+
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(latest.getArgs(), containsString("-c: 2"));
+        assertThat(latest.getArgs(), containsString("-c: 3"));
+    }
 }