CCMSPUI-529 Refactored NotificationSearchRepositoryIntegrationTest to use Oracle-Free instead of embedded H2 DB

Signed-off-by: Jamie Briggs <jamie.briggs@digital.justice.gov.uk>

Author: Jamie Briggs

data-service/src/integrationTest/java/uk/gov/laa/ccms/data/repository/NotificationSearchRepositoryIntegrationTest.java

@@ -3,23 +3,31 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.AFTER_TEST_CLASS;
+import static org.springframework.test.context.jdbc.Sql.ExecutionPhase.BEFORE_TEST_CLASS;
+import static org.springframework.test.context.jdbc.SqlMergeMode.MergeMode.MERGE;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import java.time.LocalDate;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.SqlMergeMode;
+import org.springframework.transaction.annotation.Transactional;
+import uk.gov.laa.ccms.data.IntegrationTestInterface;
 import uk.gov.laa.ccms.data.entity.NotificationInfo;
 
-@DataJpaTest
-@ActiveProfiles("h2-test")
+@SpringBootTest
+@SqlMergeMode(MERGE)
+@Sql(executionPhase=BEFORE_TEST_CLASS,scripts= "/sql/get_notif_info_create_schema.sql")
+@Sql(executionPhase=AFTER_TEST_CLASS,scripts= "/sql/get_notif_info_drop_schema.sql")
 @DisplayName("NotificationInfo Repository Integration Test")
-class NotificationSearchRepositoryIntegrationTest {
+class NotificationSearchRepositoryIntegrationTest implements IntegrationTestInterface {
 
   private NotificationSearchRepository notificationRepository;
 
@@ -29,35 +37,48 @@ class NotificationSearchRepositoryIntegrationTest {
   private NotificationInfo n1;
   private NotificationInfo n2;
 
+  @Transactional
   @BeforeEach
   void setUp() {
     notificationRepository = new NotificationSearchRepository(entityManager);
     // Insert test data into the in-memory database
     n1 = NotificationInfo.builder().notificationId(1L)
+        .userId("test_user")
+        .userLoginId("test_login")
         .providerFirmId(10L)
+        .dateAssigned(LocalDate.of(2025, 1, 1))
+        .subject("Subject")
+        .dueDate(LocalDate.of(2027, 1, 1))
+        .assignedTo("JBriggs")
+        .status("open")
         .lscCaseRefReference("1001")
         .providerCaseReference("First Case Reference")
-        .assignedTo("JBriggs")
+        .clientName("Jamie Briggs")
+        .feeEarner("Fee")
         .personLastName("Briggs")
         .feeEarnerPartyId(3001L)
-        .isOpen(true)
         .actionNotificationInd("N")
-        .dateAssigned(LocalDate.of(2025, 1, 1))
+        .isOpen(true)
         .build();
     n2 = NotificationInfo.builder().notificationId(2L)
+        .userId("test_user")
+        .userLoginId("test_login")
         .providerFirmId(10L)
-        .lscCaseRefReference("1002")
-        .providerCaseReference("Second Case Reference")
+        .dateAssigned(LocalDate.of(2026, 1, 1))
+        .subject("Subject")
+        .dueDate(LocalDate.of(2027, 1, 1))
         .assignedTo("SMonday")
+        .status("open")
+        .lscCaseRefReference("2100")
+        .providerCaseReference("Second Case Reference")
+        .clientName("Ski Monday")
+        .feeEarner("Fee")
         .personLastName("Bri-Monday")
         .feeEarnerPartyId(3002L)
-        .isOpen(false)
         .actionNotificationInd("O")
-        .dateAssigned(LocalDate.of(2026, 1, 1))
+        .isOpen(false)
         .build();
-    // Use entityManager as NotificationRepository extends ReadOnlyRepository.
-    entityManager.persist(n1);
-    entityManager.persist(n2);
+
   }
 
   @Test
@@ -136,9 +157,9 @@ void shouldFilterBySimilarCaseReferenceNumber(){
         null,
         null, Pageable.ofSize(10).withPage(0));
     // Then
-    assertEquals(2, result.getTotalElements());
     assertTrue(result.getContent().contains(n1));
     assertTrue(result.getContent().contains(n2));
+    assertEquals(2, result.getTotalElements());
   }
 
   @Test
@@ -398,7 +419,7 @@ void shouldFilterByDateToInclusive(){
         true,
         null,
         null,
-        LocalDate.of(2026, 1, 1), Pageable.ofSize(10).withPage(0));
+        LocalDate.of(2027, 1, 1), Pageable.ofSize(10).withPage(0));
     // Then
     assertEquals(2, result.getTotalElements());
     assertTrue(result.getContent().contains(n1));

data-service/src/integrationTest/resources/sql/get_notif_info_create_schema.sql

@@ -0,0 +1,91 @@
+CREATE TABLE XXCCMS.XXCCMS_GET_NOTIF_INFO_V (
+    NOTIFICATION_ID NUMBER NOT NULL PRIMARY KEY,
+    USER_ID VARCHAR2(100),
+    USER_LOGIN_ID VARCHAR2(100),
+    PROVIDERFIRM_ID NUMBER NOT NULL,
+    DATE_ASSIGNED DATE,
+    SUBJECT VARCHAR2(320),
+    DUE_DATE DATE,
+    ASSIGNED_TO VARCHAR2(360),
+    STATUS VARCHAR2(150),
+    LSC_CASE_REF_REFERENCE VARCHAR2(360),
+    PROVIDER_CASE_REFERENCE VARCHAR2(150),
+    CLIENT_NAME VARCHAR2(301),
+    FEE_EARNER VARCHAR2(360),
+    PERSON_LAST_NAME VARCHAR2(150),
+    FEE_EARNER_PARTY_ID NUMBER,
+    ACTION_NOTIFICATION_IND VARCHAR2(150),
+    IS_OPEN VARCHAR2(5));
+
+
+INSERT INTO XXCCMS.XXCCMS_GET_NOTIF_INFO_V (NOTIFICATION_ID,
+                                            USER_ID,
+                                            USER_LOGIN_ID,
+                                            PROVIDERFIRM_ID,
+                                            DATE_ASSIGNED,
+                                            SUBJECT,
+                                            DUE_DATE,
+                                            ASSIGNED_TO,
+                                            STATUS,
+                                            LSC_CASE_REF_REFERENCE,
+                                            PROVIDER_CASE_REFERENCE,
+                                            CLIENT_NAME,
+                                            FEE_EARNER,
+                                            PERSON_LAST_NAME,
+                                            FEE_EARNER_PARTY_ID,
+                                            ACTION_NOTIFICATION_IND,
+                                            IS_OPEN)
+VALUES (1, -- NOTIFICATION_ID
+        'test_user', -- USER_ID
+        'test_login', -- USER_LOGIN_ID
+        10, -- PROVIDERFIRM_ID
+        TO_DATE('2025-01-01', 'YYYY-MM-DD'), -- DATE_ASSIGNED
+        'Subject', -- SUBJECT
+        TO_DATE('2027-01-01', 'YYYY-MM-DD'), -- DUE_DATE
+        'JBriggs', -- ASSIGNED_TO
+        'open', -- STATUS
+        '1001', -- LSC_CASE_REF_REFERENCE
+        'First Case Reference', -- PROVIDER_CASE_REFERENCE
+        'Jamie Briggs', -- CLIENT_NAME
+        'Fee', -- FEE_EARNER
+        'Briggs', -- PERSON_LAST_NAME
+        3001, -- FEE_EARNER_PARTY_ID
+        'N', -- ACTION_NOTIFICATION_IND
+        'true' -- IS_OPEN
+);
+
+INSERT INTO XXCCMS.XXCCMS_GET_NOTIF_INFO_V (NOTIFICATION_ID,
+                                            USER_ID,
+                                            USER_LOGIN_ID,
+                                            PROVIDERFIRM_ID,
+                                            DATE_ASSIGNED,
+                                            SUBJECT,
+                                            DUE_DATE,
+                                            ASSIGNED_TO,
+                                            STATUS,
+                                            LSC_CASE_REF_REFERENCE,
+                                            PROVIDER_CASE_REFERENCE,
+                                            CLIENT_NAME,
+                                            FEE_EARNER,
+                                            PERSON_LAST_NAME,
+                                            FEE_EARNER_PARTY_ID,
+                                            ACTION_NOTIFICATION_IND,
+                                            IS_OPEN)
+VALUES (2, -- NOTIFICATION_ID
+        'test_user', -- USER_ID
+        'test_login', -- USER_LOGIN_ID
+        10, -- PROVIDERFIRM_ID
+        TO_DATE('2026-01-01', 'YYYY-MM-DD'), -- DATE_ASSIGNED
+        'Subject', -- SUBJECT
+        TO_DATE('2027-01-01', 'YYYY-MM-DD'), -- DUE_DATE
+        'SMonday', -- ASSIGNED_TO
+        'open', -- STATUS
+        '2100', -- LSC_CASE_REF_REFERENCE
+        'Second Case Reference', -- PROVIDER_CASE_REFERENCE
+        'Ski Monday', -- CLIENT_NAME
+        'Fee', -- FEE_EARNER
+        'Bri-Monday', -- PERSON_LAST_NAME
+        3002, -- FEE_EARNER_PARTY_ID
+        'O', -- ACTION_NOTIFICATION_IND
+        'false' -- IS_OPEN
+       );

data-service/src/integrationTest/resources/sql/get_notif_info_drop_schema.sql

@@ -0,0 +1 @@
+DROP TABLE XXCCMS.XXCCMS_GET_NOTIF_INFO_V;

data-service/src/main/java/uk/gov/laa/ccms/data/entity/BooleanConverter.java data-service/src/main/java/uk/gov/laa/ccms/data/entity/BooleanCharConverter.java

@@ -8,7 +8,7 @@
  * AttributeConverter class to handle the conversion to/from a Boolean value and 'Y' or 'N'.
  */
 @Converter(autoApply = true)
-public class BooleanConverter implements AttributeConverter<Boolean, Character> {
+public class BooleanCharConverter implements AttributeConverter<Boolean, Character> {
 
   /**
    * Handle the conversion from a boolean value, to 'Y' or 'N'.

data-service/src/main/java/uk/gov/laa/ccms/data/entity/BooleanStringConverter.java

@@ -0,0 +1,23 @@
+package uk.gov.laa.ccms.data.entity;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+import java.util.Optional;
+
+@Converter
+public class BooleanStringConverter implements AttributeConverter<Boolean, String> {
+
+  @Override
+  public String convertToDatabaseColumn(Boolean aBoolean) {
+    return Optional.ofNullable(aBoolean)
+        .map(x -> x ? "true" : "false")
+        .orElse(null);
+  }
+
+  @Override
+  public Boolean convertToEntityAttribute(String value) {
+    return Optional.ofNullable(value)
+        .map(d -> d.equalsIgnoreCase("true"))
+        .orElse(null);
+  }
+}

data-service/src/main/java/uk/gov/laa/ccms/data/entity/NotificationInfo.java

@@ -1,12 +1,14 @@
 package uk.gov.laa.ccms.data.entity;
 
 import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import java.time.LocalDate;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.hibernate.annotations.Immutable;
@@ -28,6 +30,7 @@
 @Getter
 @Builder
 @Immutable
+@EqualsAndHashCode
 @AllArgsConstructor
 @RequiredArgsConstructor
 public class NotificationInfo {
@@ -81,23 +84,9 @@ public class NotificationInfo {
   private String actionNotificationInd;
 
   @Column(name = "IS_OPEN")
+  @Convert(converter = BooleanStringConverter.class)
   private Boolean isOpen;
 
-
-
-/*  @Column(name = "CLIENT_PARTY_ID")
-  private Long clientPartyId;
-
-  @Column(name = "CATEGORY_OF_LAW", length = 150)
-  private String categoryOfLaw;
-
-  @Column(name = "NOTIFICATION_SUBJECT", length = 320)
-  private String notificationSubject;
-
-  @Column(name = "EVIDENCE_ALLOWED_IND", length = 5)
-  private String evidenceAllowedInd;
-
-  @Column(name = "ASSIGNED_TO_PARTY_ID", precision = 15, scale = 0)
-  private Long assignedToPartyId;*/
+  
 
 }

data-service/src/main/java/uk/gov/laa/ccms/data/repository/NotificationRepository.java

@@ -44,16 +44,17 @@ public final class NotificationSearchRepository {
    * @param feeEarnerId            the ID of the fee earner to filter by
    * @param includeClosed          whether to include closed notifications in the results
    * @param notificationType       the type of notification to filter results by
-   * @param dateFrom               the start date for filtering notifications by assignment date
-   * @param dateTo                 the end date for filtering notifications by assignment date
+   * @param assignedDateFrom               the start date for filtering notifications by assignment date
+   * @param assignedDateTo                 the end date for filtering notifications by assignment date
    * @param pageable               the pagination and sorting information
    * @return a paginated list of NotificationInfo entities matching the specified filters
    */
   public Page<NotificationInfo> findAll(final long providerId,
       final String caseReferenceNumber, final String providerCaseReference,
       final String assignedToUserId, final String clientSurname, final Integer feeEarnerId,
       final Boolean includeClosed, final String notificationType,
-      final LocalDate dateFrom, final LocalDate dateTo, final Pageable pageable) {
+      final LocalDate assignedDateFrom, final LocalDate assignedDateTo,
+      final Pageable pageable) {
 
     final String searchNotificationQuery =
         """
@@ -62,7 +63,7 @@ public Page<NotificationInfo> findAll(final long providerId,
         +
             getFilterSql(providerId, caseReferenceNumber, providerCaseReference,
                 assignedToUserId, clientSurname, feeEarnerId, includeClosed,
-                notificationType, dateFrom, dateTo)
+                notificationType, assignedDateFrom, assignedDateTo)
         +
         """
             OFFSET :offset ROWS FETCH NEXT :size ROWS ONLY    
@@ -79,7 +80,7 @@ SELECT COUNT(*) FROM XXCCMS.XXCCMS_GET_NOTIF_INFO_V
             +
             getFilterSql(providerId, caseReferenceNumber, providerCaseReference,
                 assignedToUserId, clientSurname, feeEarnerId, includeClosed,
-                notificationType, dateFrom, dateTo);
+                notificationType, assignedDateFrom, assignedDateTo);
 
     Query countQuery = entityManager.createNativeQuery(notificationCount);
 
@@ -93,7 +94,7 @@ SELECT COUNT(*) FROM XXCCMS.XXCCMS_GET_NOTIF_INFO_V
   private static String getFilterSql(Long providerId,
       String caseReferenceNumber, String providerCaseReference, String assignedToUser,
       String clientSurname, Integer feeEarnerId, Boolean includeClosed,
-      String notificationType, LocalDate dateFrom, LocalDate dateTo) {
+      String notificationType, LocalDate assignedDateFrom, LocalDate assignedDateTo) {
 
     StringJoiner sj = new StringJoiner(" AND ");
     // Provider firm party id
@@ -125,11 +126,11 @@ private static String getFilterSql(Long providerId,
     if (stringNotEmpty(notificationType)) {
       sj.add("ACTION_NOTIFICATION_IND = '" + notificationType + "'");
     }
-    if (Objects.nonNull(dateFrom)) {
-      sj.add("DATE_ASSIGNED >= TO_DATE('" + dateFrom + "', 'YYYY-MM-DD')");
+    if (Objects.nonNull(assignedDateFrom)) {
+      sj.add("DATE_ASSIGNED >= TO_DATE('" + assignedDateFrom + "', 'YYYY-MM-DD')");
     }
-    if (Objects.nonNull(dateTo)) {
-      sj.add("DATE_ASSIGNED <= TO_DATE('" + dateTo + "', 'YYYY-MM-DD')");
+    if (Objects.nonNull(assignedDateTo)) {
+      sj.add("DATE_ASSIGNED <= TO_DATE('" + assignedDateTo + "', 'YYYY-MM-DD')");
     }
     return sj + " ";
   }