Merge pull request #115 from tukcomCD2024/refactor/#114

[Refactor/#114] Redis 기반 실시간 리더보드 정합성 개선

Author: JunRain2

backend/memetory/src/main/java/com/example/memetory/domain/like/repository/LikeQueryRepository.java

@@ -1,11 +1,22 @@
 package com.example.memetory.domain.like.repository;
 
+import java.time.LocalDate;
+import java.time.Year;
+import java.time.YearMonth;
+import java.util.List;
 import java.util.Optional;
 
 import com.example.memetory.domain.like.entity.Like;
 import com.example.memetory.domain.member.entity.Member;
+import com.example.memetory.domain.memes.dto.MemesRankDto;
 import com.example.memetory.domain.memes.entity.Memes;
 
 public interface LikeQueryRepository {
 	Optional<Like> findLikeByMemberAndMemes(Member member, Memes memes);
+
+	List<MemesRankDto> findDailyRankLimit100(LocalDate localDate);
+
+	List<MemesRankDto> findWeeklyRankLimit100(Year year, int week);
+
+	List<MemesRankDto> findMonthlyRankLimit100(YearMonth yearMonth);
 }

backend/memetory/src/main/java/com/example/memetory/domain/like/repository/LikeQueryRepositoryImpl.java

@@ -2,13 +2,22 @@
 
 import static com.example.memetory.domain.like.entity.QLike.*;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.temporal.WeekFields;
+import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 
 import org.springframework.stereotype.Repository;
 
 import com.example.memetory.domain.like.entity.Like;
 import com.example.memetory.domain.member.entity.Member;
+import com.example.memetory.domain.memes.dto.MemesRankDto;
 import com.example.memetory.domain.memes.entity.Memes;
+import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
 import lombok.RequiredArgsConstructor;
@@ -20,10 +29,60 @@ public class LikeQueryRepositoryImpl implements LikeQueryRepository {
 
 	@Override
 	public Optional<Like> findLikeByMemberAndMemes(Member member, Memes memes) {
-		return Optional.ofNullable(jpaQueryFactory
-			.selectFrom(like)
-			.where(like.member.eq(member)
-				.and(like.memes.eq(memes)))
-			.fetchFirst());
+		return Optional.ofNullable(
+			jpaQueryFactory.selectFrom(like).where(like.member.eq(member).and(like.memes.eq(memes))).fetchFirst());
 	}
+
+	@Override
+	public List<MemesRankDto> findDailyRankLimit100(LocalDate localDate) {
+		return jpaQueryFactory.select(Projections.constructor(MemesRankDto.class, like.memes.id, like.id.count()))
+			.from(like)
+			.where(like.createdAt.goe(localDate.atStartOfDay()),
+				like.createdAt.lt(localDate.plusDays(1).atStartOfDay()))
+			.groupBy(like.memes)
+			.orderBy(like.id.count().desc())
+			.limit(100L)
+			.fetch();
+	}
+
+	@Override
+	public List<MemesRankDto> findWeeklyRankLimit100(Year year, int week) {
+		// 주차 기준: 한국 (월요일 시작)
+		WeekFields weekFields = WeekFields.of(Locale.KOREA);
+
+		// 해당 주의 시작 날짜 (월요일)
+		LocalDate startOfWeek = year.atDay(1).with(weekFields.weekOfYear(), week).with(weekFields.dayOfWeek(), 1);
+
+		// 다음 주의 시작 날짜 (exclusive)
+		LocalDate endOfWeek = startOfWeek.plusDays(7);
+
+		LocalDateTime startDateTime = startOfWeek.atStartOfDay();     // 월요일 00:00
+		LocalDateTime endDateTime = endOfWeek.atStartOfDay();         // 다음 주 월요일 00:00
+
+		return jpaQueryFactory.select(Projections.constructor(MemesRankDto.class, like.memes.id, like.id.count()))
+			.from(like)
+			.where(like.createdAt.goe(startDateTime), like.createdAt.lt(endDateTime))
+			.groupBy(like.memes.id)
+			.orderBy(like.id.count().desc())
+			.limit(100)
+			.fetch();
+	}
+
+	@Override
+	public List<MemesRankDto> findMonthlyRankLimit100(YearMonth yearMonth) {
+		// 해당 월의 시작일 00:00
+		LocalDateTime startOfMonth = yearMonth.atDay(1).atStartOfDay();
+
+		// 다음 달의 시작일 00:00 (해당 월의 마지막까지 포함되도록)
+		LocalDateTime startOfNextMonth = yearMonth.plusMonths(1).atDay(1).atStartOfDay();
+
+		return jpaQueryFactory.select(Projections.constructor(MemesRankDto.class, like.memes.id, like.id.count()))
+			.from(like)
+			.where(like.createdAt.goe(startOfMonth), like.createdAt.lt(startOfNextMonth))
+			.groupBy(like.memes.id)
+			.orderBy(like.id.count().desc())
+			.limit(100)
+			.fetch();
+	}
+
 }

backend/memetory/src/main/java/com/example/memetory/domain/like/repository/LikeRepository.java

@@ -2,9 +2,12 @@
 
 import com.example.memetory.domain.like.entity.Like;
 import com.example.memetory.domain.member.entity.Member;
+import com.example.memetory.domain.memes.dto.MemesRankDto;
 import com.example.memetory.domain.memes.entity.Memes;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.time.Year;
+import java.util.List;
 import java.util.Optional;
 
 public interface LikeRepository extends JpaRepository<Like, Long>, LikeQueryRepository {

backend/memetory/src/main/java/com/example/memetory/domain/like/service/LikeService.java

@@ -1,5 +1,6 @@
 package com.example.memetory.domain.like.service;
 
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -12,8 +13,9 @@
 import com.example.memetory.domain.member.entity.Member;
 import com.example.memetory.domain.member.service.MemberService;
 import com.example.memetory.domain.memes.entity.Memes;
+import com.example.memetory.domain.memes.event.LikeCreatedEvent;
+import com.example.memetory.domain.memes.event.LikeDeletedEvent;
 import com.example.memetory.domain.memes.service.MemesService;
-import com.example.memetory.domain.memes.service.RankingService;
 
 import lombok.RequiredArgsConstructor;
 
@@ -23,7 +25,7 @@ public class LikeService {
 	private final MemberService memberService;
 	private final MemesService memesService;
 	private final LikeRepository likeRepository;
-	private final RankingService rankingService;
+	private final ApplicationEventPublisher eventPublisher;
 
 	@Transactional
 	public void registerLike(LikeServiceDto likeServiceDto) {
@@ -32,7 +34,7 @@ public void registerLike(LikeServiceDto likeServiceDto) {
 
 		Like newLike = Like.fromMemberAndMemes(member, memes);
 		saveLike(newLike);
-		increaseMemesLikeCount(memes);
+		eventPublisher.publishEvent(new LikeCreatedEvent(memes.getId()));
 	}
 
 	private void saveLike(Like like) {
@@ -43,23 +45,13 @@ private void saveLike(Like like) {
 		}
 	}
 
-	private void increaseMemesLikeCount(Memes memes) {
-		memes.addLikeCount();
-		rankingService.increaseTodayMemesLikeCountFromMemesId(memes.getId());
-	}
-
 	@Transactional
 	public void cancelLike(LikeServiceDto likeServiceDto) {
 		Member member = memberService.findMemberFromEmail(likeServiceDto.getEmail());
 		Memes memes = memesService.findMemesFromMemesId(likeServiceDto.getMemesId());
 		Like like = likeRepository.findLikeByMemberAndMemes(member, memes).orElseThrow(NotFoundLikeException::new);
 
 		likeRepository.delete(like);
-		decreaseMemesLikeCount(memes);
-	}
-
-	private void decreaseMemesLikeCount(Memes memes) {
-		memes.cancelLikeCount();
-		rankingService.decreaseTodayMemesLikeCountFromMemesId(memes.getId());
+		eventPublisher.publishEvent(new LikeDeletedEvent(memes.getId()));
 	}
 }

backend/memetory/src/main/java/com/example/memetory/domain/memes/controller/like/MemesLikeApi.java

@@ -1,5 +1,8 @@
 package com.example.memetory.domain.memes.controller.like;
 
+import java.time.LocalDate;
+import java.time.YearMonth;
+
 import org.springframework.http.ResponseEntity;
 
 import com.example.memetory.global.response.ResultResponse;
@@ -23,7 +26,7 @@ public interface MemesLikeApi {
 			description = "인기차트 조회"
 		)
 	})
-	ResponseEntity<ResultResponse> findTopMemesByLike();
+	ResponseEntity<ResultResponse> findTopMemesByLike(LocalDate date);
 
 	@Operation(
 		summary = "meme`s 이달의 인기차트 조회",
@@ -36,7 +39,7 @@ public interface MemesLikeApi {
 			description = "이달의 인기차트 조회"
 		)
 	})
-	ResponseEntity<ResultResponse> findTopMemesByLikeForMonth();
+	ResponseEntity<ResultResponse> findTopMemesByLikeForMonth(YearMonth yearMonth);
 
 	@Operation(
 		summary = "meme`s 이주의 인기차트 조회",
@@ -49,7 +52,7 @@ public interface MemesLikeApi {
 			description = "이주의 인기차트 조회"
 		)
 	})
-	ResponseEntity<ResultResponse> findTopMemesByLikeForWeek();
+	ResponseEntity<ResultResponse> findTopMemesByLikeForWeek(int year, int week);
 
 	@Operation(
 		summary = "meme`s 좋아요 등록",

backend/memetory/src/main/java/com/example/memetory/domain/memes/controller/like/MemesLikeController.java

@@ -2,15 +2,20 @@
 
 import static com.example.memetory.global.response.ResultCode.*;
 
+import java.time.LocalDate;
+import java.time.Year;
+import java.time.YearMonth;
 import java.util.List;
 
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.example.memetory.domain.like.dto.LikeServiceDto;
@@ -29,25 +34,30 @@ public class MemesLikeController implements MemesLikeApi {
 	private final MemesService memesService;
 	private final LikeService likeService;
 
-	@GetMapping("/like/all")
+	@GetMapping("/like/daily")
 	@Override
-	public ResponseEntity<ResultResponse> findTopMemesByLike() {
-		List<MemesInfoResponse> response = memesService.findTopMemesByLike();
+	public ResponseEntity<ResultResponse> findTopMemesByLike(@RequestParam("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
+		List<MemesInfoResponse> response = memesService.findDailyTop10Memes(date);
 		return ResponseEntity.ok(ResultResponse.of(GET_TOP_TEN_MEMES_SUCCESS, response));
 	}
 
-	@GetMapping("/like/month")
+	@GetMapping("/like/week")
 	@Override
-	public ResponseEntity<ResultResponse> findTopMemesByLikeForMonth() {
-		List<MemesInfoResponse> response = memesService.findTopMemesByLikeForMonth();
-		return ResponseEntity.ok(ResultResponse.of(GET_MONTH_TOP_TEN_MEMES_SUCCESS, response));
+	public ResponseEntity<ResultResponse> findTopMemesByLikeForWeek(
+		@RequestParam("year") int year,
+		@RequestParam("week") int week
+	) {
+		List<MemesInfoResponse> response = memesService.findWeeklyTop10Memes(Year.of(year), week);
+		return ResponseEntity.ok(ResultResponse.of(GET_WEEK_TOP_TEN_MEMES_SUCCESS, response));
 	}
 
-	@GetMapping("/like/week")
+	@GetMapping("/like/month")
 	@Override
-	public ResponseEntity<ResultResponse> findTopMemesByLikeForWeek() {
-		List<MemesInfoResponse> response = memesService.findTopMemesByLikeForWeek();
-		return ResponseEntity.ok(ResultResponse.of(GET_WEEK_TOP_TEN_MEMES_SUCCESS, response));
+	public ResponseEntity<ResultResponse> findTopMemesByLikeForMonth(
+		@RequestParam("yearMonth") @DateTimeFormat(pattern = "yyyy-MM") YearMonth yearMonth
+	) {
+		List<MemesInfoResponse> response = memesService.findMonthlyTop10Memes(yearMonth);
+		return ResponseEntity.ok(ResultResponse.of(GET_MONTH_TOP_TEN_MEMES_SUCCESS, response));
 	}
 
 	@PostMapping("/{memesId}/like")

backend/memetory/src/main/java/com/example/memetory/domain/memes/event/DailyRankingCreatedEvent.java

@@ -0,0 +1,9 @@
+package com.example.memetory.domain.memes.event;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import com.example.memetory.domain.memes.dto.MemesRankDto;
+
+public record DailyRankingCreatedEvent(LocalDate date, List<MemesRankDto> memesRank) {
+}

backend/memetory/src/main/java/com/example/memetory/domain/memes/event/LikeCreatedEvent.java

@@ -0,0 +1,4 @@
+package com.example.memetory.domain.memes.event;
+
+public record LikeCreatedEvent(Long memesId) {
+}

backend/memetory/src/main/java/com/example/memetory/domain/memes/event/LikeDeletedEvent.java

@@ -0,0 +1,4 @@
+package com.example.memetory.domain.memes.event;
+
+public record LikeDeletedEvent(Long memesId) {
+}

backend/memetory/src/main/java/com/example/memetory/domain/memes/event/MonthlyRankingCreatedEvent.java

@@ -0,0 +1,10 @@
+package com.example.memetory.domain.memes.event;
+
+import java.time.YearMonth;
+import java.util.List;
+
+import com.example.memetory.domain.memes.dto.MemesRankDto;
+
+public record MonthlyRankingCreatedEvent(YearMonth yearMonth, List<MemesRankDto> memesRankDtoList) {
+
+}