Skip to content

#384 [Merge] dev 변경사항을 main에 반영 (v2.0.31) #385

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

Merged
jucheonsu merged 1 commit into from
Aug 9, 2026
Merged

#384 [Merge] dev 변경사항을 main에 반영 (v2.0.31) #385

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
24 changes: 17 additions & 7 deletions src/main/java/com/swyp/picke/domain/user/service/MypageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,19 +203,27 @@ private ContentActivityListResponse buildCommentActivities(User user, int pageOf
lookupTargets.addAll(myPerspectives);
Map<Long, Battle> battleMap = loadBattles(lookupTargets);
Map<Long, BattleOption> optionMap = loadOptions(lookupTargets);
List<Long> commentedBattleIds = comments.stream()
.map(comment -> comment.getPerspective().getBattle().getId())
.distinct()
.toList();
Map<Long, BattleOption> commentOptionMap = voteQueryService.findPostVoteOptionsByBattleIds(
user.getId(), commentedBattleIds);

Stream<ContentActivityListResponse.ContentActivityItem> commentItems = comments.stream()
.map(comment -> {
Perspective p = comment.getPerspective();
return toActivityItem(comment.getId().toString(), ActivityType.COMMENT, p,
battleMap.get(p.getBattle().getId()), optionMap.get(p.getOption().getId()),
comment.getContent(), comment.getCreatedAt(), myCharacterImageUrl);
comment.getUser().getId(),
battleMap.get(p.getBattle().getId()), commentOptionMap.get(p.getBattle().getId()),
comment.getContent(), comment.getLikeCount(), comment.getCreatedAt(), myCharacterImageUrl);
});

Stream<ContentActivityListResponse.ContentActivityItem> perspectiveItems = myPerspectives.stream()
.map(p -> toActivityItem(p.getId().toString(), ActivityType.PERSPECTIVE, p,
p.getUser().getId(),
battleMap.get(p.getBattle().getId()), optionMap.get(p.getOption().getId()),
p.getContent(), p.getCreatedAt(), myCharacterImageUrl));
p.getContent(), p.getLikeCount(), p.getCreatedAt(), myCharacterImageUrl));

List<ContentActivityListResponse.ContentActivityItem> items = Stream.concat(commentItems, perspectiveItems)
.sorted(Comparator.comparing(ContentActivityListResponse.ContentActivityItem::createdAt).reversed())
Expand Down Expand Up @@ -244,8 +252,9 @@ private ContentActivityListResponse buildLikeActivities(User user, int pageOffse
UserSummary perspectiveAuthor = userService.findSummaryById(p.getUser().getId());
String authorCharacterImageUrl = resolveCharacterImageUrl(perspectiveAuthor.characterType());
return toActivityItem(like.getId().toString(), ActivityType.LIKE, p,
p.getUser().getId(),
battleMap.get(p.getBattle().getId()), optionMap.get(p.getOption().getId()),
p.getContent(), like.getCreatedAt(), authorCharacterImageUrl);
p.getContent(), p.getLikeCount(), like.getCreatedAt(), authorCharacterImageUrl);
})
.toList();

Expand All @@ -256,10 +265,11 @@ private ContentActivityListResponse buildLikeActivities(User user, int pageOffse

private ContentActivityListResponse.ContentActivityItem toActivityItem(
String activityId, ActivityType activityType, Perspective perspective,
Battle battle, BattleOption option, String content, LocalDateTime createdAt,
Long authorUserId,
Battle battle, BattleOption option, String content, int likeCount, LocalDateTime createdAt,
String characterImageUrl) {

UserSummary author = userService.findSummaryById(perspective.getUser().getId());
UserSummary author = userService.findSummaryById(authorUserId);
ContentActivityListResponse.AuthorInfo authorInfo = new ContentActivityListResponse.AuthorInfo(
author.userTag(),
author.nickname(),
Expand All @@ -279,7 +289,7 @@ private ContentActivityListResponse.ContentActivityItem toActivityItem(
voteSide,
optionTitle,
content,
perspective.getLikeCount(),
likeCount,
createdAt
);
}
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/swyp/picke/domain/vote/repository/BattleVoteRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ public interface BattleVoteRepository extends JpaRepository<BattleVote, Long> {
@Query("SELECT v FROM BattleVote v LEFT JOIN FETCH v.postVoteOption WHERE v.battle.id = :battleId AND v.user.id = :userId")
Optional<BattleVote> findByBattleIdAndUserIdWithOption(@Param("battleId") Long battleId, @Param("userId") Long userId);

@Query("SELECT v FROM BattleVote v JOIN FETCH v.battle LEFT JOIN FETCH v.postVoteOption " +
"WHERE v.user.id = :userId AND v.battle.id IN :battleIds")
List<BattleVote> findByUserIdAndBattleIdInWithPostVoteOption(
@Param("userId") Long userId,
@Param("battleIds") List<Long> battleIds
);

Optional<BattleVote> findByBattleAndUser(Battle battle, User user);

long countByBattle(Battle battle);
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/com/swyp/picke/domain/vote/service/VoteQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
import com.swyp.picke.domain.vote.entity.BattleVote;
import com.swyp.picke.domain.vote.repository.BattleVoteRepository;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -39,6 +41,20 @@ public long countUserVotes(Long userId, VoteSide voteSide) {
return battleVoteRepository.countByUserIdAndPostVoteOptionIsNotNull(userId);
}

public Map<Long, BattleOption> findPostVoteOptionsByBattleIds(Long userId, List<Long> battleIds) {
if (battleIds.isEmpty()) {
return Map.of();
}

return battleVoteRepository.findByUserIdAndBattleIdInWithPostVoteOption(userId, battleIds).stream()
.filter(vote -> vote.getPostVoteOption() != null)
.collect(Collectors.toMap(
vote -> vote.getBattle().getId(),
BattleVote::getPostVoteOption,
(first, second) -> second
));
}

public long countTotalParticipation(Long userId) {
return battleVoteRepository.countByUserId(userId);
}
Expand Down
24 changes: 20 additions & 4 deletions src/test/java/com/swyp/picke/domain/user/service/MypageServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -223,30 +224,35 @@ void getBattleRecords_applies_vote_side_filter() {
}

@Test
@DisplayName("COMMENT 타입으로 댓글활동을 반환한다")
void getContentActivities_returns_comments() {
@DisplayName("COMMENT 활동은 댓글의 작성자, 좋아요 수, 선택지, 작성 시간을 반환한다")
void getContentActivities_returns_comment_data() {
User user = createUser(1L, "tag");
User perspectiveAuthor = createUser(2L, "perspective-author-tag");
UserProfile profile = createProfile(user, "nick", CharacterType.OWL);
Battle battle = createBattle("배틀");
Long battleId = battle.getId();
BattleOption option = createOption(battle, BattleOptionLabel.A);
Long optionId = option.getId();
BattleOption commentOption = createOption(battle, BattleOptionLabel.B);

Perspective perspective = Perspective.builder()
.battle(battle)
.user(user)
.user(perspectiveAuthor)
.option(option)
.content("관점 내용")
.build();
ReflectionTestUtils.setField(perspective, "id", generateId());
ReflectionTestUtils.setField(perspective, "likeCount", 7);

PerspectiveComment comment = PerspectiveComment.builder()
.perspective(perspective)
.user(user)
.content("댓글")
.build();
ReflectionTestUtils.setField(comment, "id", generateId());
ReflectionTestUtils.setField(comment, "createdAt", LocalDateTime.now());
ReflectionTestUtils.setField(comment, "likeCount", 2);
LocalDateTime commentCreatedAt = LocalDateTime.now();
ReflectionTestUtils.setField(comment, "createdAt", commentCreatedAt);

when(userService.findCurrentUser()).thenReturn(user);
when(userService.findUserProfile(1L)).thenReturn(profile);
Expand All @@ -256,13 +262,23 @@ void getContentActivities_returns_comments() {
when(perspectiveQueryService.countUserPerspectives(1L)).thenReturn(0L);
when(battleQueryService.findBattlesByIds(List.of(battleId))).thenReturn(Map.of(battleId, battle));
when(battleQueryService.findOptionsByIds(List.of(optionId))).thenReturn(Map.of(optionId, option));
when(voteQueryService.findPostVoteOptionsByBattleIds(1L, List.of(battleId)))
.thenReturn(Map.of(battleId, commentOption));
when(userService.findSummaryById(1L)).thenReturn(new UserSummary("tag", "nick", "OWL"));

ContentActivityListResponse response = mypageService.getContentActivities(null, null, ActivityType.COMMENT);

assertThat(response.items()).hasSize(1);
assertThat(response.items().get(0).activityType()).isEqualTo(ActivityType.COMMENT);
assertThat(response.items().get(0).content()).isEqualTo("댓글");
assertThat(response.items().get(0).author().userTag()).isEqualTo("tag");
assertThat(response.items().get(0).author().nickname()).isEqualTo("nick");
assertThat(response.items().get(0).likeCount()).isEqualTo(2);
assertThat(response.items().get(0).voteSide()).isEqualTo(VoteSide.CON);
assertThat(response.items().get(0).optionTitle()).isEqualTo("B");
assertThat(response.items().get(0).createdAt()).isEqualTo(commentCreatedAt);
verify(userService).findSummaryById(1L);
verify(userService, never()).findSummaryById(2L);
}

@Test
Expand Down
23 changes: 23 additions & 0 deletions src/test/java/com/swyp/picke/domain/vote/service/VoteQueryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package com.swyp.picke.domain.vote.service;

import com.swyp.picke.domain.battle.entity.Battle;
import com.swyp.picke.domain.battle.entity.BattleOption;
import com.swyp.picke.domain.user.enums.VoteSide;
import com.swyp.picke.domain.vote.entity.BattleVote;
import com.swyp.picke.domain.vote.repository.BattleVoteRepository;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand All @@ -10,12 +13,14 @@
import org.mockito.junit.jupiter.MockitoExtension;

import java.util.List;
import java.util.Map;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.mock;

@ExtendWith(MockitoExtension.class)
class VoteQueryServiceTest {
Expand Down Expand Up @@ -80,4 +85,22 @@ void countTotalParticipation_includes_pre_vote_only_records() {
assertThat(count).isEqualTo(5L);
verify(battleVoteRepository).countByUserId(1L);
}

@Test
@DisplayName("배틀별 사후 투표 선택지를 조회한다")
void findPostVoteOptionsByBattleIds_returns_post_vote_options() {
Battle battle = mock(Battle.class);
BattleOption postVoteOption = mock(BattleOption.class);
BattleVote vote = mock(BattleVote.class);

when(battle.getId()).thenReturn(10L);
when(vote.getBattle()).thenReturn(battle);
when(vote.getPostVoteOption()).thenReturn(postVoteOption);
when(battleVoteRepository.findByUserIdAndBattleIdInWithPostVoteOption(1L, List.of(10L)))
.thenReturn(List.of(vote));

Map<Long, BattleOption> result = voteQueryService.findPostVoteOptionsByBattleIds(1L, List.of(10L));

assertThat(result).containsEntry(10L, postVoteOption);
}
}
Loading