Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/#670-피드_이미지_정렬_기능_추가 #674

Merged
merged 1 commit into from
Oct 4, 2023
Merged

Feature/#670-피드_이미지_정렬_기능_추가 #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion backend/emm-sale/src/main/java/com/emmsale/feed/application/FeedQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.emmsale.image.domain.repository.ImageRepository;
import com.emmsale.member.domain.Member;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
Expand Down Expand Up @@ -64,14 +65,18 @@ public FeedListResponse findAllFeeds(final Member member, final Long eventId) {
}

private Map<Long, List<Image>> getFeedImagesMap(final List<Long> feedIds) {
return imageRepository.findAllByFeedIdIn(feedIds).stream()
final Map<Long, List<Image>> feedImagesMap = imageRepository.findAllByFeedIdIn(feedIds).stream()
.collect(Collectors.groupingBy(
Image::getContentId,
Collectors.mapping(
Function.identity(),
Collectors.toList()
)
));

feedImagesMap.forEach((feedId, images) -> images.sort(Comparator.comparing(Image::getOrder)));

return feedImagesMap;
}

private Map<Long, Long> getFeedIdCommentCountMap(final List<Long> feedIds) {
Expand Down Expand Up @@ -104,6 +109,7 @@ public FeedDetailResponse findFeed(final Member member, final Long id) {
final Feed feed = feedRepository.findById(id)
.orElseThrow(() -> new FeedException(FeedExceptionType.NOT_FOUND_FEED));
final List<Image> images = imageRepository.findAllByFeedId(feed.getId());
images.sort(Comparator.comparing(Image::getOrder));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ImageRepository의 findAllByFeedId() 쿼리에 order by구문을 추가해줘도 좋을 것 같아요!


validateBlockedMemberFeed(member, feed);
validateDeletedFeed(feed);
Expand Down
18 changes: 11 additions & 7 deletions backend/emm-sale/src/test/java/com/emmsale/feed/application/FeedQueryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,19 +234,23 @@ void findFeedWithDeletedFeedIdTest() {
@DisplayName("피드 이미지 조회 테스트")
class FeedQueryWithImage {

private Image image1;
private Image image2;
private Image image3;
private List<Image> images;

@BeforeEach
void setUp() {
images = imageRepository.saveAll(List.of(
new Image("image-uuid", ImageType.FEED, feed1.getId(), 1, LocalDateTime.now()),
new Image("image-uuid", ImageType.FEED, feed1.getId(), 2, LocalDateTime.now())
)
);
image1 = new Image("image-uuid1", ImageType.FEED, feed1.getId(), 1, LocalDateTime.now());
image2 = new Image("image-uuid2", ImageType.FEED, feed1.getId(), 2, LocalDateTime.now());
image3 = new Image("image-uuid3", ImageType.FEED, feed1.getId(), 3, LocalDateTime.now());
images = List.of(image1, image2, image3);

imageRepository.saveAll(List.of(image2, image1, image3));
}

@Test
@DisplayName("피드에 이미지가 있을 경우 피드 목록에서 이미지 리스트를 함께 반환한다.")
@DisplayName("피드에 이미지가 있을 경우 피드 목록에서 이미지 리스트를 order순으로 정렬하여 함께 반환한다.")
void findAllFeedsWithImages() {
//given
final Long eventId = event.getId();
Expand All @@ -268,7 +272,7 @@ void findAllFeedsWithImages() {
}

@Test
@DisplayName("피드에 이미지가 있을 경우 피드 목록에서 이미지 리스트를 함께 반환한다.")
@DisplayName("피드에 이미지가 있을 경우 피드 목록에서 이미지 리스트를 order순으로 정렬하여 함께 반환한다.")
void findDetailFeedWithImages() {
//given
final FeedDetailResponse expect = FeedDetailResponse.from(feed1, images);
Expand Down
Loading