Fixing LazyInitializationException in report retrieval

Author: hmiguim

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

@@ -573,10 +573,11 @@ public String getLineSeparator() {
 
   @JsonIgnore
   public Report getLastRunPlugin() {
-    int size = reports.size();
+    List<Report> reportsList = getReports();
+    int size = reportsList.size();
     if (size == 0)
       return null;
-    return reports.get(size - 1);
+    return reportsList.get(size - 1);
   }
 
   @Override

roda-core/roda-core/src/main/java/org/roda/core/model/DefaultModelService.java

@@ -3038,22 +3038,7 @@ public void deleteJob(String jobId)
     throws NotFoundException, GenericException, AuthorizationDeniedException, RequestNotValidException {
     RodaCoreFactory.checkIfWriteIsAllowedAndIfFalseThrowException(nodeType);
 
-    boolean deletedFromDb = false;
-
-    // Try to delete from database first (for running jobs)
-    if (isJpaAvailable()) {
-      JobRepository jobRepo = getJobRepository();
-      ReportRepository reportRepo = getReportRepository();
-      if (jobRepo != null && jobRepo.existsById(jobId)) {
-        // Delete reports from DB
-        if (reportRepo != null) {
-          reportRepo.deleteByJobId(jobId);
-        }
-        // Delete job from DB
-        jobRepo.deleteById(jobId);
-        deletedFromDb = true;
-      }
-    }
+    boolean deletedFromDb = isDeletedFromDb(jobId);
 
     // Also try to delete from storage (for archived jobs or cleanup)
     try {
@@ -3077,6 +3062,26 @@ public void deleteJob(String jobId)
     notifyJobDeleted(jobId).failOnError();
   }
 
+  private boolean isDeletedFromDb(String jobId) {
+    boolean deletedFromDb = false;
+
+    // Try to delete from database first (for running jobs)
+    if (isJpaAvailable()) {
+      JobRepository jobRepo = getJobRepository();
+      ReportRepository reportRepo = getReportRepository();
+      if (jobRepo != null && jobRepo.existsById(jobId)) {
+        // Delete reports from DB
+        if (reportRepo != null) {
+          reportRepo.deleteByJobId(jobId);
+        }
+        // Delete job from DB
+        jobRepo.deleteById(jobId);
+        deletedFromDb = true;
+      }
+    }
+    return deletedFromDb;
+  }
+
   @Override
   public Report retrieveJobReport(String jobId, String jobReportId)
     throws RequestNotValidException, GenericException, NotFoundException, AuthorizationDeniedException {

roda-core/roda-core/src/main/java/org/roda/core/repository/job/ReportRepository.java

@@ -8,8 +8,10 @@
 package org.roda.core.repository.job;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.roda.core.data.v2.jobs.Report;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,12 +26,27 @@
 public interface ReportRepository extends JpaRepository<Report, String> {
 
   /**
-   * Find all reports associated with a given job ID.
+   * Find a report by its ID, eagerly fetching step reports to avoid
+   * LazyInitializationException when accessed outside a transaction.
+   *
+   * @param id
+   *          the report ID
+   * @return optional containing the report if found
+   */
+  @Override
+  @EntityGraph(attributePaths = "stepReports")
+  Optional<Report> findById(String id);
+
+  /**
+   * Find all reports associated with a given job ID, eagerly fetching step
+   * reports to avoid LazyInitializationException when accessed outside a
+   * transaction.
    *
    * @param jobId
    *          the job ID to search for
    * @return list of reports for the specified job
    */
+  @EntityGraph(attributePaths = "stepReports")
   List<Report> findByJobId(String jobId);
 
   /**