Skip to content

Commit 3e966da

Browse files
authored
refactor/KD-66 : SubmissionType 표시용 라벨 수정 (#321)
* refactor/KD-66 : SubmissionType 표시용 라벨 수정 * refactor/KD-66 : 졸논/중간 보고서/최종 보고서 네이밍 통일화
1 parent 6997afd commit 3e966da

File tree

10 files changed

+17
-17
lines changed

10 files changed

+17
-17
lines changed

aics-admin/src/main/java/kgu/developers/admin/graduationUser/presentation/response/GraduationUserStatusResponse.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ record Thesis(
5757
@Schema(description = "졸업 타입", example = "THESIS")
5858
String type,
5959

60-
@Schema(description = "중간 논문 상태")
60+
@Schema(description = "중간 보고서 상태")
6161
Middle midThesis,
6262

63-
@Schema(description = "최종 논문 상태")
63+
@Schema(description = "최종 보고서 상태")
6464
Final finalThesis
6565
) implements GraduationUserStatusResponse {
6666
public static Thesis of(GraduationType type, Middle midThesis, Final finalThesis) {
@@ -72,7 +72,7 @@ public static Thesis of(GraduationType type, Middle midThesis, Final finalThesis
7272
}
7373

7474
@Builder
75-
@Schema(description = "중간 논문 제출 상태")
75+
@Schema(description = "중간 보고서 제출 상태")
7676
public record Middle(
7777
@Schema(description = "파일 제출 여부", example = "true")
7878
boolean submitted,
@@ -99,7 +99,7 @@ public static Middle of(boolean submitted, Long thesisId, boolean approval, Loca
9999
}
100100

101101
@Builder
102-
@Schema(description = "최종 논문 제출 상태")
102+
@Schema(description = "최종 보고서 제출 상태")
103103
public record Final(
104104
@Schema(description = "파일 제출 여부", example = "false")
105105
boolean submitted,

aics-admin/src/testFixtures/java/schedule/application/ScheduleAdminFacadeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void createSchedule_Success() {
6060
// given
6161
ScheduleCreateRequest request = ScheduleCreateRequest.builder()
6262
.submissionType(MIDTHESIS)
63-
.content("중간 논문 본문")
63+
.content("중간보고서 본문")
6464
.startDate(DEFAULT_START_DATE.plusMonths(1))
6565
.endDate(DEFAULT_END_DATE.plusMonths(1))
6666
.build();

aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleListResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public record ScheduleListResponse(
1515
example = """
1616
[{
1717
"id": 1,
18-
"submissionType": "중간논문",
18+
"submissionType": "중간보고서",
1919
"startDate": "2025-05-01",
2020
"endDate": "2025-12-31",
2121
"status": "진행 중"

aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleSummaryResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public record ScheduleSummaryResponse(
1515
@Schema(description = "일정 id", example = "1", requiredMode = REQUIRED)
1616
Long id,
1717

18-
@Schema(description = "제출 유형", example = "중간논문", requiredMode = REQUIRED)
18+
@Schema(description = "제출 유형", example = "중간보고서", requiredMode = REQUIRED)
1919
String submissionType,
2020

2121
@Schema(description = "시작일", example = "2025-05-01", requiredMode = REQUIRED)

aics-api/src/main/java/kgu/developers/api/schedule/presentation/response/ScheduleTypeContentResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
@Builder
1010
public record ScheduleTypeContentResponse(
11-
@Schema(description = "제출 유형", example = "중간논문", requiredMode = REQUIRED)
11+
@Schema(description = "제출 유형", example = "중간보고서", requiredMode = REQUIRED)
1212
String submissionType,
1313

1414
@Schema(description = "일정 본문 내용", example = "매학기 개강 후 2주 이내에 신청서를 작성하여 접수해야 합니다.",requiredMode = REQUIRED)

aics-api/src/main/resources/db/data.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ VALUES
145145
INSERT INTO schedule (submission_type, content, start_date, end_date, created_at, updated_at)
146146
VALUES ('SUBMITTED', '학부생 졸업 논문 신청을 접수합니다.', '2025-02-24 09:00:00', '2025-03-10 18:00:00',
147147
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
148-
('MIDTHESIS', '중간 논문 제출 및 심사 기간입니다.', '2025-04-01 09:00:00', '2025-04-12 18:00:00',
148+
('MIDTHESIS', '중간 보고서 제출 및 심사 기간입니다.', '2025-04-01 09:00:00', '2025-04-12 18:00:00',
149149
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
150-
('FINALTHESIS', '최종 논문 제출 및 심사 기간입니다.', '2025-05-20 09:00:00', '2025-06-05 18:00:00',
150+
('FINALTHESIS', '최종 보고서 제출 및 심사 기간입니다.', '2025-05-20 09:00:00', '2025-06-05 18:00:00',
151151
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
152152
('CERTIFICATE', '취득한 자격증 제출 및 심사 기간입니다.', '2025-03-15 09:00:00', '2025-03-29 18:00:00',
153153
CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),

aics-domain/src/main/java/kgu/developers/domain/graduationUser/application/query/GraduationUserQueryService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ private String determineStage(GraduationUser user) {
6565

6666
if (user.getGraduationType() == GraduationType.THESIS) {
6767
if (user.getMidThesisId() == null) {
68-
return "중간 논문 미제출";
68+
return "중간 보고서 미제출";
6969
}
7070
if (user.getFinalThesisId() == null) {
71-
return "최종 논문 미제출";
71+
return "최종 보고서 미제출";
7272
}
73-
return "최종 논문 제출";
73+
return "최종 보고서 제출";
7474
}
7575
else if (user.getGraduationType() == GraduationType.CERTIFICATE) {
7676
if (user.getCertificateId() == null) {

aics-domain/src/main/java/kgu/developers/domain/graduationUser/domain/GraduationType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@Getter
77
@RequiredArgsConstructor
88
public enum GraduationType {
9-
THESIS("보고서"),
9+
THESIS("논문"),
1010
CERTIFICATE("자격증"),
1111
;
1212

aics-domain/src/main/java/kgu/developers/domain/schedule/domain/SubmissionType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
@RequiredArgsConstructor
88
public enum SubmissionType {
99
SUBMITTED("신청접수"),
10-
MIDTHESIS("중간논문"),
11-
FINALTHESIS("최종논문"),
10+
MIDTHESIS("중간보고서"),
11+
FINALTHESIS("최종보고서"),
1212
CERTIFICATE("자격증"),
1313
APPROVED("최종 통과"),
1414
OTHER("기타")

aics-domain/src/testFixtures/java/schedule/application/ScheduleQueryServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void init(){
3737
fakeScheduleRepository.save(
3838
Schedule.create(
3939
SubmissionType.MIDTHESIS,
40-
"중간 논문",
40+
"중간보고서",
4141
baseStart.plusDays(7),
4242
baseStart.plusDays(10)
4343
)

0 commit comments

Comments
 (0)