refactor: 멤버 엔티티에 기수 추가 및 회원가입 시 GenerationService의 값을 읽어 자동으로 기수 기입하게 구현 및 테스트 코드에 반영 (DASOMBE-16)

Author: junjinyun

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

@@ -22,10 +22,11 @@ public class SignupRequestDto {
     @Schema(description = "비밀번호", example = "password", minLength = 8, maxLength = 128)
     private String password;
 
-    public Member toEntity(final String password) {
+    public Member toEntity(final String password, final String generation) {
         return Member.builder()
                 .email(this.email)
                 .password(password)
+                .generation(generation)
                 .build();
     }
 }

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

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

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

@@ -8,6 +8,7 @@
 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,6 +26,7 @@ public class MemberServiceImpl implements MemberService {
     private final BCryptPasswordEncoder encoder;
     private final MemberRepository memberRepository;
     private final JwtUtil jwtUtil;
+    private final GenerationService generationService;
 
     // 이메일로 사용자 조회
     @Override
@@ -46,8 +48,9 @@ public void signUp(final SignupRequestDto request) {
         if (checkByEmail(request.getEmail()))
             throw new CustomException(ErrorCode.SIGNUP_FAILED);
 
-        // 비밀번호 암호화 후 저장
-        memberRepository.save(request.toEntity(encoder.encode(request.getPassword())));
+        String currentGeneration = generationService.getCurrentGeneration();
+        // 비밀번호 암호화 후 저장 + 기수도 현재 기수로 자동 기입
+        memberRepository.save(request.toEntity(encoder.encode(request.getPassword()), currentGeneration));
     }
 
     // 토큰 갱신

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

@@ -6,6 +6,7 @@
 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 org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -28,6 +29,9 @@ class MemberServiceTest {
     @Mock
     MemberRepository memberRepository;
 
+    @Mock
+    private GenerationService generationService;
+
     @InjectMocks
     private MemberServiceImpl memberService;
 
@@ -101,12 +105,13 @@ void signUp_success() {
         when(request.getPassword()).thenReturn("password");
         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();
     }
 
     @Test