Skip to content

Commit 8e2e936

Browse files
committed
[fix] :final 키워드 수정
1 parent 81d9f2d commit 8e2e936

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/main/java/com/cona/KUsukKusuk/user/service/UserService.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -267,15 +267,13 @@ public List<BoomarkLikeResponseDto> getBookmarkandLikes(int pageNumber, int page
267267
List<Bookmark> bookmarks = bookmarkRepository.findByUser(user);
268268
List<UserLike> userLikes = userLikeRepository.findByUser(user);
269269

270-
List<Spot> bookmarkedSpots;
270+
List<Spot> bookmarkedSpots = new ArrayList<>();
271271
List<Spot> likedSpots = new ArrayList<>();
272272

273273
if (bookmarks != null) {
274274
bookmarkedSpots = bookmarks.stream()
275275
.map(Bookmark::getSpot)
276276
.collect(Collectors.toList());
277-
} else {
278-
bookmarkedSpots = new ArrayList<>();
279277
}
280278

281279
if (userLikes != null) {
@@ -300,15 +298,17 @@ public List<BoomarkLikeResponseDto> getBookmarkandLikes(int pageNumber, int page
300298
pageInfo.setSize(pageSize);
301299
pageInfo.setTotalPages((int) Math.ceil((double) distinctSpots.size() / pageSize));
302300

303-
List<Spot> pagedDistinctSpots = distinctSpots.subList(start, end);
301+
final List<Spot> finalBookmarkedSpots = bookmarkedSpots; // 수정된 부분: final 변수로 선언
302+
final List<Spot> finalLikedSpots = likedSpots; // 수정된 부분: final 변수로 선언
304303

305-
List<Spot> finalLikedSpots = likedSpots;
304+
List<Spot> pagedDistinctSpots = distinctSpots.subList(start, end);
306305

307306
return pagedDistinctSpots.stream()
308-
.map(spot -> BoomarkLikeResponseDto.of(spot, bookmarkedSpots.contains(spot), finalLikedSpots.contains(spot), pageInfo))
307+
.map(spot -> BoomarkLikeResponseDto.of(spot, finalBookmarkedSpots.contains(spot), finalLikedSpots.contains(spot), pageInfo))
309308
.collect(Collectors.toList());
310309
}
311310

312311

313312

313+
314314
}

0 commit comments

Comments
 (0)