-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #51 from Team-BomBomBom/feat/check_assignment_prob…
…lem_solve#BBB-120 Feat: #BBB-120 알고리즘 과제 할당 및 해결 여부 요청에 Rate Limit과 대기열 시스템 적용
- Loading branch information
Showing
46 changed files
with
1,549 additions
and
246 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
202 changes: 202 additions & 0 deletions
202
.../src/main/java/com/bombombom/devs/external/algo/service/AlgorithmProblemQueueService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| package com.bombombom.devs.external.algo.service; | ||
|
|
||
| import com.bombombom.devs.algo.model.AlgorithmProblem; | ||
| import com.bombombom.devs.algo.model.vo.AlgorithmProblemQueueMessage; | ||
| import com.bombombom.devs.algo.model.vo.AlgorithmTaskUpdateStatus; | ||
| import com.bombombom.devs.algo.model.vo.AssignAlgorithmProblem; | ||
| import com.bombombom.devs.algo.model.vo.PendingMessageInfo; | ||
| import com.bombombom.devs.algo.repository.AlgorithmProblemRedisQueueRepository; | ||
| import com.bombombom.devs.algo.repository.AlgorithmProblemRepository; | ||
| import com.bombombom.devs.core.enums.AlgoTag; | ||
| import com.bombombom.devs.core.exception.BusinessRuleException; | ||
| import com.bombombom.devs.core.exception.ErrorCode; | ||
| import com.bombombom.devs.core.exception.NotFoundException; | ||
| import com.bombombom.devs.core.exception.ServerInternalException; | ||
| import com.bombombom.devs.core.util.Clock; | ||
| import com.bombombom.devs.external.algo.service.dto.command.AssignAlgorithmProblemCommand; | ||
| import com.bombombom.devs.external.algo.service.dto.command.UpdateAlgorithmTaskStatusCommand; | ||
| import com.bombombom.devs.job.AlgorithmProblemConverter; | ||
| import com.bombombom.devs.solvedac.SolvedacClient; | ||
| import com.bombombom.devs.solvedac.dto.ProblemListResponse; | ||
| import com.bombombom.devs.solvedac.dto.ProblemResponse; | ||
| import com.bombombom.devs.study.model.AlgorithmProblemAssignment; | ||
| import com.bombombom.devs.study.model.AlgorithmProblemSolvedHistory; | ||
| import com.bombombom.devs.study.model.AlgorithmStudy; | ||
| import com.bombombom.devs.study.model.Round; | ||
| import com.bombombom.devs.study.model.Study; | ||
| import com.bombombom.devs.study.repository.AlgorithmProblemAssignmentRepository; | ||
| import com.bombombom.devs.study.repository.AlgorithmProblemSolvedHistoryRepository; | ||
| import com.bombombom.devs.study.repository.RoundRepository; | ||
| import com.bombombom.devs.user.model.User; | ||
| import com.bombombom.devs.user.repository.UserRepository; | ||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import jakarta.annotation.PostConstruct; | ||
| import java.time.ZoneOffset; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| /** | ||
| * '알고리즘 과제 할당 요청'과 '알고리즘 과제 해결 여부 갱신 요청' 시, 각각 | ||
| * {@link AlgorithmProblemQueueService#addAssignProblemRequest(Study, AlgorithmStudy, Round, Map)} | ||
| * 메서드와 {@link AlgorithmProblemQueueService#addUpdateTaskStatusRequest(User, List, Long)} 메서드가 | ||
| * 호출된다. | ||
| * <p> | ||
| * 이 두 가지 요청은, 외부 API(solved.ac API)의 호출 제한 조건(15분에 256회)으로 인해 Token Bucket 알고리즘 기반 Rate Limit이 | ||
| * 적용되며, 대기열 큐에 해당 요청을 추가한다. | ||
| * ({@link com.bombombom.devs.ratelimit.config.SolvedacApiRateLimitConfig | ||
| * SolvedacApiRateLimitConfig} 에서 설정된 수치를 바탕으로 Rate Limit이 적용) | ||
| * <p> | ||
| * {@link com.bombombom.devs.job.AlgorithmStudyAssignmentJob AlgorithmStudyAssignmentJob}을 수행하는 | ||
| * 스케줄러는 대기열 큐에 담긴 메시지를 순차적으로 읽고, 메시지 타입(과제 할당 또는 갱신 요청)에 따라 각각 | ||
| * {@link AlgorithmProblemQueueService#assignProblems(AssignAlgorithmProblemCommand)}와 | ||
| * {@link AlgorithmProblemQueueService#updateTaskStatus(UpdateAlgorithmTaskStatusCommand)}를 호출하여, 과제 | ||
| * 할당 또는 해결 여부 갱신 요청 로직을 수행한다. 이 두 메서드는 Rate Limit을 관리하는 Bucket에 Token이 존재하는 경우에만 수행된다. | ||
| * ({@link com.bombombom.devs.ratelimit.config.SolvedacApiRateLimitConfig | ||
| * SolvedacApiRateLimitConfig} 내부에 Aspect가 선언되어 Token consume 로직 수행)</p> | ||
| * | ||
| * @see <a href="https://github.com/Team-BomBomBom/Server/pull/51">Feat: #BBB-120 알고리즘 과제 할당 및 해결 여부 | ||
| * 요청에 Rate Limit과 대기열 시스템 적용</a> | ||
| */ | ||
|
|
||
| @Slf4j | ||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class AlgorithmProblemQueueService { | ||
|
|
||
| static final long UPDATE_INTERVAL_MS = 5 * 60 * 1000; | ||
| static final long PENDING_MESSAGE_PROCESSING_INTERVAL_MS = 60 * 1000; | ||
|
|
||
| private final Clock clock; | ||
| private final SolvedacClient solvedacClient; | ||
| private final AlgorithmProblemConverter algorithmProblemConverter; | ||
| private final AlgorithmProblemService algorithmProblemService; | ||
| private final UserRepository userRepository; | ||
| private final RoundRepository roundRepository; | ||
| private final AlgorithmProblemRepository algorithmProblemRepository; | ||
| private final AlgorithmProblemRedisQueueRepository algorithmProblemRedisQueueRepository; | ||
| private final AlgorithmProblemAssignmentRepository algorithmProblemAssignmentRepository; | ||
| private final AlgorithmProblemSolvedHistoryRepository algorithmProblemSolvedHistoryRepository; | ||
|
|
||
| @PostConstruct | ||
| void init() { | ||
| algorithmProblemRedisQueueRepository.createConsumerGroup(); | ||
| } | ||
|
|
||
| @Transactional | ||
| public void addUpdateTaskStatusRequest(User user, List<AlgorithmProblem> problems, | ||
| Long studyId) { | ||
| if (hasRecentlyUpdatedTaskStatus(studyId, user.getId())) { | ||
| throw new BusinessRuleException(ErrorCode.ALGORITHM_TASK_STATUS_RECENTLY_UPDATED); | ||
| } | ||
| try { | ||
| Set<Integer> problemRefIds = problems.stream().map(AlgorithmProblem::getRefId) | ||
| .collect(Collectors.toSet()); | ||
| algorithmProblemRedisQueueRepository.addMessage(studyId, user.getId(), | ||
| user.getBaekjoon(), problemRefIds); | ||
| algorithmProblemRedisQueueRepository.setTaskUpdateInProgress(studyId, | ||
| user.getId()); | ||
| } catch (JsonProcessingException e) { | ||
| throw new ServerInternalException(ErrorCode.JSON_CONVERSION_FAIL); | ||
| } | ||
| } | ||
|
|
||
| @Transactional | ||
| public void addAssignProblemRequest(Study study, AlgorithmStudy algorithmStudy, Round round, | ||
| Map<AlgoTag, Integer> problemCountForEachTag) { | ||
| try { | ||
| algorithmProblemRedisQueueRepository.addMessage( | ||
| AssignAlgorithmProblem.of(study, algorithmStudy, round, problemCountForEachTag)); | ||
| } catch (JsonProcessingException e) { | ||
| throw new ServerInternalException(ErrorCode.JSON_CONVERSION_FAIL); | ||
| } | ||
| } | ||
|
|
||
| @Transactional | ||
| public void updateTaskStatus(UpdateAlgorithmTaskStatusCommand command) { | ||
| try { | ||
| ProblemListResponse solvedProblems = solvedacClient.checkProblemSolved( | ||
| command.baekjoonId(), command.problemRefIds()); | ||
| List<Integer> problemRefIds = solvedProblems.items().stream() | ||
| .map(ProblemResponse::problemId).toList(); | ||
| User user = userRepository.findById(command.userId()) | ||
| .orElseThrow(() -> new NotFoundException(ErrorCode.USER_NOT_FOUND)); | ||
| List<AlgorithmProblem> problems = algorithmProblemRepository.findAllByRefId( | ||
| problemRefIds); | ||
| Set<Long> solvedProblemIds = algorithmProblemSolvedHistoryRepository.findByUserIdAndProblemIds( | ||
| user.getId(), problems.stream().map(AlgorithmProblem::getId).toList()) | ||
| .stream().map(history -> history.getProblem().getId()).collect(Collectors.toSet()); | ||
| List<AlgorithmProblemSolvedHistory> histories = problems.stream() | ||
| .filter(problem -> !solvedProblemIds.contains(problem.getId())) | ||
| .map(problem -> AlgorithmProblemSolvedHistory.createAlgorithmProblemSolvedHistory( | ||
| user, problem, command.requestTime())).toList(); | ||
| algorithmProblemSolvedHistoryRepository.saveAll(histories); | ||
| algorithmProblemRedisQueueRepository.setTaskUpdateCompleted(command.studyId(), | ||
| command.userId()); | ||
| algorithmProblemRedisQueueRepository.ackMessage(command.recordId()); | ||
| } catch (NotFoundException e) { | ||
| algorithmProblemRedisQueueRepository.setTaskUpdateCompleted(command.studyId(), | ||
| command.userId()); | ||
| algorithmProblemRedisQueueRepository.ackMessage(command.recordId()); | ||
| } | ||
| } | ||
|
|
||
| @Transactional | ||
| public void assignProblems(AssignAlgorithmProblemCommand command) { | ||
| try { | ||
| Round round = roundRepository.findById(command.roundId()) | ||
| .orElseThrow(() -> new NotFoundException(ErrorCode.ROUND_NOT_FOUND)); | ||
| ProblemListResponse problemListResponse = solvedacClient.getUnSolvedProblems( | ||
| command.baekjoonIds(), command.difficultySpread(), | ||
| command.problemCountForEachTag()); | ||
| List<AlgorithmProblem> problems = algorithmProblemConverter.convert( | ||
| problemListResponse); | ||
| List<AlgorithmProblem> foundOrSavedProblems = algorithmProblemService.findProblemsThenSaveWhenNotExist( | ||
| problems); | ||
| assignProblemToRound(round, foundOrSavedProblems); | ||
| algorithmProblemRedisQueueRepository.ackMessage(command.recordId()); | ||
| } catch (NotFoundException e) { | ||
| algorithmProblemRedisQueueRepository.ackMessage(command.recordId()); | ||
| } | ||
| } | ||
|
|
||
| @Transactional | ||
| public void assignProblemToRound(Round round, List<AlgorithmProblem> problems) { | ||
| List<AlgorithmProblemAssignment> assignments = new ArrayList<>(); | ||
| for (AlgorithmProblem problem : problems) { | ||
| assignments.add(AlgorithmProblemAssignment.of(round, problem)); | ||
| } | ||
| algorithmProblemAssignmentRepository.saveAll(assignments); | ||
| } | ||
|
|
||
| public AlgorithmProblemQueueMessage getAssignOrTaskStatusUpdateMessage() { | ||
| return algorithmProblemRedisQueueRepository.readMessage(); | ||
| } | ||
|
|
||
| public AlgorithmProblemQueueMessage getUnprocessedAssignOrTaskStatusUpdateMessage() { | ||
| PendingMessageInfo pendingMessageInfo = algorithmProblemRedisQueueRepository.getOldestPendingMessageInfo(); | ||
| if (pendingMessageInfo == null || pendingMessageInfo.elapsedTime().toMillis() | ||
| < PENDING_MESSAGE_PROCESSING_INTERVAL_MS) { | ||
| return null; | ||
| } | ||
| return algorithmProblemRedisQueueRepository.getOldestPendingMessage( | ||
| pendingMessageInfo); | ||
| } | ||
|
|
||
| private boolean hasRecentlyUpdatedTaskStatus(Long studyId, Long userId) { | ||
| AlgorithmTaskUpdateStatus taskUpdateStatus = algorithmProblemRedisQueueRepository.getTaskUpdateStatus( | ||
| studyId, userId); | ||
| if (taskUpdateStatus == null || taskUpdateStatus.statusUpdatedAt() == null) { | ||
| return false; | ||
| } | ||
| long currentTimeMillis = clock.now().toInstant(ZoneOffset.UTC).toEpochMilli(); | ||
| return taskUpdateStatus.isUpdating() | ||
| || (currentTimeMillis - taskUpdateStatus.statusUpdatedAt()) < UPDATE_INTERVAL_MS; | ||
| } | ||
| } |
38 changes: 38 additions & 0 deletions
38
...a/com/bombombom/devs/external/algo/service/dto/command/AssignAlgorithmProblemCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package com.bombombom.devs.external.algo.service.dto.command; | ||
|
|
||
| import com.bombombom.devs.algo.model.vo.AlgorithmProblemQueueMessage; | ||
| import com.bombombom.devs.algo.model.vo.AssignAlgorithmProblem; | ||
| import com.bombombom.devs.core.Spread; | ||
| import com.bombombom.devs.core.enums.AlgoTag; | ||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import java.time.LocalDateTime; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import lombok.Builder; | ||
|
|
||
| @Builder | ||
| public record AssignAlgorithmProblemCommand( | ||
| String recordId, | ||
| LocalDateTime requestTime, | ||
| Long roundId, | ||
| Set<String> baekjoonIds, | ||
| Map<AlgoTag, Spread> difficultySpread, | ||
| Map<AlgoTag, Integer> problemCountForEachTag | ||
| ) { | ||
|
|
||
| public static AssignAlgorithmProblemCommand fromMessage(AlgorithmProblemQueueMessage message, | ||
| ObjectMapper objectMapper) throws JsonProcessingException { | ||
| AssignAlgorithmProblem assignAlgorithmProblem = objectMapper.readValue( | ||
| message.fields(), AssignAlgorithmProblem.class); | ||
| return AssignAlgorithmProblemCommand.builder() | ||
| .recordId(message.recordId()) | ||
| .requestTime(message.requestTime()) | ||
| .roundId(assignAlgorithmProblem.roundId()) | ||
| .baekjoonIds(assignAlgorithmProblem.baekjoonIds()) | ||
| .difficultySpread(assignAlgorithmProblem.difficultySpread()) | ||
| .problemCountForEachTag(assignAlgorithmProblem.problemCountForEachTag()) | ||
| .build(); | ||
| } | ||
|
|
||
| } |
36 changes: 36 additions & 0 deletions
36
...om/bombombom/devs/external/algo/service/dto/command/UpdateAlgorithmTaskStatusCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package com.bombombom.devs.external.algo.service.dto.command; | ||
|
|
||
| import com.bombombom.devs.algo.model.vo.AlgorithmProblemQueueMessage; | ||
| import com.bombombom.devs.algo.model.vo.UpdateAlgorithmTaskStatus; | ||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import java.time.LocalDateTime; | ||
| import java.util.Set; | ||
| import lombok.Builder; | ||
|
|
||
| @Builder | ||
| public record UpdateAlgorithmTaskStatusCommand( | ||
| String recordId, | ||
| LocalDateTime requestTime, | ||
| Long studyId, | ||
| Long userId, | ||
| String baekjoonId, | ||
| Set<Integer> problemRefIds | ||
| ) { | ||
|
|
||
| public static UpdateAlgorithmTaskStatusCommand fromMessage( | ||
| AlgorithmProblemQueueMessage message, ObjectMapper objectMapper) | ||
| throws JsonProcessingException { | ||
| UpdateAlgorithmTaskStatus updateAlgorithmTaskStatus = objectMapper.readValue( | ||
| message.fields(), UpdateAlgorithmTaskStatus.class); | ||
| return UpdateAlgorithmTaskStatusCommand.builder() | ||
| .recordId(message.recordId()) | ||
| .requestTime(message.requestTime()) | ||
| .studyId(updateAlgorithmTaskStatus.studyId()) | ||
| .userId(updateAlgorithmTaskStatus.userId()) | ||
| .baekjoonId(updateAlgorithmTaskStatus.baekjoonId()) | ||
| .problemRefIds(updateAlgorithmTaskStatus.problemRefIds()) | ||
| .build(); | ||
| } | ||
|
|
||
| } |
10 changes: 5 additions & 5 deletions
10
...t/AlgorithmProblemSolveHistoryResult.java → .../AlgorithmProblemSolvedHistoryResult.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
.../com/bombombom/devs/external/algo/service/dto/result/AlgorithmTaskUpdateStatusResult.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package com.bombombom.devs.external.algo.service.dto.result; | ||
|
|
||
| import com.bombombom.devs.algo.model.vo.AlgorithmTaskUpdateStatus; | ||
| import java.util.Map; | ||
| import java.util.stream.Collectors; | ||
| import lombok.Builder; | ||
|
|
||
| @Builder | ||
| public record AlgorithmTaskUpdateStatusResult( | ||
| Boolean isUpdating, | ||
| Long updatedAt | ||
| ) { | ||
|
|
||
| public static Map<Long, AlgorithmTaskUpdateStatusResult> fromResponse( | ||
| Map<Long, AlgorithmTaskUpdateStatus> taskUpdateStatusMap) { | ||
| return taskUpdateStatusMap.entrySet().stream() | ||
| .collect(Collectors.toMap(Map.Entry::getKey, | ||
| entry -> AlgorithmTaskUpdateStatusResult.fromResponse(entry.getValue()))); | ||
| } | ||
|
|
||
| private static AlgorithmTaskUpdateStatusResult fromResponse(AlgorithmTaskUpdateStatus status) { | ||
| if (status == null) { | ||
| return AlgorithmTaskUpdateStatusResult.builder() | ||
| .isUpdating(false) | ||
| .updatedAt(null) | ||
| .build(); | ||
| } | ||
| return AlgorithmTaskUpdateStatusResult.builder() | ||
| .isUpdating(status.isUpdating()) | ||
| .updatedAt(status.statusUpdatedAt()) | ||
| .build(); | ||
| } | ||
| } |
Oops, something went wrong.