diff --git a/src/main/java/uk/gov/hmcts/reform/preapi/dto/reports/ConcurrentCaptureSessionReportDTO.java b/src/main/java/uk/gov/hmcts/reform/preapi/dto/reports/ConcurrentCaptureSessionReportDTO.java index f64d9cda37..8dd92d13c5 100644 --- a/src/main/java/uk/gov/hmcts/reform/preapi/dto/reports/ConcurrentCaptureSessionReportDTO.java +++ b/src/main/java/uk/gov/hmcts/reform/preapi/dto/reports/ConcurrentCaptureSessionReportDTO.java @@ -16,7 +16,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; - @Data @NoArgsConstructor @Schema(description = "ConcurrentCaptureSessionReportDTO") diff --git a/src/main/java/uk/gov/hmcts/reform/preapi/entities/Booking.java b/src/main/java/uk/gov/hmcts/reform/preapi/entities/Booking.java index a18fb82d96..d921f3dee5 100644 --- a/src/main/java/uk/gov/hmcts/reform/preapi/entities/Booking.java +++ b/src/main/java/uk/gov/hmcts/reform/preapi/entities/Booking.java @@ -26,7 +26,7 @@ @Entity @Table(name = "bookings") public class Booking extends CreatedModifiedAtEntity implements ISoftDeletable { - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "case_id", referencedColumnName = "id") private Case caseId; @@ -36,7 +36,7 @@ public class Booking extends CreatedModifiedAtEntity implements ISoftDeletable { @Column(name = "deleted_at") private Timestamp deletedAt; - @ManyToMany + @ManyToMany(fetch = FetchType.EAGER) @JoinTable( name = "booking_participant", joinColumns = @JoinColumn(name = "booking_id", referencedColumnName = "id"), diff --git a/src/main/java/uk/gov/hmcts/reform/preapi/entities/CaptureSession.java b/src/main/java/uk/gov/hmcts/reform/preapi/entities/CaptureSession.java index d18e16d1dc..3a1829f647 100644 --- a/src/main/java/uk/gov/hmcts/reform/preapi/entities/CaptureSession.java +++ b/src/main/java/uk/gov/hmcts/reform/preapi/entities/CaptureSession.java @@ -72,7 +72,7 @@ public class CaptureSession extends BaseEntity implements ISoftDeletable { @Transient private boolean isSoftDeleteOperation; - @OneToMany(mappedBy = "captureSession") + @OneToMany(mappedBy = "captureSession", fetch = FetchType.EAGER) private Set recordings; public boolean isDeleted() { diff --git a/src/main/java/uk/gov/hmcts/reform/preapi/entities/Case.java b/src/main/java/uk/gov/hmcts/reform/preapi/entities/Case.java index beaddf5379..a7055b0840 100644 --- a/src/main/java/uk/gov/hmcts/reform/preapi/entities/Case.java +++ b/src/main/java/uk/gov/hmcts/reform/preapi/entities/Case.java @@ -49,7 +49,7 @@ public class Case extends CreatedModifiedAtEntity implements ISoftDeletable { @Column(name = "deleted_at") private Timestamp deletedAt; - @OneToMany + @OneToMany(fetch = FetchType.EAGER) @JoinColumn(name = "case_id", referencedColumnName = "id") private Set participants; diff --git a/src/main/java/uk/gov/hmcts/reform/preapi/entities/Court.java b/src/main/java/uk/gov/hmcts/reform/preapi/entities/Court.java index ab22fef2c8..780e74d079 100644 --- a/src/main/java/uk/gov/hmcts/reform/preapi/entities/Court.java +++ b/src/main/java/uk/gov/hmcts/reform/preapi/entities/Court.java @@ -4,6 +4,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; import jakarta.persistence.JoinColumn; import jakarta.persistence.JoinTable; import jakarta.persistence.ManyToMany; @@ -37,7 +38,7 @@ public class Court extends BaseEntity { @Column(name = "location_code", length = 25) private String locationCode; - @ManyToMany + @ManyToMany(fetch = FetchType.EAGER) @JoinTable( name = "court_region", joinColumns = @JoinColumn(name = "court_id", referencedColumnName = "id"), @@ -45,7 +46,7 @@ public class Court extends BaseEntity { ) private Set regions; - @ManyToMany + @ManyToMany(fetch = FetchType.EAGER) @JoinTable( name = "courtrooms", joinColumns = @JoinColumn(name = "court_id", referencedColumnName = "id"), diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 03653f8ebd..f5e3b71adc 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -34,7 +34,7 @@ spring: charSet: UTF-8 hikari: minimumIdle: 2 - maximumPoolSize: 10 + maximumPoolSize: 50 idleTimeout: 10000 poolName: PreHikariCP maxLifetime: 7200000