added limit for dates list

Author: Paurikova2

dspace-api/src/main/java/org/dspace/app/healthreport/HealthReport.java

@@ -143,7 +143,7 @@ public void internalRun() throws Exception {
             return;
         }
 
-        try (Context context = new Context()){
+        try (Context context = new Context()) {
             context.setCurrentUser(ePersonService.find(context, this.getEpersonIdentifier()));
 
             ReportInfo ri = new ReportInfo(this.forLastNDays);

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

@@ -21,6 +21,8 @@
 import java.util.Map;
 import java.util.Objects;
 
+import javax.mail.MessagingException;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flipkart.zjsonpatch.JsonDiff;
@@ -39,8 +41,6 @@
 import org.dspace.scripts.DSpaceRunnable;
 import org.dspace.utils.DSpace;
 
-import javax.mail.MessagingException;
-
 /**
  * This class implements a DSpace script that compares two health reports
  * and shows the differences between them.
@@ -66,6 +66,12 @@ public class ReportDiff extends DSpaceRunnable<ReportDiffScriptConfiguration> {
      */
     private boolean showDates = false;
 
+    /**
+     * `-l`: Limits the number of report entries (dates) displayed when using the --date option.
+     * Default is -1 (no limit).
+     */
+    private long limit = -1;
+
     /**
      * `-c`: Check, perform only specific check by index (0-`getNumberOfChecks()`).
      */
@@ -113,7 +119,16 @@ public void setup() throws ParseException {
         }
 
         // `-d`: Dates, show all dates that the report was generated for a specific check type.
-        showDates = commandLine.hasOption('d');
+        if (commandLine.hasOption('d')) {
+            showDates = commandLine.hasOption('d');
+            try {
+                limit = Long.parseLong(commandLine.getOptionValue("l"));
+            } catch (NumberFormatException e) {
+                handler.logError("Invalid value for -l. Must be a valid number.");
+                return;
+            }
+        }
+
 
         // `-f`: From, specify the start date for the report.
         from = parseDateOption(commandLine.getOptionValue('f'));
@@ -256,9 +271,12 @@ private void displayReportDates() {
         try (Context context = new Context()) {
             context.setCurrentUser(ePersonService.find(context, getEpersonIdentifier()));
             List<ReportResult> allReports = reportResultService.findAll(context);
-
+            // Determine how many reports to process, respecting the `limit` if it's within valid range
+            long limitCount = (limit > 0 && limit < allReports.size()) ? limit : allReports.size();
             Map<String, List<DateWithArgs>> reportDatesMap = new HashMap<>();
-            for (ReportResult report : allReports) {
+            for (long i = 0; i < limitCount; i++) {
+                // the newest report is at the end of the list, so we reverse the index
+                ReportResult report = allReports.get(allReports.size() - 1 - (int) i);
                 String formattedDate = FORMATTER.format(report.getLastModified()
                         .toInstant()
                         .atZone(ZoneId.systemDefault()).toLocalDateTime());
@@ -276,7 +294,7 @@ private void displayReportDates() {
                                 .append("  - ")
                                 .append(dwa.getDate())
                                 .append(" | ")
-                                .append(dwa.getArgs().stripLeading())
+                                .append(dwa.getArgs() != null ? dwa.getArgs().strip() : "")
                                 .append("\n"));
             });
 

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

@@ -43,7 +43,9 @@ public Options getOptions() {
                             "otherwise perform default checks).", HealthReport.getNumberOfChecks() - 1));
             options.getOption("c").setType(String.class);
 
-            options.addOption("d", "dates", false, "Show all report dates");
+            options.addOption("d", "dates", false,options.addOption("l", "limit", true, "Limit the number of report entries to this value. " +
+                    "If not specified, all entries are shown.");
+            options.getOption("l").setType(String.class);
 
             options.addOption("f", "from", true,"Report from specific date [YYYY-MM-DD HH:mm:ss.SSS].");
             options.getOption("f").setType(String.class);

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

@@ -308,4 +308,33 @@ public void testReportDiff() throws Exception {
         List<String> infoMessages = handler.getInfoMessages();
         assertThat(infoMessages, hasItem(containsString("REPLACE at /checks/0/report/key: \"value1\" -> \"value2\"")));
     }
+
+    @Test
+    public void testShowDatesLimit() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        ReportResult report1 = reportResultService.create(context);
+        report1.setType("healthcheck");
+        report1.setValue("{\"checks\":[]}");
+        report1.setLastModified(new Date(1000));
+        reportResultService.update(context, report1);
+
+        ReportResult report2 = reportResultService.create(context);
+        report2.setType("healthcheck");
+        report2.setValue("{\"checks\":[]}");
+        report2.setLastModified(new Date(2000));
+        reportResultService.update(context, report2);
+
+        context.restoreAuthSystemState();
+
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+        String[] args = new String[] { "report-diff", "-d", "-l", "1" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+
+        List<String> infoMessages = handler.getInfoMessages();
+        assertThat(infoMessages, hasItem(containsString("Report Dates Summary:")));
+        assertThat(infoMessages, hasItem(containsString("Report Type: healthcheck")));
+        assertThat(infoMessages, not(hasItem(containsString(formatDate(report1.getLastModified())))));
+        assertThat(infoMessages, hasItem(containsString(formatDate(report2.getLastModified()))));
+    }
 }