refactor: 모집일정의 조회, 수정 부분에 기수 반영 및 테스트코드에 반영하고 기수 조회, 수정 코드 하단에 추가 (DASOMBE-16)

Author: junjinyun

src/main/java/dmu/dasom/api/domain/recruit/entity/Recruit.java

@@ -37,7 +37,19 @@ public void updateTime(final LocalTime time) {
         this.value = time.format(TIME_FORMATTER);
     }
 
+
+    // 기수 업데이트
+    public void updateGeneration(final String generation) {
+        this.value = generation; // ex. "34기"
+    }
+
     public RecruitConfigResponseDto toResponse() {
+        if(this.key == ConfigKey.GENERATION){
+            return RecruitConfigResponseDto.builder()
+                    .key(key)
+                    .value(value)
+                    .build();
+        }
         LocalDateTime dateTime = LocalDateTime.parse(this.value, DATE_TIME_FORMATTER);
         return RecruitConfigResponseDto.builder()
             .key(key)

src/main/java/dmu/dasom/api/domain/recruit/service/RecruitServiceImpl.java

@@ -8,6 +8,7 @@
 import dmu.dasom.api.domain.recruit.enums.ConfigKey;
 import dmu.dasom.api.domain.recruit.enums.ResultCheckType;
 import dmu.dasom.api.domain.recruit.repository.RecruitRepository;
+import dmu.dasom.api.global.generation.service.GenerationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,14 +25,26 @@
 public class RecruitServiceImpl implements RecruitService {
 
     private final RecruitRepository recruitRepository;
+    private final GenerationService generationService;
 
     // 모집 일정 설정 조회
     @Override
     public List<RecruitConfigResponseDto> getRecruitSchedule() {
         return findAll().stream()
-            .map(config -> config.getKey() == ConfigKey.INTERVIEW_TIME_START || config.getKey() == ConfigKey.INTERVIEW_TIME_END
-                ? config.toTimeResponse() : config.toResponse())
-            .toList();
+                .map(config -> {
+                    if(config.getKey() == ConfigKey.GENERATION) { //기수 조회 추가
+                        String currentGeneration = generationService.getCurrentGeneration();
+                        return RecruitConfigResponseDto.builder()
+                                .key(ConfigKey.GENERATION)
+                                .value(currentGeneration)
+                                .build();
+                    } else if(config.getKey() == ConfigKey.INTERVIEW_TIME_START || config.getKey() == ConfigKey.INTERVIEW_TIME_END) {
+                        return config.toTimeResponse();
+                    } else {
+                        return config.toResponse();
+                    }
+                })
+                .toList();
     }
 
     // 모집 일정 설정 수정
@@ -45,9 +58,13 @@ public void modifyRecruitSchedule(final RecruitScheduleModifyRequestDto request)
             config.updateTime(time);
             return;
         }
-
-        final LocalDateTime dateTime = parseDateTimeFormat(request.getValue());
-        config.updateDateTime(dateTime);
+        else {
+            final LocalDateTime dateTime = parseDateTimeFormat(request.getValue());
+            config.updateDateTime(dateTime);
+        }
+        final Recruit generationConfig = findByKey(ConfigKey.GENERATION);
+        String currentGeneration = generationService.getCurrentGeneration();
+        generationConfig.updateGeneration(currentGeneration);
     }
 
     // 모집 기간 여부 확인

src/test/java/dmu/dasom/api/domain/recruit/RecruitServiceTest.java

@@ -17,6 +17,7 @@
 import dmu.dasom.api.domain.recruit.enums.ResultCheckType;
 import dmu.dasom.api.domain.recruit.repository.RecruitRepository;
 import dmu.dasom.api.domain.recruit.service.RecruitServiceImpl;
+import dmu.dasom.api.global.generation.service.GenerationService;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -33,7 +34,6 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.mock;
 
 @ExtendWith(MockitoExtension.class)
 class RecruitServiceTest {
@@ -47,6 +47,9 @@ class RecruitServiceTest {
     @Mock
     private InterviewServiceImpl interviewService;
 
+    @Mock
+    private GenerationService generationService;
+
     @InjectMocks
     private RecruitServiceImpl recruitService;
 
@@ -56,32 +59,42 @@ void getRecruitSchedule() {
         // given
         Recruit recruit1 = mock(Recruit.class);
         Recruit recruit2 = mock(Recruit.class);
-        when(recruitRepository.findAll()).thenReturn(List.of(recruit1, recruit2));
+        Recruit recruit3 = mock(Recruit.class);
+        when(recruitRepository.findAll()).thenReturn(List.of(recruit1, recruit2, recruit3));
+        when(recruit1.getKey()).thenReturn(ConfigKey.RECRUITMENT_PERIOD_START);
+        when(recruit2.getKey()).thenReturn(ConfigKey.RECRUITMENT_PERIOD_END);
+        when(recruit3.getKey()).thenReturn(ConfigKey.GENERATION);
+        when(generationService.getCurrentGeneration()).thenReturn("34기");
 
         // when
         List<RecruitConfigResponseDto> schedule = recruitService.getRecruitSchedule();
 
         // then
         assertNotNull(schedule);
-        assertEquals(2, schedule.size());
+        assertEquals(3, schedule.size());
         verify(recruitRepository, times(1)).findAll();
+        verify(generationService, times(1)).getCurrentGeneration();
     }
 
     @Test
     @DisplayName("모집 일정 수정 - 성공")
     void modifyRecruitSchedule_success() {
         // given
         Recruit recruit = mock(Recruit.class);
+        Recruit generationRecruit = mock(Recruit.class);
         RecruitScheduleModifyRequestDto request = mock(RecruitScheduleModifyRequestDto.class);
         when(request.getKey()).thenReturn(ConfigKey.RECRUITMENT_PERIOD_START);
         when(request.getValue()).thenReturn("2025-01-02T12:00:00");
         when(recruitRepository.findByKey(ConfigKey.RECRUITMENT_PERIOD_START)).thenReturn(Optional.of(recruit));
+        when(recruitRepository.findByKey(ConfigKey.GENERATION)).thenReturn(Optional.of(generationRecruit));
+        when(generationService.getCurrentGeneration()).thenReturn("34기");
 
         // when
         recruitService.modifyRecruitSchedule(request);
 
         // then
         verify(recruit, times(1)).updateDateTime(LocalDateTime.of(2025, 1, 2, 12, 0, 0));
+        verify(generationRecruit, times(1)).updateGeneration("34기");
     }
 
     @Test
@@ -196,4 +209,42 @@ void reserveInterviewSlot_fail_alreadyReserved() {
         assertEquals(ErrorCode.ALREADY_RESERVED, exception.getErrorCode());
     }
 
-}
+    @Test
+    @DisplayName("기수 정보 조회")
+    void getGenerationInfo() {
+        // given
+        Recruit generationRecruit = mock(Recruit.class);
+        when(recruitRepository.findAll()).thenReturn(List.of(generationRecruit));
+        when(generationRecruit.getKey()).thenReturn(ConfigKey.GENERATION);
+        when(generationService.getCurrentGeneration()).thenReturn("34기");
+
+        // when
+        List<RecruitConfigResponseDto> schedule = recruitService.getRecruitSchedule();
+        boolean generationFound = schedule.stream()
+                .anyMatch(dto -> dto.getKey() == ConfigKey.GENERATION);
+
+        // then
+        assertTrue(generationFound);
+        verify(generationService, times(1)).getCurrentGeneration();
+    }
+
+    @Test
+    @DisplayName("기수 정보 수정")
+    void modifyGenerationInfo() {
+        // given
+        Recruit generationRecruit = mock(Recruit.class);
+        RecruitScheduleModifyRequestDto request = mock(RecruitScheduleModifyRequestDto.class);
+        when(request.getKey()).thenReturn(ConfigKey.RECRUITMENT_PERIOD_START);
+        when(request.getValue()).thenReturn("2025-01-02T12:00:00");
+        when(recruitRepository.findByKey(ConfigKey.RECRUITMENT_PERIOD_START)).thenReturn(Optional.of(mock(Recruit.class)));
+        when(recruitRepository.findByKey(ConfigKey.GENERATION)).thenReturn(Optional.of(generationRecruit));
+        when(generationService.getCurrentGeneration()).thenReturn("34기");
+
+        // when
+        recruitService.modifyRecruitSchedule(request);
+
+        // then
+        verify(generationRecruit, times(1)).updateGeneration("34기");
+    }
+
+}