diff --git a/aics-admin/src/main/java/kgu/developers/admin/graduationUser/presentation/response/GraduationUserStatusResponse.java b/aics-admin/src/main/java/kgu/developers/admin/graduationUser/presentation/response/GraduationUserStatusResponse.java index 6df7c720..c6f38368 100644 --- a/aics-admin/src/main/java/kgu/developers/admin/graduationUser/presentation/response/GraduationUserStatusResponse.java +++ b/aics-admin/src/main/java/kgu/developers/admin/graduationUser/presentation/response/GraduationUserStatusResponse.java @@ -57,10 +57,10 @@ record Thesis( @Schema(description = "졸업 타입", example = "THESIS") String type, - @Schema(description = "중간 논문 상태") + @Schema(description = "중간 보고서 상태") Middle midThesis, - @Schema(description = "최종 논문 상태") + @Schema(description = "최종 보고서 상태") Final finalThesis ) implements GraduationUserStatusResponse { public static Thesis of(GraduationType type, Middle midThesis, Final finalThesis) { @@ -72,7 +72,7 @@ public static Thesis of(GraduationType type, Middle midThesis, Final finalThesis } @Builder - @Schema(description = "중간 논문 제출 상태") + @Schema(description = "중간 보고서 제출 상태") public record Middle( @Schema(description = "파일 제출 여부", example = "true") boolean submitted, @@ -99,7 +99,7 @@ public static Middle of(boolean submitted, Long thesisId, boolean approval, Loca } @Builder - @Schema(description = "최종 논문 제출 상태") + @Schema(description = "최종 보고서 제출 상태") public record Final( @Schema(description = "파일 제출 여부", example = "false") boolean submitted, diff --git a/aics-admin/src/testFixtures/java/schedule/application/ScheduleAdminFacadeTest.java b/aics-admin/src/testFixtures/java/schedule/application/ScheduleAdminFacadeTest.java index ad7bb3d5..7c95e12d 100644 --- a/aics-admin/src/testFixtures/java/schedule/application/ScheduleAdminFacadeTest.java +++ b/aics-admin/src/testFixtures/java/schedule/application/ScheduleAdminFacadeTest.java @@ -60,7 +60,7 @@ void createSchedule_Success() { // given ScheduleCreateRequest request = ScheduleCreateRequest.builder() .submissionType(MIDTHESIS) - .content("중간 논문 본문") + .content("중간보고서 본문") .startDate(DEFAULT_START_DATE.plusMonths(1)) .endDate(DEFAULT_END_DATE.plusMonths(1)) .build(); diff --git a/aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleListResponse.java b/aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleListResponse.java index 61561236..81c5e697 100644 --- a/aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleListResponse.java +++ b/aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleListResponse.java @@ -15,7 +15,7 @@ public record ScheduleListResponse( example = """ [{ "id": 1, - "submissionType": "중간논문", + "submissionType": "중간보고서", "startDate": "2025-05-01", "endDate": "2025-12-31", "status": "진행 중" diff --git a/aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleSummaryResponse.java b/aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleSummaryResponse.java index 200b758a..35f5c78e 100644 --- a/aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleSummaryResponse.java +++ b/aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleSummaryResponse.java @@ -15,7 +15,7 @@ public record ScheduleSummaryResponse( @Schema(description = "일정 id", example = "1", requiredMode = REQUIRED) Long id, - @Schema(description = "제출 유형", example = "중간논문", requiredMode = REQUIRED) + @Schema(description = "제출 유형", example = "중간보고서", requiredMode = REQUIRED) String submissionType, @Schema(description = "시작일", example = "2025-05-01", requiredMode = REQUIRED) diff --git a/aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleTypeContentResponse.java b/aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleTypeContentResponse.java index 51e96df1..bd69437f 100644 --- a/aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleTypeContentResponse.java +++ b/aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleTypeContentResponse.java @@ -8,7 +8,7 @@ @Builder public record ScheduleTypeContentResponse( - @Schema(description = "제출 유형", example = "중간논문", requiredMode = REQUIRED) + @Schema(description = "제출 유형", example = "중간보고서", requiredMode = REQUIRED) String submissionType, @Schema(description = "일정 본문 내용", example = "매학기 개강 후 2주 이내에 신청서를 작성하여 접수해야 합니다.",requiredMode = REQUIRED) diff --git a/aics-api/src/main/resources/db/data.sql b/aics-api/src/main/resources/db/data.sql index 8373368c..b18d980c 100644 --- a/aics-api/src/main/resources/db/data.sql +++ b/aics-api/src/main/resources/db/data.sql @@ -145,9 +145,9 @@ VALUES INSERT INTO schedule (submission_type, content, start_date, end_date, created_at, updated_at) VALUES ('SUBMITTED', '학부생 졸업 논문 신청을 접수합니다.', '2025-02-24 09:00:00', '2025-03-10 18:00:00', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), - ('MIDTHESIS', '중간 논문 제출 및 심사 기간입니다.', '2025-04-01 09:00:00', '2025-04-12 18:00:00', + ('MIDTHESIS', '중간 보고서 제출 및 심사 기간입니다.', '2025-04-01 09:00:00', '2025-04-12 18:00:00', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), - ('FINALTHESIS', '최종 논문 제출 및 심사 기간입니다.', '2025-05-20 09:00:00', '2025-06-05 18:00:00', + ('FINALTHESIS', '최종 보고서 제출 및 심사 기간입니다.', '2025-05-20 09:00:00', '2025-06-05 18:00:00', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), ('CERTIFICATE', '취득한 자격증 제출 및 심사 기간입니다.', '2025-03-15 09:00:00', '2025-03-29 18:00:00', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), diff --git a/aics-domain/src/main/java/kgu/developers/domain/graduationUser/application/query/GraduationUserQueryService.java b/aics-domain/src/main/java/kgu/developers/domain/graduationUser/application/query/GraduationUserQueryService.java index 77cbd1d0..bd95fd49 100644 --- a/aics-domain/src/main/java/kgu/developers/domain/graduationUser/application/query/GraduationUserQueryService.java +++ b/aics-domain/src/main/java/kgu/developers/domain/graduationUser/application/query/GraduationUserQueryService.java @@ -65,12 +65,12 @@ private String determineStage(GraduationUser user) { if (user.getGraduationType() == GraduationType.THESIS) { if (user.getMidThesisId() == null) { - return "중간 논문 미제출"; + return "중간 보고서 미제출"; } if (user.getFinalThesisId() == null) { - return "최종 논문 미제출"; + return "최종 보고서 미제출"; } - return "최종 논문 제출"; + return "최종 보고서 제출"; } else if (user.getGraduationType() == GraduationType.CERTIFICATE) { if (user.getCertificateId() == null) { diff --git a/aics-domain/src/main/java/kgu/developers/domain/graduationUser/domain/GraduationType.java b/aics-domain/src/main/java/kgu/developers/domain/graduationUser/domain/GraduationType.java index 851b1445..7bbebd45 100644 --- a/aics-domain/src/main/java/kgu/developers/domain/graduationUser/domain/GraduationType.java +++ b/aics-domain/src/main/java/kgu/developers/domain/graduationUser/domain/GraduationType.java @@ -6,7 +6,7 @@ @Getter @RequiredArgsConstructor public enum GraduationType { - THESIS("보고서"), + THESIS("논문"), CERTIFICATE("자격증"), ; diff --git a/aics-domain/src/main/java/kgu/developers/domain/schedule/domain/SubmissionType.java b/aics-domain/src/main/java/kgu/developers/domain/schedule/domain/SubmissionType.java index c079e96f..5ace431e 100644 --- a/aics-domain/src/main/java/kgu/developers/domain/schedule/domain/SubmissionType.java +++ b/aics-domain/src/main/java/kgu/developers/domain/schedule/domain/SubmissionType.java @@ -7,8 +7,8 @@ @RequiredArgsConstructor public enum SubmissionType { SUBMITTED("신청접수"), - MIDTHESIS("중간논문"), - FINALTHESIS("최종논문"), + MIDTHESIS("중간보고서"), + FINALTHESIS("최종보고서"), CERTIFICATE("자격증"), APPROVED("최종 통과"), OTHER("기타") diff --git a/aics-domain/src/testFixtures/java/schedule/application/ScheduleQueryServiceTest.java b/aics-domain/src/testFixtures/java/schedule/application/ScheduleQueryServiceTest.java index c0f499c6..0ec4227e 100644 --- a/aics-domain/src/testFixtures/java/schedule/application/ScheduleQueryServiceTest.java +++ b/aics-domain/src/testFixtures/java/schedule/application/ScheduleQueryServiceTest.java @@ -37,7 +37,7 @@ void init(){ fakeScheduleRepository.save( Schedule.create( SubmissionType.MIDTHESIS, - "중간 논문", + "중간보고서", baseStart.plusDays(7), baseStart.plusDays(10) )