refactor: 기수 시스템을 모집일정에 통합 && 코드 정리 및 통합

junjinyun · junjinyun · commit 744a6e9e4cfe · 2025-08-28T19:03:24.000+09:00
diff --git a/src/main/java/dmu/dasom/api/domain/recruit/service/RecruitService.java b/src/main/java/dmu/dasom/api/domain/recruit/service/RecruitService.java
@@ -15,6 +15,10 @@ public interface RecruitService {
 
     void modifyRecruitSchedule(final RecruitScheduleModifyRequestDto requestDto);
 
+    void modifyGeneration(String newGeneration);
+
+    String getCurrentGeneration();
+
     String generateReservationCode(String studentNo, String contactLastDigits);
 
     LocalDateTime getResultAnnouncementSchedule(ResultCheckType type);
diff --git a/src/main/java/dmu/dasom/api/domain/recruit/service/RecruitServiceImpl.java b/src/main/java/dmu/dasom/api/domain/recruit/service/RecruitServiceImpl.java
@@ -8,7 +8,6 @@
 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;
@@ -25,25 +24,13 @@
 public class RecruitServiceImpl implements RecruitService {
 
     private final RecruitRepository recruitRepository;
-    private final GenerationService generationService;
 
-    // 모집 일정 설정 조회
+    // 모집 설정 조회
     @Override
     public List<RecruitConfigResponseDto> getRecruitSchedule() {
         return findAll().stream()
-                .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();
-                    }
-                })
+                .map(config -> config.getKey() == ConfigKey.INTERVIEW_TIME_START || config.getKey() == ConfigKey.INTERVIEW_TIME_END
+                        ? config.toTimeResponse() : config.toResponse())
                 .toList();
     }
 
@@ -58,15 +45,25 @@ public void modifyRecruitSchedule(final RecruitScheduleModifyRequestDto request)
             config.updateTime(time);
             return;
         }
-        else {
-            final LocalDateTime dateTime = parseDateTimeFormat(request.getValue());
-            config.updateDateTime(dateTime);
-        }
-        final Recruit generationConfig = findByKey(ConfigKey.GENERATION);
-        String currentGeneration = generationService.getCurrentGeneration();
-        generationConfig.updateGeneration(currentGeneration);
+
+        final LocalDateTime dateTime = parseDateTimeFormat(request.getValue());
+        config.updateDateTime(dateTime);
     }
 
+
+    //기수 수정
+    @Override
+    @Transactional
+    public void modifyGeneration(String newGeneration) {
+        final Recruit config = findByKey(ConfigKey.GENERATION);
+        config.updateGeneration(newGeneration);
+    }
+    // 기수 조회
+    @Override
+    public String getCurrentGeneration() {
+        Recruit generationConfig = findByKey(ConfigKey.GENERATION);
+        return generationConfig.getValue();
+    }
     // 모집 기간 여부 확인
     @Override
     public boolean isRecruitmentActive() {
diff --git a/src/main/java/dmu/dasom/api/global/admin/controller/AdminRecruitController.java b/src/main/java/dmu/dasom/api/global/admin/controller/AdminRecruitController.java
@@ -57,6 +57,19 @@ public ResponseEntity<Void> modifyRecruitSchedule(@Valid @RequestBody final Recr
             .build();
     }
 
+    @Operation(summary = "모집 기수 변경")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "모집 기수 수정 성공"),
+            @ApiResponse(responseCode = "400", description = "잘못된 요청")
+    })
+    @PatchMapping("/generation")
+    public ResponseEntity<Void> modifyGeneration(@Valid @RequestBody String request) {
+        recruitService.modifyGeneration(request);
+        return ResponseEntity.ok()
+                .build();
+    }
+
+
     @Operation(summary = "면접 일정 생성", description = "새로운 면접 일정을 생성합니다.")
     @ApiResponses(value = {
         @ApiResponse(responseCode = "200", description = "면접 일정 생성 성공"),
diff --git a/src/test/java/dmu/dasom/api/domain/recruit/RecruitServiceTest.java b/src/test/java/dmu/dasom/api/domain/recruit/RecruitServiceTest.java
@@ -17,7 +17,6 @@
 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;
@@ -47,9 +46,6 @@ class RecruitServiceTest {
     @Mock
     private InterviewServiceImpl interviewService;
 
-    @Mock
-    private GenerationService generationService;
-
     @InjectMocks
     private RecruitServiceImpl recruitService;
 
@@ -59,42 +55,32 @@ void getRecruitSchedule() {
         // given
         Recruit recruit1 = mock(Recruit.class);
         Recruit recruit2 = mock(Recruit.class);
-        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(recruitRepository.findAll()).thenReturn(List.of(recruit1, recruit2));
 
         // when
         List<RecruitConfigResponseDto> schedule = recruitService.getRecruitSchedule();
 
         // then
         assertNotNull(schedule);
-        assertEquals(3, schedule.size());
+        assertEquals(2, 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
@@ -115,6 +101,36 @@ void modifyRecruitSchedule_fail() {
         assertEquals(ErrorCode.INVALID_TIME_FORMAT, exception.getErrorCode());
     }
 
+    @Test
+    @DisplayName("모집 기수 수정")
+    void modifyGeneration_success() {
+        // given
+        Recruit generationRecruit = mock(Recruit.class);
+        String newGeneration = "35기";
+        when(recruitRepository.findByKey(ConfigKey.GENERATION)).thenReturn(Optional.of(generationRecruit));
+
+        // when
+        recruitService.modifyGeneration(newGeneration);
+
+        // then
+        verify(generationRecruit, times(1)).updateGeneration(newGeneration);
+    }
+
+    @Test
+    @DisplayName("기수 조회")
+    void getCurrentGeneration_success() {
+        // given
+        Recruit generationRecruit = mock(Recruit.class);
+        when(recruitRepository.findByKey(ConfigKey.GENERATION)).thenReturn(Optional.of(generationRecruit));
+        when(generationRecruit.getValue()).thenReturn("34기");
+        // when
+        String currentGeneration = recruitService.getCurrentGeneration();
+        // then
+        assertEquals("34기", currentGeneration);
+        verify(recruitRepository, times(1)).findByKey(ConfigKey.GENERATION);
+        verify(generationRecruit, times(1)).getValue();
+    }
+
     @Test
     @DisplayName("면접 일정 생성 - 성공")
     void createInterviewSlots_success() {
@@ -209,42 +225,5 @@ 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기");
-    }
 
-}
+}
