diff --git a/src/main/java/com/gdschongik/gdsc/domain/study/api/StudentStudyDetailController.java b/src/main/java/com/gdschongik/gdsc/domain/study/api/StudentStudyDetailController.java index 579ba7717..68cba2679 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/study/api/StudentStudyDetailController.java +++ b/src/main/java/com/gdschongik/gdsc/domain/study/api/StudentStudyDetailController.java @@ -46,6 +46,7 @@ public ResponseEntity> getStudyCurriculums( return ResponseEntity.ok(response); } + @Deprecated @Operation(summary = "이번주 제출해야 할 과제 조회", description = "마감 기한이 이번주까지인 과제를 조회합니다.") @GetMapping("/assignments/upcoming") public ResponseEntity> getUpcomingAssignments( diff --git a/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/AssignmentSubmittableDto.java b/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/AssignmentSubmittableDto.java index 037665c40..3fe71fa6b 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/AssignmentSubmittableDto.java +++ b/src/main/java/com/gdschongik/gdsc/domain/study/dto/response/AssignmentSubmittableDto.java @@ -19,7 +19,8 @@ public record AssignmentSubmittableDto( @Nullable @Schema(description = "과제 명세 링크") String descriptionLink, @Nullable @Schema(description = "마감 기한") LocalDateTime deadline, @Nullable @Schema(description = "과제 제출 링크") String submissionLink, - @Nullable @Schema(description = "과제 제출 실패 사유") SubmissionFailureType submissionFailureType) { + @Nullable @Schema(description = "과제 제출 실패 사유") SubmissionFailureType submissionFailureType, + @Nullable @Schema(description = "최종 수정 일시") LocalDateTime committedAt) { public static AssignmentSubmittableDto of(StudyDetail studyDetail, AssignmentHistory assignmentHistory) { Assignment assignment = studyDetail.getAssignment(); @@ -40,12 +41,22 @@ public static AssignmentSubmittableDto of(StudyDetail studyDetail, AssignmentHis assignment.getDescriptionLink(), assignment.getDeadline(), assignmentHistory.getSubmissionLink(), - assignmentHistory.getSubmissionFailureType()); + assignmentHistory.getSubmissionFailureType(), + assignmentHistory.getCommittedAt()); } private static AssignmentSubmittableDto cancelledAssignment(StudyDetail studyDetail, Assignment assignment) { return new AssignmentSubmittableDto( - studyDetail.getId(), assignment.getStatus(), studyDetail.getWeek(), null, null, null, null, null, null); + studyDetail.getId(), + assignment.getStatus(), + studyDetail.getWeek(), + null, + null, + null, + null, + null, + null, + null); } private static AssignmentSubmittableDto beforeAssignmentSubmit(StudyDetail studyDetail, Assignment assignment) { @@ -58,6 +69,7 @@ private static AssignmentSubmittableDto beforeAssignmentSubmit(StudyDetail study assignment.getDescriptionLink(), assignment.getDeadline(), null, + null, null); } }