Implement requested changes: JobStats columns, StepReport entity, fix line separator

Co-authored-by: hmiguim <1252710+hmiguim@users.noreply.github.com>

Author: Copilot

roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/jobs/Job.java

@@ -22,7 +22,6 @@
 import org.roda.core.data.v2.ip.HasId;
 import org.roda.core.data.v2.ip.HasInstanceID;
 import org.roda.core.data.v2.ip.HasInstanceName;
-import org.roda.core.data.v2.jpa.JobStatsConverter;
 import org.roda.core.data.v2.jpa.JobUserDetailsListConverter;
 import org.roda.core.data.v2.jpa.ObjectMapConverter;
 import org.roda.core.data.v2.jpa.SelectedItemsConverter;
@@ -96,10 +95,29 @@ public enum JOB_STATE {
   @Column(name = "instance_name")
   private String instanceName = null;
 
-  // job statistics (total source objects, etc.)
-  @Column(name = "job_stats", columnDefinition = "TEXT")
-  @Convert(converter = JobStatsConverter.class)
-  JobStats jobStats = new JobStats();
+  // job statistics - expanded into separate columns
+  @Column(name = "stats_completion_percentage")
+  private int statsCompletionPercentage = 0;
+  @Column(name = "stats_source_objects_count")
+  private int statsSourceObjectsCount = 0;
+  @Column(name = "stats_source_objects_being_processed")
+  private int statsSourceObjectsBeingProcessed = 0;
+  @Column(name = "stats_source_objects_waiting_to_be_processed")
+  private int statsSourceObjectsWaitingToBeProcessed = 0;
+  @Column(name = "stats_source_objects_processed_with_success")
+  private int statsSourceObjectsProcessedWithSuccess = 0;
+  @Column(name = "stats_source_objects_processed_with_partial_success")
+  private int statsSourceObjectsProcessedWithPartialSuccess = 0;
+  @Column(name = "stats_source_objects_processed_with_failure")
+  private int statsSourceObjectsProcessedWithFailure = 0;
+  @Column(name = "stats_source_objects_processed_with_skipped")
+  private int statsSourceObjectsProcessedWithSkipped = 0;
+  @Column(name = "stats_outcome_objects_with_manual_intervention")
+  private int statsOutcomeObjectsWithManualIntervention = 0;
+
+  // Transient jobStats field for backwards compatibility with existing code
+  @Transient
+  private JobStats jobStats = null;
 
   // plugin full class (e.g. org.roda.core.plugins.plugins.base.FixityPlugin)
   @Column(name = "plugin")
@@ -258,11 +276,36 @@ public void setStateDetails(String stateDetails) {
   }
 
   public JobStats getJobStats() {
+    // Build JobStats from individual columns for backwards compatibility
+    if (jobStats == null) {
+      jobStats = new JobStats();
+    }
+    jobStats.setCompletionPercentage(statsCompletionPercentage);
+    jobStats.setSourceObjectsCount(statsSourceObjectsCount);
+    jobStats.setSourceObjectsBeingProcessed(statsSourceObjectsBeingProcessed);
+    jobStats.setSourceObjectsWaitingToBeProcessed(statsSourceObjectsWaitingToBeProcessed);
+    jobStats.setSourceObjectsProcessedWithSuccess(statsSourceObjectsProcessedWithSuccess);
+    jobStats.setSourceObjectsProcessedWithPartialSuccess(statsSourceObjectsProcessedWithPartialSuccess);
+    jobStats.setSourceObjectsProcessedWithFailure(statsSourceObjectsProcessedWithFailure);
+    jobStats.setSourceObjectsProcessedWithSkipped(statsSourceObjectsProcessedWithSkipped);
+    jobStats.setOutcomeObjectsWithManualIntervention(statsOutcomeObjectsWithManualIntervention);
     return jobStats;
   }
 
   public void setJobStats(JobStats jobStats) {
     this.jobStats = jobStats;
+    // Sync to individual columns
+    if (jobStats != null) {
+      this.statsCompletionPercentage = jobStats.getCompletionPercentage();
+      this.statsSourceObjectsCount = jobStats.getSourceObjectsCount();
+      this.statsSourceObjectsBeingProcessed = jobStats.getSourceObjectsBeingProcessed();
+      this.statsSourceObjectsWaitingToBeProcessed = jobStats.getSourceObjectsWaitingToBeProcessed();
+      this.statsSourceObjectsProcessedWithSuccess = jobStats.getSourceObjectsProcessedWithSuccess();
+      this.statsSourceObjectsProcessedWithPartialSuccess = jobStats.getSourceObjectsProcessedWithPartialSuccess();
+      this.statsSourceObjectsProcessedWithFailure = jobStats.getSourceObjectsProcessedWithFailure();
+      this.statsSourceObjectsProcessedWithSkipped = jobStats.getSourceObjectsProcessedWithSkipped();
+      this.statsOutcomeObjectsWithManualIntervention = jobStats.getOutcomeObjectsWithManualIntervention();
+    }
   }
 
   public String getPlugin() {

roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/jobs/Report.java

@@ -17,20 +17,23 @@
 import org.roda.core.data.v2.ip.HasId;
 import org.roda.core.data.v2.ip.HasInstanceID;
 import org.roda.core.data.v2.ip.SIPInformation;
-import org.roda.core.data.v2.jpa.ReportListConverter;
 import org.roda.core.data.v2.jpa.StringListConverter;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Index;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
 import jakarta.persistence.Table;
 import jakarta.persistence.Temporal;
 import jakarta.persistence.TemporalType;
@@ -111,9 +114,13 @@ public class Report implements IsModelObject, HasId, HasInstanceID {
   @JsonIgnore
   private SIPInformation sipInformation = new SIPInformation();
 
-  @Column(name = "reports", columnDefinition = "TEXT")
-  @Convert(converter = ReportListConverter.class)
-  private List<Report> reports = new ArrayList<>();
+  @OneToMany(mappedBy = "parentReportId", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
+  @OrderBy("stepOrder ASC")
+  private List<StepReport> stepReports = new ArrayList<>();
+
+  // Transient field for backwards compatibility with existing code that uses List<Report>
+  @Transient
+  private List<Report> reports = null;
 
   @Column(name = "line_separator")
   private String lineSeparator = "";
@@ -152,7 +159,8 @@ public Report(Report report) {
     this.pluginIsMandatory = report.getPluginIsMandatory();
     this.pluginDetails = report.getPluginDetails();
     this.htmlPluginDetails = report.isHtmlPluginDetails();
-    this.reports = new ArrayList<>();
+    this.reports = null;
+    this.stepReports = new ArrayList<>();
     this.instanceId = report.getInstanceId();
     this.transactionId = report.getTransactionId();
   }
@@ -472,12 +480,25 @@ public Report addReport(Report report, boolean updateReportItemDateUpdated) {
       ReportUtils.calculatePluginState(getPluginState(), report.getPluginState(), report.getPluginIsMandatory()));
 
     if (!"".equals(report.getPluginDetails()) && !getPluginDetails().equals(report.getPluginDetails())) {
+      // Fix: avoid adding repeated line separators
+      String separator = (lineSeparator != null && !lineSeparator.isEmpty()) ? lineSeparator : "\n";
       setPluginDetails(
-        (!"".equals(getPluginDetails()) ? getPluginDetails() + lineSeparator : "") + report.getPluginDetails());
+        (!"".equals(getPluginDetails()) ? getPluginDetails() + separator : "") + report.getPluginDetails());
     }
     setOutcomeObjectState(report.getOutcomeObjectState());
 
+    // Add to both stepReports (JPA entity) and reports (backwards compatibility)
+    if (reports == null) {
+      reports = new ArrayList<>();
+    }
     reports.add(report);
+    
+    // Also add as StepReport
+    if (stepReports == null) {
+      stepReports = new ArrayList<>();
+    }
+    stepReports.add(new StepReport(report, this.id, stepReports.size()));
+    
     return this;
   }
 
@@ -497,15 +518,50 @@ public Report addReport(Report report, boolean updateReportItemDateUpdated) {
    * return newPluginState; }
    */
 
+  /**
+   * Get the step reports as a list of Report objects for backwards compatibility.
+   * If reports is null, builds it from stepReports.
+   */
   public List<Report> getReports() {
-    return reports;
+    if (reports == null && stepReports != null) {
+      reports = new ArrayList<>();
+      for (StepReport stepReport : stepReports) {
+        reports.add(stepReport.toReport());
+      }
+    }
+    return reports != null ? reports : new ArrayList<>();
   }
 
   public Report setReports(List<Report> reports) {
     this.reports = reports;
+    // Sync to stepReports
+    if (reports != null) {
+      this.stepReports = new ArrayList<>();
+      int order = 0;
+      for (Report report : reports) {
+        this.stepReports.add(new StepReport(report, this.id, order++));
+      }
+    }
     return this;
   }
 
+  /**
+   * Get the underlying StepReport entities.
+   */
+  @JsonIgnore
+  public List<StepReport> getStepReports() {
+    return stepReports;
+  }
+
+  /**
+   * Set the underlying StepReport entities.
+   */
+  @JsonIgnore
+  public void setStepReports(List<StepReport> stepReports) {
+    this.stepReports = stepReports;
+    this.reports = null; // Reset cached reports
+  }
+
   @JsonProperty("lineSeparator")
   public void injectLineSeparator(String lineSeparator) {
     this.lineSeparator = lineSeparator;