Skip to content

v1.7.6 #459

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
engus525 merged 1 commit into from
May 27, 2025
Merged

v1.7.6 #459

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
17 changes: 14 additions & 3 deletions module-admin/src/main/java/org/example/domain/workbook/service/CreateWorkbookService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,26 @@ public void deleteWorkbook(Long workbookId) {
*/
public void createWorkbookProblem(Long workbookId, CreateWorkbookProblemRequest request) {
Workbook workbook = coreWorkbookService.findById(workbookId);
// 기관 문제집
if (workbook.getStudy() == null) {
addWorkbookProblem(workbook, request);
return;
}

// 정규 스터디 문제집
DetailWeekResponse currentWeek = detailWeekRepository.getCurrentWeek();
if (workbook.getStudy().getEndYN() || // 종료된 스터디 수정 불가
!(workbook.getWeek().getId().equals(currentWeek.getWeekId()) // 현재 주차의 문제집이면서
&& !DateUtils.isWeekend(LocalDate.now()) // 주말이 아니면서
&& !workbook.getStudy().getEndYN() // 진행 중이면 수정 가능
!(workbook.getWeek().getId().equals(currentWeek.getWeekId()) // 현재 주차의 문제집 &
&& !DateUtils.isWeekend(LocalDate.now()) // 평일 &
&& !workbook.getStudy().getEndYN() // 스터디 진행 중
)
)
throw new GeneralException(ErrorStatus.NOTICE_BAD_REQUEST, "스터디원에게 공개된 문제는 수정할 수 없습니다.");

addWorkbookProblem(workbook, request);
}

private void addWorkbookProblem(Workbook workbook, CreateWorkbookProblemRequest request) {
Problem problem = coreProblemService.findByNumber(request.number());
if (workbookProblemRepository.findByWorkbookAndProblem(workbook, problem).isPresent()) {
throw new GeneralException(ErrorStatus.NOTICE_BAD_REQUEST, "이미 문제집에 포함된 문제입니다.");
Expand Down
Loading