Merge pull request #41 from Modo-Library/feature/loginAndRegister_NM-10

[FEAT] Account Delete API (NM-128)

Author: hwanld

src/docs/asciidoc/users.adoc

@@ -41,6 +41,13 @@ operation::Users-changeLocation[snippets='http-request,request-headers,path-para
 [[Users-logout]]
 == Users-logout
 
-* AccessToken을 header로 담아서 요청만 보내주시면 되고, responseBody는 비어있는 채로 200번 응답이 온다면 성공적으로 logout이 완료된 것 입니다##.##
+* AccessToken을 header로 담아서 요청만 보내주시면 되고, responseBody는 비어있는 채로 200번 응답이 온다면 성공적으로 logout이 완료된 것 입니다.
 
-operation::Users-logout[snippets='http-request,request-headers,http-response']
+operation::Users-logout[snippets='http-request,request-headers,http-response']
+
+[[Users-delete]]
+== Users-delete
+
+* logout과 마찬가지로 responseBody가 비어있는 채로 200번 응답이 온다면 성공적으로 delete(회원탈퇴)가 완료된 것 입니다.
+
+operation::Users-delete[snippets='http-request,request-headers,http-response']

src/main/java/modo/controller/UsersController.java

@@ -59,4 +59,10 @@ public ResponseEntity<?> logout(@RequestHeader(value = "token") String token) {
         return sendResponse();
     }
 
+    @DeleteMapping("api/v1/users/delete")
+    public ResponseEntity<?> delete(@RequestHeader(value = "token") String token) {
+        usersService.delete(token);
+        return sendResponse();
+    }
+
 }

src/main/java/modo/service/UsersService.java

@@ -12,9 +12,7 @@
 import modo.domain.entity.Users;
 import modo.domain.entity.UsersHistory;
 import modo.domain.entity.UsersReview;
-import modo.repository.UsersHistoryRepository;
-import modo.repository.UsersRepository;
-import modo.repository.UsersReviewRepository;
+import modo.repository.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -27,6 +25,10 @@ public class UsersService {
     private final UsersHistoryRepository usersHistoryRepository;
     private final UsersReviewRepository usersReviewRepository;
     private final JwtTokenProvider jwtTokenProvider;
+    private final ChatRoomsRepository chatRoomsRepository;
+    private final LikesRepository likesRepository;
+    private final UsersBooksHistoryRepository usersBooksHistoryRepository;
+    private final BooksRepository booksRepository;
 
     @Transactional
     public UsersResponseDto save(UsersSaveRequestDto usersSaveRequestDto) {
@@ -160,6 +162,35 @@ public void logout(String accessToken) {
         jwtTokenProvider.expireAllToken(usersId);
     }
 
+    @Transactional
+    public void delete(String token) {
+        logout(token);
+        String usersId = jwtTokenProvider.getUsersId(token);
+        Users users = findUsersInRepository(usersId);
+        usersRepository.delete(users);
+//        users.getChatRoomsList().stream()
+//                .forEach(each -> {
+//                    chatRoomsRepository.delete(each);
+//                });
+//        users.getBooksList().stream()
+//                .forEach((each -> {
+//                    booksRepository.delete(each);
+//                }));
+//        users.getUsersBooksHistoryList().stream()
+//                .forEach((each -> {
+//                    usersBooksHistoryRepository.delete(each);
+//                }));
+//        users.getLikesList().stream()
+//                .forEach((each -> {
+//                    likesRepository.delete(each);
+//                }));
+//        users.getUsersReviewList().stream()
+//                .forEach((each -> {
+//                    usersReviewRepository.delete(each);
+//                }));
+//        usersHistoryRepository.delete(users.getUsersHistory());
+    }
+
     private Users findUsersInRepository(String usersId) {
         return usersRepository.findById(usersId).orElseThrow(
                 () -> new IllegalArgumentException("Users with id : " + usersId + " is not exist")

src/test/java/modo/Books/BooksServiceTest.java

@@ -360,7 +360,7 @@ void injectRepositoryToUsersService() {
     }
 
 
-    private void saveTestBooksAndPicturesList() {
+    void saveTestBooksAndPicturesList() {
         PicturesSaveRequestDto requestDto1 = PicturesSaveRequestDto.builder()
                 .imgUrl(testImgUrl + "1")
                 .filename(testFilename + "1")

src/test/java/modo/users/UsersIntegrationTest.java

@@ -439,6 +439,34 @@ void tearDown() {
         assertThat(refreshTokenRepository.findById(testUsersId)).isEmpty();
     }
 
+    @Test
+    void Integration_회원탈퇴_테스트() throws Exception {
+        // Save Users First
+        mockMvc.perform(post("/api/v2/users/save")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(testUsersSaveRequestDto))
+                )
+                .andExpect(status().isOk());
+
+        accessToken = jwtTokenProvider.createAccessToken(testUsersId);
+
+        mockMvc.perform(delete("/api/v1/users/delete")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .header("token", accessToken)
+                )
+                .andExpect(status().isOk())
+                .andDo(document("Users-delete",
+                        Preprocessors.preprocessRequest(Preprocessors.prettyPrint()),
+                        Preprocessors.preprocessResponse(Preprocessors.prettyPrint()),
+                        requestHeaders(
+                                headerWithName("token").description("Access Token value")
+                        )))
+                .andDo(print());
+
+        assertThat(usersRepository.findById(testUsersId)).isEmpty();
+        assertThat(usersHistoryRepository.findById(testUsersId)).isEmpty();
+    }
+
 
     static final String testUsersId = "testUsersId";
     static final String testNickname = "testNickname";

src/test/java/modo/users/UsersServiceTest.java

@@ -25,6 +25,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
 
 @DataJpaTest
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
@@ -48,10 +50,16 @@ public class UsersServiceTest {
     PicturesRepository picturesRepository;
 
     @Autowired
-    private ChatRoomsRepository chatRoomsRepository;
+    ChatRoomsRepository chatRoomsRepository;
 
     @Autowired
-    private ChatMessagesRepository chatMessagesRepository;
+    ChatMessagesRepository chatMessagesRepository;
+
+    @Autowired
+    LikesRepository likesRepository;
+
+    @Autowired
+    UsersBooksHistoryRepository usersBooksHistoryRepository;
 
 
     @Mock
@@ -71,7 +79,7 @@ void tearDown() {
 
     @BeforeEach
     void injectRepositoryToUsersService() {
-        usersService = new UsersService(usersRepository, usersHistoryRepository, usersReviewRepository, jwtTokenProvider);
+        usersService = new UsersService(usersRepository, usersHistoryRepository, usersReviewRepository, jwtTokenProvider, chatRoomsRepository, likesRepository, usersBooksHistoryRepository, booksRepository);
     }
 
     @Test
@@ -532,6 +540,19 @@ void injectRepositoryToUsersService() {
         assertThat(result).isEqualTo(testUsersId);
     }
 
+    @Test
+    void Service_회원탈퇴_테스트() {
+        UsersResponseDto resultResponseDto = usersService.save(testUsersSaveRequestDto);
+
+        when(jwtTokenProvider.getUsersId(any())).thenReturn(testUsersId);
+
+        usersService.delete("DummyTokenValue");
+
+        assertThat(usersRepository.findAll().size()).isEqualTo(0);
+        assertThat(usersReviewRepository.findAll().size()).isEqualTo(0);
+        assertThat(usersHistoryRepository.findAll().size()).isEqualTo(0);
+    }
+
     static final String testUsersId = "testUsersId";
     static final String testNickname = "testNickname";
     static final String testSub = "testSub";