Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
public class GeneralFeedRankingService implements FeedRankingService {

private static final int FEED_WEIGHT = 10;
private static final int VIEW_WEIGHT = 1;
private static final int LIKE_WEIGHT = 3;
private static final int VIEW_WEIGHT = 3;
private static final int LIKE_WEIGHT = 1;
private static final int COMMENT_WEIGHT = 5;

private final FeedRepository feedRepository;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void getClubFeedRanking_success() {
// 동아리A: 피드 1개 → score = 10
feedRepository.save(FeedFixture.createImageFeed(clubA, "피드A"));

// 동아리B: 피드 2개 + 좋아요 1개 → score = 2*10 + 1*3 = 23
// 동아리B: 피드 2개 + 좋아요 1개 → score = 2*10 + 1*1 = 21
Feed feedB = feedRepository.save(FeedFixture.createImageFeed(clubB, "피드B1"));
feedRepository.save(FeedFixture.createImageFeed(clubB, "피드B2"));
given()
Expand Down Expand Up @@ -105,9 +105,9 @@ void getClubFeedRanking_success() {
assertThat(first.rank()).isEqualTo(1);
assertThat(first.feedScore()).isEqualTo(2 * 10);
assertThat(first.viewScore()).isEqualTo(0);
assertThat(first.likeScore()).isEqualTo(1 * 3);
assertThat(first.likeScore()).isEqualTo(1);
assertThat(first.commentScore()).isEqualTo(0);
assertThat(first.totalScore()).isEqualTo(23);
assertThat(first.totalScore()).isEqualTo(21);

AdminClubFeedRankingResponse second = response.get(1);
assertThat(second.clubName()).isEqualTo("동아리A");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void getFeedStatus_success() {
String token = signIn("club123", "1234");

// when & then
// score = feedCount(2)*10 + viewCount(0)*1 + likeCount(1)*3 + commentCount(1)*5 = 28
// score = feedCount(2)*10 + viewCount(0)*3 + likeCount(1)*1 + commentCount(1)*5 = 26
Map<?, ?> response = given()
.contentType(ContentType.JSON)
.header("Authorization", "Bearer " + token)
Expand All @@ -93,14 +93,14 @@ void getFeedStatus_success() {
.extract()
.as(Map.class);

// feedScore = 2*10=20, viewScore = 0, likeScore = 1*3=3, commentScore = 1*5=5, totalScore = 28
// feedScore = 2*10=20, viewScore = 0, likeScore = 1*1=1, commentScore = 1*5=5, totalScore = 26
assertSoftly(softly -> {
softly.assertThat(response.get("year")).isEqualTo(year);
softly.assertThat(response.get("month")).isEqualTo(month);
softly.assertThat(((Number) response.get("feedScore")).longValue()).isEqualTo(20L);
softly.assertThat(((Number) response.get("likeScore")).longValue()).isEqualTo(3L);
softly.assertThat(((Number) response.get("likeScore")).longValue()).isEqualTo(1L);
softly.assertThat(((Number) response.get("commentScore")).longValue()).isEqualTo(5L);
softly.assertThat(((Number) response.get("totalScore")).longValue()).isEqualTo(28L);
softly.assertThat(((Number) response.get("totalScore")).longValue()).isEqualTo(26L);
softly.assertThat(((Number) response.get("rank")).intValue()).isEqualTo(1);
softly.assertThat(((Number) response.get("lastMonthRank")).intValue()).isEqualTo(0);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,14 @@ void getClubFeedRanking_withLikesAndComments() {
List<ClubFeedRankingQuery> result = feedRankingService.getClubFeedRanking(year, month);

// then
// score = feedCount(1)*10 + viewCount(0)*1 + likeCount(2)*3 + commentCount(1)*5 = 10+0+6+5 = 21
// score = feedCount(1)*10 + viewCount(0)*3 + likeCount(2)*1 + commentCount(1)*5 = 10+0+2+5 = 17
assertThat(result).hasSize(1);
assertSoftly(softly -> {
softly.assertThat(result.get(0).clubName()).isEqualTo("활발한동아리");
softly.assertThat(result.get(0).feedScore()).isEqualTo(10L);
softly.assertThat(result.get(0).likeScore()).isEqualTo(6L);
softly.assertThat(result.get(0).likeScore()).isEqualTo(2L);
softly.assertThat(result.get(0).commentScore()).isEqualTo(5L);
softly.assertThat(result.get(0).totalScore()).isEqualTo(21L);
softly.assertThat(result.get(0).totalScore()).isEqualTo(17L);
});
}

Expand Down Expand Up @@ -438,14 +438,14 @@ void getClubFeedRankingSnapshot_calculatesWeightedScores() {
List<ClubFeedRankingQuery> result = feedRankingService.getClubFeedRankingSnapshot(2026, 2);

// then
// feedScore=10*10=100, viewScore=100*1=100, likeScore=50*3=150, commentScore=20*5=100, total=450
// feedScore=10*10=100, viewScore=100*3=300, likeScore=50*1=50, commentScore=20*5=100, total=550
assertThat(result).hasSize(1);
assertSoftly(softly -> {
softly.assertThat(result.get(0).feedScore()).isEqualTo(100L);
softly.assertThat(result.get(0).viewScore()).isEqualTo(100L);
softly.assertThat(result.get(0).likeScore()).isEqualTo(150L);
softly.assertThat(result.get(0).viewScore()).isEqualTo(300L);
softly.assertThat(result.get(0).likeScore()).isEqualTo(50L);
softly.assertThat(result.get(0).commentScore()).isEqualTo(100L);
softly.assertThat(result.get(0).totalScore()).isEqualTo(450L);
softly.assertThat(result.get(0).totalScore()).isEqualTo(550L);
});
}
}