feat : 코드 리뷰 락 AOP 적용 및 주간 토큰 지급 로직 구현 (#75)

* refactor : User 패키지 구조 변경 및 코드 리뷰 요청을 위한 review_token 관련 로직 구현

* feat : review_token 관련 DTO 추가

* feat : 중복 리뷰 요청을 방지하기 위한 AOP 구현

* refactor : 공통 락을 사용하기 위한 prefix 추가

* refactor : 가독성을 위한 클래스 분리 및 롤백 추가

* refactor : AOP 사용을 위해 어노테이션 추가

* feat : 제출내역 조회 QueryDSL 구현

* feat : 매주 월요일 00시에 리뷰 토큰 초기화하는 스케줄러 구현

* refactor : 사용하지 않는 import문, 메서드 제거

* refactor : 로깅 및 예외 처리 강화

Author: thezz9

src/main/java/org/ezcode/codetest/CodetestApplication.java

@@ -2,12 +2,14 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableJpaAuditing
 @EnableScheduling
+@EnableAspectJAutoProxy(proxyTargetClass = true)
 public class CodetestApplication {
 
 	public static void main(String[] args) {

src/main/java/org/ezcode/codetest/application/submission/aop/CodeReviewLock.java

@@ -0,0 +1,14 @@
+package org.ezcode.codetest.application.submission.aop;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface CodeReviewLock {
+	String prefix();
+}

src/main/java/org/ezcode/codetest/application/submission/aop/CodeReviewLockAspect.java

@@ -0,0 +1,57 @@
+package org.ezcode.codetest.application.submission.aop;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.ezcode.codetest.application.submission.port.LockManager;
+import org.ezcode.codetest.domain.submission.exception.CodeReviewException;
+import org.ezcode.codetest.domain.submission.exception.code.CodeReviewExceptionCode;
+import org.ezcode.codetest.domain.user.model.entity.AuthUser;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+
+@Aspect
+@Component
+@RequiredArgsConstructor
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class CodeReviewLockAspect {
+
+	private final LockManager lockManager;
+
+	@Around("@annotation(org.ezcode.codetest.application.submission.aop.CodeReviewLock)")
+	public Object lock(ProceedingJoinPoint joinPoint) throws Throwable {
+		MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+		String prefix = signature.getMethod().getAnnotation(CodeReviewLock.class).prefix();
+		Object[] args = joinPoint.getArgs();
+
+		Long problemId = null;
+		Long userId = null;
+
+		for (Object arg : args) {
+			if (arg instanceof Long) {
+				problemId = (Long) arg;
+			} else if (arg instanceof AuthUser) {
+				userId = ((AuthUser)arg).getId();
+			}
+		}
+
+		if (problemId == null || userId == null) {
+			throw new CodeReviewException(CodeReviewExceptionCode.REQUIRED_ARGS_NOT_FOUND);
+		}
+
+		boolean locked = lockManager.tryLock(prefix, userId, problemId);
+		if (!locked) {
+			throw new CodeReviewException(CodeReviewExceptionCode.ALREADY_REVIEWING);
+		}
+
+		try {
+			return joinPoint.proceed();
+		} finally {
+			lockManager.releaseLock(prefix, userId, problemId);
+		}
+	}
+}

src/main/java/org/ezcode/codetest/application/submission/model/OpenAIResponse.java

@@ -15,7 +15,7 @@ public record Message(String role, String content) {}
 	public String getReviewContent() {
 		return Optional.ofNullable(choices)
 			.flatMap(list -> list.stream().findFirst())
-			.map(choice -> choice.message.content)
+			.map(choice -> choice.message().content())
 			.orElse("");
 	}
 }

src/main/java/org/ezcode/codetest/application/submission/port/LockManager.java

@@ -2,8 +2,8 @@
 
 public interface LockManager {
 
-	boolean tryLock(Long userId, Long problemId);
+	boolean tryLock(String prefix, Long userId, Long problemId);
 
-	void releaseLock(Long userId, Long problemId);
+	void releaseLock(String prefix, Long userId, Long problemId);
 
 }

src/main/java/org/ezcode/codetest/application/submission/service/SubmissionService.java

@@ -7,6 +7,7 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 
+import org.ezcode.codetest.application.submission.aop.CodeReviewLock;
 import org.ezcode.codetest.application.submission.dto.request.review.CodeReviewRequest;
 import org.ezcode.codetest.application.submission.dto.request.review.ReviewPayload;
 import org.ezcode.codetest.application.submission.dto.response.review.CodeReviewResponse;
@@ -67,7 +68,7 @@ public class SubmissionService {
 
 	public SseEmitter enqueueCodeSubmission(Long problemId, CodeSubmitRequest request, AuthUser authUser) {
 
-		boolean acquired = lockManager.tryLock(authUser.getId(), problemId);
+		boolean acquired = lockManager.tryLock("submission", authUser.getId(), problemId);
 
 		if (!acquired) {
 			throw new SubmissionException(SubmissionExceptionCode.ALREADY_JUDGING);
@@ -126,7 +127,7 @@ public void submitCodeStream(SubmissionMessage msg) {
 			exceptionNotificationHelper(e);
 		} finally {
 			emitterStore.remove(msg.emitterKey());
-			lockManager.releaseLock(msg.userId(), msg.problemId());
+			lockManager.releaseLock("submission", msg.userId(), msg.problemId());
 		}
     }
 
@@ -138,8 +139,13 @@ public List<GroupedSubmissionResponse> getSubmissions(AuthUser authUser) {
         return GroupedSubmissionResponse.groupByProblem(submissions);
     }
 
-    public CodeReviewResponse getCodeReview(Long problemId, CodeReviewRequest request) {
-        Problem problem = problemDomainService.getProblem(problemId);
+	@Transactional
+	@CodeReviewLock(prefix = "review")
+    public CodeReviewResponse getCodeReview(Long problemId, CodeReviewRequest request, AuthUser authUser) {
+		User user = userDomainService.getUserById(authUser.getId());
+		userDomainService.decreaseReviewToken(user);
+
+		Problem problem = problemDomainService.getProblem(problemId);
         Language language = languageDomainService.getLanguage(request.languageId());
 
         ReviewResult reviewResult = reviewClient.requestReview(ReviewPayload.of(problem, language, request));

src/main/java/org/ezcode/codetest/application/usermanagement/auth/service/AuthService.java

@@ -10,7 +10,7 @@
 import org.ezcode.codetest.application.usermanagement.auth.dto.response.SignupResponse;
 import org.ezcode.codetest.application.usermanagement.user.dto.response.LogoutResponse;
 import org.ezcode.codetest.domain.user.exception.AuthException;
-import org.ezcode.codetest.domain.user.exception.AuthExceptionCode;
+import org.ezcode.codetest.domain.user.exception.code.AuthExceptionCode;
 import org.ezcode.codetest.domain.user.model.entity.User;
 import org.ezcode.codetest.domain.user.model.entity.UserAuthType;
 import org.ezcode.codetest.domain.user.model.enums.AuthType;

src/main/java/org/ezcode/codetest/application/usermanagement/user/model/UsersByWeek.java

@@ -0,0 +1,25 @@
+package org.ezcode.codetest.application.usermanagement.user.model;
+
+import java.util.List;
+
+import org.ezcode.codetest.domain.submission.dto.WeeklySolveCount;
+
+public record UsersByWeek(
+
+	List<Long> fullWeek,
+
+	List<Long> partialWeek
+
+) {
+	public static UsersByWeek from(List<WeeklySolveCount> counts, long weekLength) {
+		List<Long> fullWeek = counts.stream()
+			.filter(c -> c.solveDayCount() == weekLength)
+			.map(WeeklySolveCount::userId)
+			.toList();
+		List<Long> partialWeek = counts.stream()
+			.filter(c -> c.solveDayCount() != weekLength)
+			.map(WeeklySolveCount::userId)
+			.toList();
+		return new UsersByWeek(fullWeek, partialWeek);
+	}
+}

src/main/java/org/ezcode/codetest/application/usermanagement/user/service/.gitkeep

@@ -1,12 +1,19 @@
 package org.ezcode.codetest.application.usermanagement.user.service;
 
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+import org.ezcode.codetest.application.usermanagement.user.model.UsersByWeek;
+import org.ezcode.codetest.domain.submission.dto.WeeklySolveCount;
 import org.ezcode.codetest.application.usermanagement.user.dto.request.ChangeUserPasswordRequest;
 import org.ezcode.codetest.application.usermanagement.user.dto.request.ModifyUserInfoRequest;
 import org.ezcode.codetest.application.usermanagement.user.dto.response.ChangeUserPasswordResponse;
 import org.ezcode.codetest.application.usermanagement.user.dto.response.UserInfoResponse;
 import org.ezcode.codetest.application.usermanagement.user.dto.response.WithdrawUserResponse;
+import org.ezcode.codetest.domain.submission.service.SubmissionDomainService;
 import org.ezcode.codetest.domain.user.exception.AuthException;
-import org.ezcode.codetest.domain.user.exception.AuthExceptionCode;
+import org.ezcode.codetest.domain.user.exception.code.AuthExceptionCode;
 import org.ezcode.codetest.domain.user.model.entity.AuthUser;
 import org.ezcode.codetest.domain.user.model.entity.User;
 import org.ezcode.codetest.domain.user.model.enums.AuthType;
@@ -16,7 +23,6 @@
 
 import org.springframework.transaction.annotation.Transactional;
 
-import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -26,6 +32,7 @@
 public class UserService {
 
 	private final UserDomainService userDomainService;
+	private final SubmissionDomainService submissionDomainService;
 	private final RedisTemplate<String, String> redisTemplate;
 
 	@Transactional(readOnly = true)
@@ -59,7 +66,6 @@ public UserInfoResponse modifyUserInfo(AuthUser authUser, ModifyUserInfoRequest
 			modifyUserInfoRequest.introduction(),
 			modifyUserInfoRequest.age());
 
-
 		return UserInfoResponse.builder()
 			.username(user.getUsername())
 			.age(user.getAge())
@@ -75,7 +81,8 @@ public UserInfoResponse modifyUserInfo(AuthUser authUser, ModifyUserInfoRequest
 	}
 
 	@Transactional
-	public ChangeUserPasswordResponse modifyUserPassword(AuthUser authUser, ChangeUserPasswordRequest changeUserPasswordRequest) {
+	public ChangeUserPasswordResponse modifyUserPassword(AuthUser authUser,
+		ChangeUserPasswordRequest changeUserPasswordRequest) {
 		User user = userDomainService.getUserById(authUser.getId());
 
 		//소셜로그인 회원은 변경 불가
@@ -95,7 +102,6 @@ public ChangeUserPasswordResponse modifyUserPassword(AuthUser authUser, ChangeUs
 		return new ChangeUserPasswordResponse("비밀번호를 성공적으로 변경했습니다");
 	}
 
-
 	@Transactional
 	public WithdrawUserResponse withdrawUser(AuthUser authUser) {
 		User user = userDomainService.getUserById(authUser.getId());
@@ -104,8 +110,17 @@ public WithdrawUserResponse withdrawUser(AuthUser authUser) {
 
 		user.setDeleted();
 
-		redisTemplate.delete("RefreshToken:"+authUser.getId());
+		redisTemplate.delete("RefreshToken:" + authUser.getId());
 
 		return new WithdrawUserResponse("탈퇴가 완료되었습니다");
 	}
+
+	@Transactional
+	public void resetAllUsersTokensWeekly(LocalDateTime startDateTime, LocalDateTime endDateTime) {
+
+		List<WeeklySolveCount> counts = submissionDomainService.getWeeklySolveCounts(startDateTime, endDateTime);
+		long weekLength = ChronoUnit.DAYS.between(startDateTime, endDateTime);
+
+		userDomainService.resetReviewTokensForUsers(UsersByWeek.from(counts, weekLength));
+	}
 }