fix(support): fixing merge overwrite

backend/src/main/java/ca/bc/gov/restapi/results/oracle/service/OpeningService.java

@@ -50,56 +50,6 @@ public class OpeningService {
 
   private final ForestClientApiProvider forestClientApiProvider;
 
-  /**
-   * Gets all recent openings for the Home Screen.
-   *
-   * @param pagination A {@link PaginationParameters} with pagination settings.
-   * @return {@link List} of {@link RecentOpeningDto} containing all recent openings for that user.
-   */
-  public PaginatedResult<RecentOpeningDto> getRecentOpeningsCurrentUser(
-      PaginationParameters pagination) {
-    log.info(
-        "Getting recent openings to logged user with page index {} and page size {}",
-        pagination.page(),
-        pagination.perPage());
-
-    if (pagination.perPage() > SilvaConstants.MAX_PAGE_SIZE) {
-      throw new MaxPageSizeException(SilvaConstants.MAX_PAGE_SIZE);
-    }
-
-    String entryUserId = loggedUserService.getLoggedUserId();
-
-    // Openings
-    Pageable pageable =
-        PageRequest.of(
-            pagination.page(), pagination.perPage(), Sort.by("updateTimestamp").descending());
-    Page<OpeningEntity> openingPage = openingRepository.findAllByEntryUserId(entryUserId, pageable);
-
-    PaginatedResult<RecentOpeningDto> paginatedResult = new PaginatedResult<>();
-    paginatedResult.setPageIndex(pagination.page());
-    paginatedResult.setPerPage(pagination.perPage());
-
-    if (openingPage.getContent().isEmpty()) {
-      log.info("No recent openings for this user given page index and size!");
-      paginatedResult.setData(List.of());
-      paginatedResult.setTotalPages(0);
-      paginatedResult.setHasNextPage(false);
-      return paginatedResult;
-    }
-
-    // Cut Block Open Admin
-    List<Long> openingIds = openingPage.getContent().stream().map(OpeningEntity::getId).toList();
-    List<CutBlockOpenAdminEntity> cutBlocks =
-        cutBlockOpenAdminService.findAllByOpeningIdIn(openingIds);
-
-    List<RecentOpeningDto> list = createDtoFromEntity(openingPage.getContent(), cutBlocks);
-    paginatedResult.setData(list);
-    paginatedResult.setTotalPages(openingPage.getTotalPages());
-    paginatedResult.setHasNextPage(openingPage.hasNext());
-
-    return paginatedResult;
-  }
-
   /**
    * Get recent openings given the opening creation date.
    *

backend/src/main/java/ca/bc/gov/restapi/results/postgres/service/UserRecentOpeningService.java

@@ -9,15 +9,14 @@
 import ca.bc.gov.restapi.results.postgres.dto.UserRecentOpeningDto;
 import ca.bc.gov.restapi.results.postgres.entity.UserRecentOpeningEntity;
 import ca.bc.gov.restapi.results.postgres.repository.UserRecentOpeningRepository;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Map;
 import java.util.stream.Collectors;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -79,20 +78,23 @@ public PaginatedResult<OpeningSearchResponseDto> getAllRecentOpeningsForUser(int
                 .findByUserIdOrderByLastViewedDesc(userId, pageable);
 
         // Extract opening IDs as String
-        Map<String,LocalDateTime> openingIds = recentOpenings.getContent().stream()
+        Map<String, LocalDateTime> openingIds = recentOpenings.getContent().stream()
                 .collect(Collectors.toMap(UserRecentOpeningEntity::getOpeningId, UserRecentOpeningEntity::getLastViewed));
-        log.info("User with the userId {} has the following openindIds {}", userId, openingIds);
+        log.info("User with the userId {} has the following openingIds {}", userId, openingIds);
+
         if (openingIds.isEmpty()) {
-            return new PaginatedResult<>();
+            // Ensure an empty data list instead of null
+            return new PaginatedResult<OpeningSearchResponseDto>()
+                    .withData(Collections.emptyList());
         }
-
+    
         PaginatedResult<OpeningSearchResponseDto> pageResult =
             openingService
                 .openingSearch(
                     new OpeningSearchFiltersDto(new ArrayList<>(openingIds.keySet())),
                     new PaginationParameters(0, 10)
                 );
-
+    
         return pageResult
             .withData(
                 pageResult
@@ -104,4 +106,5 @@ public PaginatedResult<OpeningSearchResponseDto> getAllRecentOpeningsForUser(int
             );
     }
 
+
 }

backend/src/test/java/ca/bc/gov/restapi/results/oracle/service/OpeningServiceTest.java

@@ -17,7 +17,6 @@
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -44,39 +43,6 @@ class OpeningServiceTest extends AbstractTestContainerIntegrationTest {
   @Autowired
   private OpeningService openingService;
 
-  @Test
-  @DisplayName("Get a list of recent openings for logged user")
-  void getRecentOpenings_fetchPaginated_shouldSucceed() {
-    int pages = 3;
-    int currentPage = 0;
-
-    PaginationParameters pagination = new PaginationParameters(currentPage, pages);
-    PaginatedResult<RecentOpeningDto> paginatedResult =
-        openingService.getRecentOpeningsCurrentUser(pagination);
-
-    Assertions.assertNotNull(paginatedResult);
-    Assertions.assertEquals(currentPage, paginatedResult.getPageIndex());
-    Assertions.assertEquals(1, paginatedResult.getTotalPages());
-    Assertions.assertFalse(paginatedResult.getData().isEmpty());
-    Assertions.assertEquals(1, paginatedResult.getData().size());
-  }
-
-  @Test
-  @DisplayName("Get an empty list of recent openings for the home screen")
-  void getRecentOpenings_emptyPages_shouldSucceed() {
-
-    int currentPage = 0;
-    int pages = 1;
-    PaginationParameters pagination = new PaginationParameters(currentPage, pages);
-    PaginatedResult<RecentOpeningDto> paginatedResult =
-        openingService.getRecentOpeningsCurrentUser(pagination);
-
-    Assertions.assertNotNull(paginatedResult);
-    Assertions.assertEquals(currentPage, paginatedResult.getPageIndex());
-    Assertions.assertEquals(1, paginatedResult.getTotalPages());
-    Assertions.assertFalse(paginatedResult.getData().isEmpty());
-  }
-
   @Test
   @DisplayName("Get a list of recent openings without user")
   void getRecentOpenings_fetchNoUserPaginated_shouldSucceed() {