Skip to content
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

Jump to bottom

feat: 과제 마감날짜 유효성 검사 로직 수정 #759

Merged
merged 4 commits into from
Sep 4, 2024
Merged

feat: 과제 마감날짜 유효성 검사 로직 수정 #759

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
268a128
feat: 기존 커리큘럼의 시작날짜로 검증하는 것으로 변경
AlmondBreez3 Sep 4, 2024
ecc211c
feat: 불필요한 수정 삭제
AlmondBreez3 Sep 4, 2024
5b256d2
feat: 검증 조건 추가
AlmondBreez3 Sep 4, 2024
8b63077
feat: 코드 중복도 낮추기
AlmondBreez3 Sep 4, 2024
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
6 changes: 3 additions & 3 deletions src/main/java/com/gdschongik/gdsc/domain/study/domain/StudyDetailValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public void validateCancelStudyAssignment(Member member, StudyDetail studyDetail
public void validatePublishStudyAssignment(
Member member, StudyDetail studyDetail, AssignmentCreateUpdateRequest request) {
validateStudyMentorAuthorization(member, studyDetail);
validateDeadLine(request.deadLine());
validateDeadLine(request.deadLine(), studyDetail.getPeriod().getStartDate());
}

// 해당 스터디의 멘토가 아니라면 스터디에 대한 권한이 없다.
Expand All @@ -29,8 +29,8 @@ private void validateStudyMentorAuthorization(Member member, StudyDetail studyDe
}
}

private void validateDeadLine(LocalDateTime deadline) {
if (deadline.isBefore(LocalDateTime.now())) {
private void validateDeadLine(LocalDateTime deadline, LocalDateTime curriculumStartDate) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

StudyDetail이 가진 Curriculum에 startAt이 따로 있습니다.
변수명 수정해주셔야 할 것 같습니다

if (deadline.isBefore(curriculumStartDate)) {
throw new CustomException(ASSIGNMENT_DEADLINE_INVALID);
}
}
Expand Down