refactor: Request와 Response에서의 GraduationDate 필드를 LocalDate에서 YearMonth 타입으로 변경 (#296)

Author: JangYeongHu

aics-admin/src/main/java/kgu/developers/admin/graduationUser/presentation/request/GraduationUserBatchCreateRequest.java

@@ -17,7 +17,7 @@ public record GraduationUserBatchCreateRequest(
             + "\"advisorProfessor\": \"김교수\", "
             + "\"capstoneCompletion\": \"true\", "
             + "\"department\": \"컴퓨터공학전공\", "
-            + "\"graduationDate\": \"2028-02-01\"}]",
+            + "\"graduationDate\": \"2028-02\"}]",
         requiredMode = REQUIRED)
     @NotEmpty
     List<GraduationUserCreateRequest> graduationUsers

aics-admin/src/main/java/kgu/developers/admin/graduationUser/presentation/request/GraduationUserCreateRequest.java

@@ -6,7 +6,7 @@
 import jakarta.validation.constraints.Size;
 import lombok.Builder;
 
-import java.time.LocalDate;
+import java.time.YearMonth;
 
 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
 
@@ -35,8 +35,8 @@ public record GraduationUserCreateRequest(
     @Size(max = 10)
     String department,
 
-    @Schema(description = "졸업일", example = "2028-02-01", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "졸업일", example = "2028-02", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull
-    LocalDate graduationDate
+    YearMonth graduationDate
 ) {
 }

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

@@ -20,8 +20,8 @@ public record GraduationUserDetailResponse(
     @Schema(description = "학번(교번)", example = "202412345", requiredMode = REQUIRED)
     String studentId,
 
-    @Schema(description = "졸업 날짜", example = "2028-08-01", requiredMode = REQUIRED)
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Schema(description = "졸업 날짜", example = "2028-08", requiredMode = REQUIRED)
+    @DateTimeFormat(pattern = "yyyy-MM")
     String graduationDate,
 
     @Schema(description = "지도교수", example = "김교수", requiredMode = REQUIRED)
@@ -36,7 +36,7 @@ public record GraduationUserDetailResponse(
     public static GraduationUserDetailResponse from(
         GraduationUser graduationUser
     ) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
         return GraduationUserDetailResponse.builder()
             .graduationUserId(graduationUser.getId())
             .name(graduationUser.getName())

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

@@ -15,7 +15,7 @@ public record GraduationUserSummaryPageResponse<T>(
                         + "\"id\": 3, "
                         + "\"studentId\": \"202211456\", "
                         + "\"name\": \"홍길동\", "
-                        + "\"graduationDate\": \"2028-08-01\", "
+                        + "\"graduationDate\": \"2028-08\", "
                         + "\"graduationType\": \"자격증\", "
                         + "\"status\": {"
                         + "\"type\": \"CERTIFICATE\", "
@@ -25,7 +25,7 @@ public record GraduationUserSummaryPageResponse<T>(
                         + "\"id\": 4, "
                         + "\"studentId\": \"202211457\", "
                         + "\"name\": \"김철수\", "
-                        + "\"graduationDate\": \"2028-08-01\", "
+                        + "\"graduationDate\": \"2028-08\", "
                         + "\"graduationType\": \"논문\", "
                         + "\"status\": {"
                         + "\"type\": \"THESIS\", "

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

@@ -20,8 +20,8 @@ public record GraduationUserSummaryResponse(
     @Schema(description = "졸업 대상자 이름", example = "홍길동", requiredMode = REQUIRED)
     String name,
 
-    @Schema(description = "졸업 날짜", example = "2028-08-01", requiredMode = REQUIRED)
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Schema(description = "졸업 날짜", example = "2028-08", requiredMode = REQUIRED)
+    @DateTimeFormat(pattern = "yyyy-MM")
     String graduationDate,
 
     @Schema(description = "졸업 유형", example = "자격증", requiredMode = REQUIRED)
@@ -45,7 +45,7 @@ public record GraduationUserSummaryResponse(
     GraduationUserStatusResponse status
 ) {
     public static GraduationUserSummaryResponse of(GraduationUser graduationUser, GraduationUserStatusResponse status) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
 
         return GraduationUserSummaryResponse.builder()
             .id(graduationUser.getId())

aics-admin/src/testFixtures/java/graduationUser/application/GraduationUserAdminFacadeTest.java

@@ -42,6 +42,7 @@
 import org.springframework.data.domain.Pageable;
 
 import java.time.LocalDate;
+import java.time.YearMonth;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -140,7 +141,7 @@ public void init() {
             .email("hong1@kyonggi.ac.kr")
             .graduationType(GraduationType.CERTIFICATE)
             .certificateId(1L)
-            .graduationDate(LocalDate.of(2021, 12, 31))
+            .graduationDate(LocalDate.of(2021, 12, 1))
             .build());
 
         graduationUser2 = fakeGraduationUserRepository.save(GraduationUser.builder()
@@ -151,15 +152,15 @@ public void init() {
             .graduationType(GraduationType.THESIS)
             .midThesisId(1L)
             .finalThesisId(2L)
-            .graduationDate(LocalDate.of(2021, 12, 31))
+            .graduationDate(LocalDate.of(2021, 12, 1))
             .build());
 
         fakeGraduationUserRepository.save(GraduationUser.builder()
             .id(3L)
             .name("이지민")
             .userId("202411003")
             .email("jiim1@kyonggi.ac.kr")
-            .graduationDate(LocalDate.of(2021, 12, 31))
+            .graduationDate(LocalDate.of(2021, 12, 1))
             .build());
     }
 
@@ -174,7 +175,7 @@ public void createGraduationUser_Success() {
             .name("홍길순")
             .advisorProfessor("김교수")
             .capstoneCompletion(false)
-            .graduationDate(LocalDate.of(2021, 12, 31))
+            .graduationDate(YearMonth.of(2021, 12))
             .build();
 
         //when
@@ -195,15 +196,15 @@ public void createGraduationUsers_Success() {
                 .studentId("202411346")
                 .name("홍길순")
                 .capstoneCompletion(false)
-                .graduationDate(LocalDate.of(2021, 12, 31))
+                .graduationDate(YearMonth.of(2021, 12))
                 .build();
         requestList.add(requestUser1);
 
         GraduationUserCreateRequest requestUser2 = GraduationUserCreateRequest.builder()
                 .studentId("202411347")
                 .name("홍길동")
                 .capstoneCompletion(true)
-                .graduationDate(LocalDate.of(2028, 12, 31))
+                .graduationDate(YearMonth.of(2028, 12))
                 .build();
         requestList.add(requestUser2);
 

aics-domain/src/main/java/kgu/developers/domain/graduationUser/application/command/GraduationUserCommandService.java

@@ -11,7 +11,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
+import java.time.YearMonth;
 
 @Service
 @Transactional
@@ -20,9 +20,9 @@ public class GraduationUserCommandService {
     private final GraduationUserRepository graduationUserRepository;
     private final UserRepository userRepository;
 
-    public Long createGraduationUser(String studentId, String name, String advisor, Boolean capstoneCompletion, String department, LocalDate graduationDate) {
+    public Long createGraduationUser(String studentId, String name, String advisor, Boolean capstoneCompletion, String department, YearMonth graduationDate) {
         validateId(studentId);
-        GraduationUser graduationUser = GraduationUser.create(studentId,name,advisor,capstoneCompletion,department,graduationDate);
+        GraduationUser graduationUser = GraduationUser.create(studentId,name,advisor,capstoneCompletion,department,graduationDate.atDay(1));
         return graduationUserRepository.save(graduationUser).getId();
     }
 

aics-domain/src/main/java/kgu/developers/domain/graduationUser/infrastructure/excel/GraduationUserExcelRow.java

@@ -3,14 +3,14 @@
 import kgu.developers.domain.graduationUser.domain.GraduationUser;
 import lombok.Builder;
 
-import java.time.LocalDate;
+import java.time.YearMonth;
 
 @Builder
 public record GraduationUserExcelRow(
     String userId,
     String name,
     String department,
-    LocalDate graduationDate,
+    YearMonth graduationDate,
     String graduationType,
     String advisorProfessor,
     String currentStage,
@@ -21,8 +21,8 @@ public static GraduationUserExcelRow from(GraduationUser graduationUser, String
             .userId(graduationUser.getUserId())
             .name(graduationUser.getName())
             .department(graduationUser.getDepartment())
-            .graduationDate(graduationUser.getGraduationDate())
-            .graduationType(graduationUser.getGraduationType().getDescription())
+            .graduationDate(YearMonth.from(graduationUser.getGraduationDate()))
+            .graduationType(graduationUser.getGraduationType()!=null ? graduationUser.getGraduationType().getDescription(): null)
             .advisorProfessor(graduationUser.getAdvisorProfessor())
             .currentStage(stage)
             .approvalStatus(status)

aics-domain/src/testFixtures/java/graduationUser/application/GraduationUserCommandServiceTest.java

@@ -14,6 +14,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
+import java.time.YearMonth;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -59,7 +60,7 @@ public void createGraduationUser_Success() {
         String advisor = "김교수";
         Boolean capstoneCompletion = true;
         String department = "컴퓨터공학과";
-        LocalDate graduationDate = LocalDate.of(2024, 2, 20);
+        YearMonth graduationDate = YearMonth.of(2024, 2);
         //when
         Long createdGraduatoinUserId = graduationUserCommandService.createGraduationUser(TARGET_STUDENT_ID, name, advisor, capstoneCompletion, department, graduationDate);
 
@@ -76,7 +77,7 @@ public void createGraduationUser_DuplicateId_ThrowsException() {
         String advisor = "김교수";
         Boolean capstoneCompletion = true;
         String department = "컴퓨터공학과";
-        LocalDate graduationDate = LocalDate.of(2024, 2, 20);
+        YearMonth graduationDate = YearMonth.of(2024, 2);
         //when
         //then
         assertThatThrownBy(() -> graduationUserCommandService.createGraduationUser(studentId, name, advisor, capstoneCompletion, department, graduationDate))