Implement basic entity searching

src/main/java/uk/gov/hmcts/opal/controllers/DocumentController.java

@@ -35,7 +35,7 @@ public DocumentController(@Qualifier("documentServiceProxy") DocumentServiceInte
 
     @GetMapping(value = "/{documentId}")
     @Operation(summary = "Returns the Document for the given documentId.")
-    public ResponseEntity<DocumentEntity> getDocumentById(@PathVariable Long documentId) {
+    public ResponseEntity<DocumentEntity> getDocumentById(@PathVariable String documentId) {
 
         log.info(":GET:getDocumentById: documentId: {}", documentId);
 

src/main/java/uk/gov/hmcts/opal/controllers/LocalJusticeAreaController.java

@@ -36,7 +36,7 @@ public LocalJusticeAreaController(
 
     @GetMapping(value = "/{localJusticeAreaId}")
     @Operation(summary = "Returns the LocalJusticeArea for the given localJusticeAreaId.")
-    public ResponseEntity<LocalJusticeAreaEntity> getLocalJusticeAreaById(@PathVariable Long localJusticeAreaId) {
+    public ResponseEntity<LocalJusticeAreaEntity> getLocalJusticeAreaById(@PathVariable Short localJusticeAreaId) {
 
         log.info(":GET:getLocalJusticeAreaById: localJusticeAreaId: {}", localJusticeAreaId);
 

src/main/java/uk/gov/hmcts/opal/controllers/PaymentTermsController.java

@@ -46,10 +46,10 @@ public ResponseEntity<PaymentTermsEntity> getPaymentTermsById(@PathVariable Long
     }
 
     @PostMapping(value = "/search", consumes = MediaType.APPLICATION_JSON_VALUE)
-    @Operation(summary = "Searches PaymentTermss based upon criteria in request body")
-    public ResponseEntity<List<PaymentTermsEntity>> postPaymentTermssSearch(
+    @Operation(summary = "Searches PaymentTerms based upon criteria in request body")
+    public ResponseEntity<List<PaymentTermsEntity>> postPaymentTermsSearch(
         @RequestBody PaymentTermsSearchDto criteria) {
-        log.info(":POST:postPaymentTermssSearch: query: \n{}", criteria);
+        log.info(":POST:postPaymentTermsSearch: query: \n{}", criteria);
 
         List<PaymentTermsEntity> response = paymentTermsService.searchPaymentTerms(criteria);
 

src/main/java/uk/gov/hmcts/opal/dto/search/DebtorDetailSearchDto.java

@@ -8,7 +8,7 @@
 @Builder
 public class DebtorDetailSearchDto implements ToJsonString {
 
-    private String debtorId;
+    private String partyId;
     private String email;
     private String vehicleMake;
     private String vehicleRegistration;

src/main/java/uk/gov/hmcts/opal/dto/search/LocalJusticeAreaSearchDto.java

@@ -1,13 +1,17 @@
 package uk.gov.hmcts.opal.dto.search;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import uk.gov.hmcts.opal.dto.ToJsonString;
 
 @Data
 @Builder
 @EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
 public class LocalJusticeAreaSearchDto extends AddressSearch implements ToJsonString {
 
     private String localJusticeAreaId;

src/main/java/uk/gov/hmcts/opal/entity/AccountTransferEntity.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -26,6 +27,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class AccountTransferEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/BusinessUnitEntity.java

@@ -1,5 +1,8 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -15,6 +18,8 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "businessUnitId")
 public class BusinessUnitEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/CommittalWarrantProgressEntity.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -24,6 +25,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class CommittalWarrantProgressEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/CourtEntity.java

@@ -1,5 +1,8 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -20,6 +23,8 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "courtId")
 public class CourtEntity extends EnforcerCourtBaseEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/DebtorDetailEntity.java

@@ -1,12 +1,11 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.Temporal;
 import jakarta.persistence.TemporalType;
@@ -23,15 +22,13 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class DebtorDetailEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long debtorId;
-
-    @ManyToOne
-    @JoinColumn(name = "party_id", referencedColumnName = "party_id", nullable = false)
-    private PartyEntity party;
+    @Column(name = "party_id")
+    private Long partyId;
 
     @Column(name = "telephone_home")
     private String telephoneHome;

src/main/java/uk/gov/hmcts/opal/entity/DefendantAccountEntity.java

@@ -1,5 +1,8 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -29,6 +32,8 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "defendantAccountId")
 public class DefendantAccountEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/DefendantAccountPartiesEntity.java

@@ -1,5 +1,7 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -23,6 +25,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "defendantAccountPartyId")
 public class DefendantAccountPartiesEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/DocumentEntity.java

@@ -1,11 +1,11 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -18,13 +18,13 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "documentId")
 public class DocumentEntity {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "document_id_seq_generator")
-    @SequenceGenerator(name = "document_id_seq_generator", sequenceName = "document_id_seq", allocationSize = 1)
-    @Column(name = "document_id", nullable = false)
-    private Long documentId;
+    @Column(name = "document_id", length = 10, nullable = false)
+    private String documentId;
 
     @Column(name = "recipient", length = 4, nullable = false)
     private String recipient;

src/main/java/uk/gov/hmcts/opal/entity/DocumentInstanceEntity.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -24,6 +25,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class DocumentInstanceEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/EnforcementEntity.java

@@ -1,5 +1,8 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -24,6 +27,8 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "enforcementId")
 public class EnforcementEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/EnforcerEntity.java

@@ -1,5 +1,8 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -19,6 +22,8 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "enforcerId")
 public class EnforcerEntity extends EnforcerCourtBaseEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/LocalJusticeAreaEntity.java

@@ -1,5 +1,8 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -20,6 +23,8 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "localJusticeAreaId")
 public class LocalJusticeAreaEntity extends AddressEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/MisDebtorEntity.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -25,6 +26,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class MisDebtorEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/PartyEntity.java

@@ -1,5 +1,7 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -27,6 +29,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "partyId")
 public class PartyEntity implements FullNameBuilder {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/PaymentInEntity.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -25,6 +26,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class PaymentInEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/PaymentTermsEntity.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
@@ -22,6 +23,7 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class PaymentTermsEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/PrisonEntity.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -22,6 +23,7 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class PrisonEntity extends AddressEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/entity/TillEntity.java

@@ -1,5 +1,8 @@
 package uk.gov.hmcts.opal.entity;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -18,6 +21,8 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "tillId")
 public class TillEntity {
 
     @Id

src/main/java/uk/gov/hmcts/opal/repository/AccountTransferRepository.java

@@ -8,6 +8,4 @@
 @Repository
 public interface AccountTransferRepository extends JpaRepository<AccountTransferEntity, Long>,
     JpaSpecificationExecutor<AccountTransferEntity> {
-
-    AccountTransferEntity findByAccountTransferId(Long accountTransferId);
 }