[Refactor/#382][jjaeroong]: 씨앗에서 새싹으로 명칭 변경 #403
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,7 @@ | |
| import stackpot.stackpot.feed.repository.SeriesRepository; | ||
| import stackpot.stackpot.notification.service.NotificationCommandService; | ||
| import stackpot.stackpot.save.repository.FeedSaveRepository; | ||
| import stackpot.stackpot.user.dto.response.UserMyPageResponseDto; | ||
| import stackpot.stackpot.user.entity.User; | ||
| import stackpot.stackpot.user.repository.UserRepository; | ||
|
|
||
|
|
@@ -179,7 +180,7 @@ public FeedResponseDto.AuthorizedFeedDto getFeed(Long feedId) { | |
| } | ||
|
|
||
| @Transactional | ||
| public UserMyPageResponseDto getFeedsByUserId(Long userId, Long nextCursor, int pageSize) { | ||
| Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); | ||
| boolean isAuthenticated = authentication != null | ||
| && !(authentication instanceof AnonymousAuthenticationToken) | ||
|
|
@@ -201,13 +202,9 @@ public FeedResponseDto.FeedPreviewList getFeedsByUserId(Long userId, Long nextCu | |
| : List.of(); | ||
|
|
||
| Pageable pageable = PageRequest.of(0, pageSize, Sort.by(Sort.Direction.DESC, "feedId")); | ||
| List<Feed> feeds = (nextCursor == null) | ||
| ? feedRepository.findByUser_Id(userId, pageable) | ||
| : feedRepository.findByUserIdAndFeedIdBefore(userId, nextCursor, pageable); | ||
|
|
||
| List<FeedResponseDto.FeedDto> feedDtos = feeds.stream() | ||
| .map(feed -> { | ||
|
|
@@ -220,18 +217,23 @@ public FeedResponseDto.FeedPreviewList getFeedsByUserId(Long userId, Long nextCu | |
| }) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| // 조회 대상 유저 정보 | ||
| User targetUser = userRepository.findById(userId) | ||
| .orElseThrow(() -> new UserHandler(ErrorStatus.USER_NOT_FOUND)); | ||
|
|
||
| List<String> seriesComments = targetUser.getSeriesList().stream() | ||
| .map(Series::getComment) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| return UserMyPageResponseDto.builder() | ||
| .id(targetUser.getId()) | ||
| .seriesComments(seriesComments) | ||
| .feeds(feedDtos) | ||
| .build(); | ||
| } | ||
|
|
||
| @Override | ||
| public UserMyPageResponseDto getFeeds(Long nextCursor, int pageSize) { | ||
| User user = authService.getCurrentUser(); | ||
|
|
||
| Pageable pageable = PageRequest.of(0, pageSize, Sort.by(Sort.Direction.DESC, "feedId")); | ||
|
|
@@ -253,13 +255,14 @@ public FeedResponseDto.FeedPreviewList getFeeds(Long nextCursor, int pageSize) { | |
| }) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| List<String> seriesComments = user.getSeriesList().stream() | ||
| .map(Series::getComment) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| return UserMyPageResponseDto.builder() | ||
| .id(user.getId()) | ||
| .seriesComments(seriesComments) | ||
| .feeds(feedDtos) | ||
| .build(); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,7 +45,7 @@ public PotApplicationResponseDto toDto(PotApplication entity) { | |
| .applicationId(entity.getApplicationId()) | ||
| .potRole(roleInfo) | ||
| .userId(entity.getUser().getId()) | ||
| .userNickname(entity.getUser().getNickname() + " 새싹") | ||
| .build(); | ||
|
|
||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -72,7 +72,7 @@ public PotPreviewResponseDto toPrviewDto(User user, Pot pot, List<String> recrui | |
| return PotPreviewResponseDto.builder() | ||
| .userId(user.getId()) | ||
| .userRole(user.getRole().name()) | ||
| .userNickname(user.getNickname() + " 새싹") | ||
| .potId(pot.getPotId()) | ||
| .potName(pot.getPotName()) | ||
| .potContent(pot.getPotContent()) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,7 +40,7 @@ public PotDetailResponseDto toPotDetailResponseDto(User user, Pot pot, String re | |
| return PotDetailResponseDto.builder() | ||
| .userId(user.getId()) | ||
| .userRole(user.getRole().name()) | ||
| .userNickname(user.getNickname() + " 새싹") | ||
| .isOwner(isOwner) | ||
| .potId(pot.getPotId()) | ||
| .potName(pot.getPotName()) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,8 +10,7 @@ | |
| import stackpot.stackpot.feed.entity.mapping.FeedSave; | ||
| import stackpot.stackpot.user.entity.User; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| @Repository | ||
| public interface FeedSaveRepository extends JpaRepository<FeedSave, Long> { | ||
|
|
@@ -30,6 +29,23 @@ public interface FeedSaveRepository extends JpaRepository<FeedSave, Long> { | |
|
|
||
| @Query("SELECT COUNT(fs) FROM FeedSave fs WHERE fs.feed.feedId = :feedId") | ||
| long countByFeedId(@Param("feedId") Long feedId); | ||
| @Query(""" | ||
| SELECT fs.feed.feedId, COUNT(fs) | ||
| FROM FeedSave fs | ||
| WHERE fs.feed.feedId IN :feedIds | ||
| GROUP BY fs.feed.feedId | ||
| """) | ||
| List<Object[]> countByFeedIdsRaw(@Param("feedIds") List<Long> feedIds); | ||
|
|
||
| default Map<Long, Long> countByFeedIds(List<Long> feedIds) { | ||
| if (feedIds == null || feedIds.isEmpty()) return Collections.emptyMap(); | ||
| Map<Long, Long> map = new HashMap<>(); | ||
| for (Object[] row : countByFeedIdsRaw(feedIds)) { | ||
| map.put((Long) row[0], (Long) row[1]); | ||
| } | ||
| return map; | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,23 +53,22 @@ public Page<PotPreviewResponseDto> searchPots(String keyword, Pageable pageable) | |
| .map(Pot::getPotId) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| Long userId = null; | ||
| try { | ||
| User user = authService.getCurrentUser(); | ||
| userId = user.getId(); | ||
| } catch (Exception ignored) { /* 비로그인 */ } | ||
|
|
||
| // 배치 집계(이미 배치 쿼리 사용 중이라 OK) | ||
| Map<Long, Integer> potSaveCountMap = potSaveRepository.countSavesByPotIds(potIds); | ||
|
|
||
| // List -> Set (contains O(1)) | ||
| Set<Long> savedPotIds = (userId != null) | ||
| ? new HashSet<>(potSaveRepository.findPotIdsByUserIdAndPotIds(userId, potIds)) | ||
| : Collections.emptySet(); | ||
|
|
||
| Set<Long> memberPotIds = (userId != null) | ||
| ? new HashSet<>(potMemberRepository.findPotIdsByUserIdAndPotIds(userId, potIds)) | ||
| : Collections.emptySet(); | ||
|
|
||
| return pots.map(pot -> { | ||
|
|
@@ -86,47 +85,50 @@ public Page<PotPreviewResponseDto> searchPots(String keyword, Pageable pageable) | |
| }); | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| @Transactional(readOnly = true) | ||
| public Page<FeedResponseDto.FeedDto> searchFeeds(String keyword, Pageable pageable) { | ||
| var authentication = SecurityContextHolder.getContext().getAuthentication(); | ||
| boolean isAuthenticated = authentication != null | ||
| && !(authentication instanceof AnonymousAuthenticationToken) | ||
| && authentication.isAuthenticated(); | ||
|
|
||
| User user = isAuthenticated ? authService.getCurrentUser() : null; | ||
| Long userId = (user != null) ? user.getId() : null; | ||
|
|
||
|
|
||
| Page<Feed> feeds = feedRepository.findByTitleContainingOrContentContainingOrderByCreatedAtDesc( | ||
| keyword, keyword, pageable | ||
| ); | ||
|
|
||
| // === N+1 제거: 한 번에 집계/조회 === | ||
| List<Long> feedIds = feeds.getContent().stream() | ||
| .map(Feed::getFeedId) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| // 저장 수 배치 집계 | ||
| Map<Long, Long> saveCountMap = feedSaveRepository.countByFeedIds(feedIds); | ||
|
|
||
| // List -> Set (contains O(1)) | ||
| Set<Long> likedFeedIds = (userId != null) | ||
| ? new HashSet<>(feedLikeRepository.findFeedIdsByUserId(userId)) | ||
| : Collections.emptySet(); | ||
|
|
||
| Set<Long> savedFeedIds = (userId != null) | ||
| ? new HashSet<>(feedSaveRepository.findFeedIdsByUserId(userId)) | ||
| : Collections.emptySet(); | ||
|
Comment on lines
+114
to
+120
There was a problem hiding this comment. 🛠️ Refactor suggestion 불필요한 대용량 조회
제안: 🤖 Prompt for AI Agents |
||
|
|
||
| return feeds.map(feed -> { | ||
| boolean isOwner = user != null && Objects.equals(user.getId(), feed.getUser().getId()); | ||
| Boolean isLiked = (userId != null) ? likedFeedIds.contains(feed.getFeedId()) : null; | ||
| Boolean isSaved = (userId != null) ? savedFeedIds.contains(feed.getFeedId()) : null; | ||
| int saveCount = saveCountMap.getOrDefault(feed.getFeedId(), 0L).intValue(); | ||
|
|
||
| return feedConverter.feedDto(feed, isOwner, isLiked, isSaved, saveCount); | ||
| }); | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Verification agent
🧩 Analysis chain
미사용 import 제거 권장
UserMyPageResponseDto를 본 컨트롤러에서 사용하지 않습니다. 코드 정리 및 정적 분석 경고 방지를 위해 import를 제거하세요.
-import stackpot.stackpot.user.dto.response.UserMyPageResponseDto;🏁 Script executed:
Length of output: 179
미사용 import 제거 필요
다음 컨트롤러에서
UserMyPageResponseDto가 전혀 참조되지 않습니다. 코드 정리와 정적 분석 경고 방지를 위해 해당 import를 제거하세요.• 위치:
src/main/java/stackpot/stackpot/feed/controller/FeedController.java(19번 라인)-import stackpot.stackpot.user.dto.response.UserMyPageResponseDto;📝 Committable suggestion
🤖 Prompt for AI Agents