feat, hotfix : 회원탈퇴 api 추가 및 redisTemplate 수정 (#170)

* feat, hotfix : 회원탈퇴 api 추가 및 redisTemplate 수정 * feat : 경로 추가
kakao-tech-campus-2nd-step3 · Nov 5, 2024 · 6e35123 · 6e35123
1 parent d0d6329
commit 6e35123
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 18 deletions.
diff --git a/src/main/java/com/example/sinitto/member/controller/MemberController.java b/src/main/java/com/example/sinitto/member/controller/MemberController.java
@@ -44,4 +44,11 @@ public ResponseEntity<Void> memberLogout(@MemberId Long memberId) {
         memberService.memberLogout(memberId);
         return ResponseEntity.ok().build();
     }
+
+    @Operation(summary = "멤버 회원탈퇴", description = "회원 정보를 삭제합니다.")
+    @DeleteMapping("/withdrawal")
+    public ResponseEntity<Void> deleteMember(@MemberId Long memberId) {
+        memberService.deleteMember(memberId);
+        return ResponseEntity.ok().build();
+    }
 }
diff --git a/src/main/java/com/example/sinitto/member/service/MemberService.java b/src/main/java/com/example/sinitto/member/service/MemberService.java
@@ -28,9 +28,9 @@ public class MemberService implements MemberIdProvider {
     private final KakaoApiService kakaoApiService;
     private final KakaoTokenService kakaoTokenService;
     private final PointRepository pointRepository;
-    private final RedisTemplate<String, String> redisTemplate;
+    private final RedisTemplate<String, Object> redisTemplate;
 
-    public MemberService(MemberRepository memberRepository, TokenService tokenService, KakaoApiService kakaoApiService, KakaoTokenService kakaoTokenService, PointRepository pointRepository, RedisTemplate<String, String> redisTemplate) {
+    public MemberService(MemberRepository memberRepository, TokenService tokenService, KakaoApiService kakaoApiService, KakaoTokenService kakaoTokenService, PointRepository pointRepository, RedisTemplate<String, Object> redisTemplate) {
         this.memberRepository = memberRepository;
         this.tokenService = tokenService;
         this.kakaoApiService = kakaoApiService;
@@ -90,10 +90,23 @@ public void memberLogout(Long memberId) {
         Member member = memberRepository.findById(memberId)
                 .orElseThrow(() -> new NotFoundException("id에 해당하는 멤버가 없습니다."));
 
-        String storedRefreshToken = redisTemplate.opsForValue().get(member.getEmail());
+        String storedRefreshToken = (String) redisTemplate.opsForHash().get(member.getEmail(), "refreshToken");
 
         if (storedRefreshToken != null) {
             redisTemplate.delete(member.getEmail());
         }
     }
+
+    public void deleteMember(Long memberId){
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(() -> new NotFoundException("id에 해당하는 멤버가 없습니다."));
+
+        String storedRefreshToken = (String) redisTemplate.opsForHash().get(member.getEmail(), "refreshToken");
+
+        if (storedRefreshToken != null) {
+            redisTemplate.delete(member.getEmail());
+        }
+
+        memberRepository.deleteById(memberId);
+    }
 }
diff --git a/src/test/java/com/example/sinitto/auth/service/TokenServiceTest.java b/src/test/java/com/example/sinitto/auth/service/TokenServiceTest.java
@@ -1,19 +1,14 @@
 package com.example.sinitto.auth.service;
 
-import com.example.sinitto.common.exception.InvalidJwtException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.junit.jupiter.MockitoSettings;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
 
-import javax.crypto.spec.SecretKeySpec;
-import java.security.Key;
 import java.util.Base64;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -22,10 +17,10 @@
 @MockitoSettings
 public class TokenServiceTest {
     @Mock
-    private RedisTemplate<String, String> redisTemplate;
+    private RedisTemplate<String, Object> redisTemplate;
 
     @Mock
-    private ValueOperations<String, String> valueOperations;
+    private HashOperations<String, Object, Object> hashOperations;
 
     private TokenService tokenService;
 
@@ -60,7 +55,7 @@ void generateRefreshTokenTest() {
         //given
         String email = "[email protected]";
 
-        when(redisTemplate.opsForValue()).thenReturn(valueOperations);
+        when(redisTemplate.opsForHash()).thenReturn(hashOperations);
 
         //when
         String token = tokenService.generateRefreshToken(email);

diff --git a/src/test/java/com/example/sinitto/member/service/MemberServiceTest.java b/src/test/java/com/example/sinitto/member/service/MemberServiceTest.java
@@ -13,8 +13,8 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoSettings;
+import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
 
 import java.util.Optional;
 
@@ -31,9 +31,9 @@ public class MemberServiceTest {
     @Mock
     TokenService tokenService;
     @Mock
-    RedisTemplate<String, String> redisTemplate;
+    RedisTemplate<String, Object> redisTemplate;
     @Mock
-    private ValueOperations<String, String> valueOperations;
+    private HashOperations<String, Object, Object> hashOperations;
     @InjectMocks
     MemberService memberService;
 
@@ -61,7 +61,6 @@ void getMemberIdByTokenTestWhenNotInMemberRepository() {
         //given
         String token = "testtoken";
         String email = "[email protected]";
-        Member member = mock(Member.class);
 
         when(tokenService.extractEmailFromAccessToken(token)).thenReturn(email);
         when(memberRepository.findByEmail(email)).thenReturn(Optional.empty());
@@ -110,12 +109,14 @@ void registerNewMemberTestWhenExists() {
     void memberLogoutTest() {
         //given
         Long memberId = 1L;
+        String email = "[email protected]";
         Member member = mock(Member.class);
         String storedRefreshToken = "testRefreshToken";
 
         when(memberRepository.findById(memberId)).thenReturn(Optional.of(member));
-        when(redisTemplate.opsForValue()).thenReturn(valueOperations);
-        when(redisTemplate.opsForValue().get(member.getEmail())).thenReturn(storedRefreshToken);
+        when(member.getEmail()).thenReturn(email);
+        when(redisTemplate.opsForHash()).thenReturn(hashOperations);
+        when(redisTemplate.opsForHash().get(member.getEmail(), "refreshToken")).thenReturn(storedRefreshToken);
         //when
         memberService.memberLogout(memberId);
 
@@ -136,4 +137,25 @@ void memberLogoutTestWhenMemberIsNull() {
         //when, then
         assertThrows(NotFoundException.class, () -> memberService.memberLogout(memberId));
     }
+
+    @Test
+    @DisplayName("deleteMember 메소드 테스트")
+    void deleteMemberTest(){
+        //given
+        Long memberId = 1L;
+        String email = "[email protected]";
+        Member member = mock(Member.class);
+        String storedRefreshToken = "testRefreshToken";
+
+        when(memberRepository.findById(memberId)).thenReturn(Optional.of(member));
+        when(member.getEmail()).thenReturn(email);
+        when(redisTemplate.opsForHash()).thenReturn(hashOperations);
+        when(redisTemplate.opsForHash().get(member.getEmail(), "refreshToken")).thenReturn(storedRefreshToken);
+
+        //when
+        memberService.deleteMember(memberId);
+
+        //when
+        verify(memberRepository, times(1)).deleteById(memberId);
+    }
 }