Skip to content

[FIX] 기관 문제집에 문제 추가 시 오류 해결 #457 #460

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

[FIX] 기관 문제집에 문제 추가 시 오류 해결 #457 #460

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
18 changes: 11 additions & 7 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 @@ -88,14 +88,18 @@ private void addWorkbookProblem(Workbook workbook, CreateWorkbookProblemRequest
*/
public void deleteWorkbookProblem(Long workbookId, Integer problemNumber) {
Workbook workbook = coreWorkbookService.findById(workbookId);
DetailWeekResponse currentWeek = detailWeekRepository.getCurrentWeek();
if (workbook.getStudy().getEndYN() || // 종료된 스터디 삭제 불가
!(workbook.getWeek().getId().equals(currentWeek.getWeekId()) // 현재 주차의 문제집이면서
&& !DateUtils.isWeekend(LocalDate.now()) // 주말이 아니면서
&& !workbook.getStudy().getEndYN() // 진행 중이면 삭제 가능

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

workbookProblemRepository.deleteByWorkbookAndProblemNumber(workbook, problemNumber);
}
Expand Down
Loading