chore: code changes

bcgov · Nov 8, 2024 · 4fcb87b · 4fcb87b
1 parent ec5c476
commit 4fcb87b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/backend/src/main/java/ca/bc/gov/restapi/results/oracle/dto/OpeningSearchFiltersDto.java b/backend/src/main/java/ca/bc/gov/restapi/results/oracle/dto/OpeningSearchFiltersDto.java
@@ -102,7 +102,7 @@ public OpeningSearchFiltersDto(
     this.statusList = new ArrayList<>();
     this.openingIds = openingIds;
     this.myOpenings = null;
-    this.submittedToFrpa = false;
+    this.submittedToFrpa = null;
     this.disturbanceDateStart = null;
     this.disturbanceDateEnd = null;
     this.regenDelayDateStart = null;

diff --git a/...nd/src/main/java/ca/bc/gov/restapi/results/postgres/service/UserRecentOpeningService.java b/...nd/src/main/java/ca/bc/gov/restapi/results/postgres/service/UserRecentOpeningService.java
@@ -80,28 +80,28 @@ public PaginatedResult<OpeningSearchResponseDto> getAllRecentOpeningsForUser(int
 
         // Extract opening IDs as String
         Map<String,LocalDateTime> openingIds = recentOpenings.getContent().stream()
-                //.map(opening -> String.valueOf(opening.getOpeningId())) // Convert Integer to String
-                //.collect(Collectors.toList());
                 .collect(Collectors.toMap(UserRecentOpeningEntity::getOpeningId, UserRecentOpeningEntity::getLastViewed));
         log.info("User with the userId {} has the following openindIds {}", userId, openingIds);
         if (openingIds.isEmpty()) {
             return new PaginatedResult<>();
         }
-        // Call the oracle service method to fetch opening details for the given opening IDs
-        //convert the openingIds to a list of strings and pass it to the OpeningSearchFiltersDto constructor
-        OpeningSearchFiltersDto filtersDto = new OpeningSearchFiltersDto(new ArrayList<>(openingIds.keySet()));
-        PaginationParameters paginationParameters = new PaginationParameters(0, 10);
-        PaginatedResult<OpeningSearchResponseDto> pageResult = openingService.openingSearch(filtersDto, paginationParameters);
-        // perform the sorting and set the lastViewDate to the OpeningSearchResponseDto
-        pageResult.setData(
-            pageResult
-            .getData()
-            .stream()        
-            .peek(result -> result.setLastViewDate(openingIds.get(result.getOpeningId().toString())))
-            .sorted(Comparator.comparing(OpeningSearchResponseDto::getLastViewDate).reversed())
-            .collect(Collectors.toList())
-        );
-        return pageResult;
+
+        PaginatedResult<OpeningSearchResponseDto> pageResult =
+            openingService
+                .openingSearch(
+                    new OpeningSearchFiltersDto(new ArrayList<>(openingIds.keySet())),
+                    new PaginationParameters(0, 10)
+                );
+
+        return pageResult
+            .withData(
+                pageResult
+                    .getData()
+                    .stream()
+                    .peek(result -> result.setLastViewDate(openingIds.get(result.getOpeningId().toString())))
+                    .sorted(Comparator.comparing(OpeningSearchResponseDto::getLastViewDate).reversed())
+                    .collect(Collectors.toList())
+            );
     }
 
 }