refactor: 기수 시스템을 모집일정에 통합함에 따라 멤버의 기수 코드 수정 후 코드 정리 && 회원가입 시 선택적으로 기수를 입력받고 값이 없을경우, 현재 모집일정의 기수를 기입하게 수정 (DASOMBE-16)

Author: junjinyun

src/main/java/dmu/dasom/api/domain/member/dto/SignupRequestDto.java

@@ -22,6 +22,10 @@ public class SignupRequestDto {
     @Schema(description = "비밀번호", example = "password", minLength = 8, maxLength = 128)
     private String password;
 
+    @Length(max = 4)
+    @Schema(description = "기수 (선택)", example = "34기", nullable = true)
+    private String generation;
+
     public Member toEntity(final String password, final String generation) {
         return Member.builder()
                 .email(this.email)

src/main/java/dmu/dasom/api/domain/member/entity/Member.java

@@ -34,6 +34,6 @@ public class Member extends BaseEntity {
     private Role role = Role.ROLE_MEMBER;
 
     // 기수 정보를 저장할 필드 추가
-    @Column(name = "generation", length = 16, nullable = false)
+    @Column(name = "generation", length = 4, nullable = false)
     private String generation;
 }

src/main/java/dmu/dasom/api/domain/member/service/MemberServiceImpl.java

@@ -2,13 +2,13 @@
 
 import dmu.dasom.api.domain.common.exception.CustomException;
 import dmu.dasom.api.domain.common.exception.ErrorCode;
+import dmu.dasom.api.domain.recruit.service.RecruitService;
 import dmu.dasom.api.domain.member.dto.SignupRequestDto;
 import dmu.dasom.api.domain.member.entity.Member;
 import dmu.dasom.api.domain.member.repository.MemberRepository;
 import dmu.dasom.api.global.auth.dto.TokenBox;
 import dmu.dasom.api.global.auth.jwt.JwtUtil;
 import dmu.dasom.api.global.auth.userdetails.UserDetailsImpl;
-import dmu.dasom.api.global.generation.service.GenerationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -25,8 +25,8 @@ public class MemberServiceImpl implements MemberService {
 
     private final BCryptPasswordEncoder encoder;
     private final MemberRepository memberRepository;
+    private final RecruitService recruitService;
     private final JwtUtil jwtUtil;
-    private final GenerationService generationService;
 
     // 이메일로 사용자 조회
     @Override
@@ -47,10 +47,13 @@ public void signUp(final SignupRequestDto request) {
         // 이미 가입된 이메일인지 확인
         if (checkByEmail(request.getEmail()))
             throw new CustomException(ErrorCode.SIGNUP_FAILED);
+        //기수는 선택적으로 가져오며, 없을 경우 신입 부붠 처리하여, 모집일정의 기수 사용
+        String generation = (request.getGeneration() != null && !request.getGeneration().isEmpty())
+                ? request.getGeneration()
+                : recruitService.getCurrentGeneration();
 
-        String currentGeneration = generationService.getCurrentGeneration();
-        // 비밀번호 암호화 후 저장 + 기수도 현재 기수로 자동 기입
-        memberRepository.save(request.toEntity(encoder.encode(request.getPassword()), currentGeneration));
+        // 비밀번호 암호화 후 저장, 기수도 같이 기입
+        memberRepository.save(request.toEntity(encoder.encode(request.getPassword()), generation));
     }
 
     // 토큰 갱신

src/test/java/dmu/dasom/api/domain/member/MemberServiceTest.java

@@ -6,14 +6,15 @@
 import dmu.dasom.api.domain.member.entity.Member;
 import dmu.dasom.api.domain.member.repository.MemberRepository;
 import dmu.dasom.api.domain.member.service.MemberServiceImpl;
-import dmu.dasom.api.global.generation.service.GenerationService;
+import dmu.dasom.api.domain.recruit.service.RecruitService;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import java.util.Optional;
 
@@ -30,7 +31,7 @@ class MemberServiceTest {
     MemberRepository memberRepository;
 
     @Mock
-    private GenerationService generationService;
+    RecruitService recruitService; // RecruitService 주입
 
     @InjectMocks
     private MemberServiceImpl memberService;
@@ -96,24 +97,49 @@ void checkByEmail_false() {
         assertFalse(result);
     }
 
+
     @Test
-    @DisplayName("회원가입 - 성공")
-    void signUp_success() {
-        // given
-        SignupRequestDto request = mock(SignupRequestDto.class);
-        when(request.getEmail()).thenReturn("[email protected]");
-        when(request.getPassword()).thenReturn("password");
+    @DisplayName("회원가입 - 기수 선택값 전달 시 사용")
+    void signUp_withGenerationProvided() {
+        // 실제 DTO 객체 사용
+        SignupRequestDto request = new SignupRequestDto();
+        // Reflection 또는 생성자/Setter로 값 설정
+        ReflectionTestUtils.setField(request, "email", "[email protected]");
+        ReflectionTestUtils.setField(request, "password", "password");
+        ReflectionTestUtils.setField(request, "generation", "35기");
+
         when(encoder.encode("password")).thenReturn("encodedPassword");
         when(memberRepository.existsByEmail("[email protected]")).thenReturn(false);
-        when(generationService.getCurrentGeneration()).thenReturn("34기");
-        // when
+
         memberService.signUp(request);
 
-        // then
-        verify(memberRepository, times(1)).save(any());
-        verify(generationService, times(1)).getCurrentGeneration();
+        verify(memberRepository, times(1)).save(argThat(member ->
+                "35기".equals(member.getGeneration())
+        ));
+        verify(recruitService, never()).getCurrentGeneration();
+    }
+
+    @Test
+    @DisplayName("회원가입 - 기수 선택값 없으면 기본값 사용")
+    void signUp_withGenerationDefault() {
+        SignupRequestDto request = new SignupRequestDto();
+        ReflectionTestUtils.setField(request, "email", "[email protected]");
+        ReflectionTestUtils.setField(request, "password", "password");
+        ReflectionTestUtils.setField(request, "generation", null);
+
+        when(encoder.encode("password")).thenReturn("encodedPassword");
+        when(memberRepository.existsByEmail("[email protected]")).thenReturn(false);
+        when(recruitService.getCurrentGeneration()).thenReturn("34기");
+
+        memberService.signUp(request);
+
+        verify(memberRepository, times(1)).save(argThat(member ->
+                "34기".equals(member.getGeneration())
+        ));
+        verify(recruitService, times(1)).getCurrentGeneration();
     }
 
+
     @Test
     @DisplayName("회원가입 - 실패")
     void signUp_fail() {