유저 탈퇴시 정상적으로 데이터 삭제되지 않는 버그 개선 / 구조 개선 / 테스트 코드 추가 / 일부 authentication 처리 로직 개선

src/main/java/com/yapp/artie/domain/archive/domain/category/Category.java

@@ -35,7 +35,7 @@ public class Category extends BaseEntity {
   @Column(nullable = false)
   private String name;
 
-  @OneToMany(mappedBy = "category", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToMany(mappedBy = "category", cascade = CascadeType.REMOVE)
   List<Exhibit> exhibits = new ArrayList<>();
 
   @Column(nullable = false, name = "seq")

src/main/java/com/yapp/artie/domain/archive/domain/exhibit/Exhibit.java

@@ -44,7 +44,7 @@ public class Exhibit extends BaseEntity {
   @JoinColumn(name = "category_id", nullable = false)
   private Category category;
 
-  @OneToMany(mappedBy = "exhibit", cascade = CascadeType.ALL, orphanRemoval = true)
+  @OneToMany(mappedBy = "exhibit", cascade = CascadeType.REMOVE)
   List<Artwork> artworks = new ArrayList<>();
 
   @Embedded

src/main/java/com/yapp/artie/domain/archive/repository/CategoryRepository.java

@@ -27,5 +27,8 @@ public interface CategoryRepository extends JpaRepository<Category, Long> {
   int countCategoriesByUser(@Param("user") User user);
 
   List<Category> findCategoriesByUserOrderBySequence(User user);
+
+  @Modifying(clearAutomatically = true)
+  void deleteAllByUser(User user);
 }
 

src/main/java/com/yapp/artie/domain/user/controller/UserController.java

@@ -71,8 +71,8 @@ public ResponseEntity<CreateUserResponseDto> register(
   })
   @GetMapping("/me")
   public ResponseEntity<User> me(Authentication authentication) {
-    // Long userId = Long.parseLong(authentication.getName());
-    Long userId = 1L;
+
+    Long userId = Long.parseLong(authentication.getName());
     User user = userService.findById(userId);
 
     return ResponseEntity.ok().body(user);
@@ -85,11 +85,11 @@ public ResponseEntity<User> me(Authentication authentication) {
           description = "유저가 성공적으로 삭제됨",
           content = @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseEntity.class))),
   })
-  @DeleteMapping("/")
+  @DeleteMapping()
   public ResponseEntity<? extends HttpEntity> deleteUser(Authentication authentication) {
-    // Long userId = Long.parseLong(authentication.getName());
-    Long userId = 1L;
-    userService.delete(userId, jwtService);
+
+    Long userId = getUserId(authentication);
+    userService.delete(userId);
     return ResponseEntity.noContent().build();
   }
 
@@ -102,8 +102,8 @@ public ResponseEntity<? extends HttpEntity> deleteUser(Authentication authentica
   })
   @GetMapping("/my-page")
   public ResponseEntity<UserThumbnailResponseDto> my(Authentication authentication) {
-    // Long userId = Long.parseLong(authentication.getName());
-    Long userId = 1L;
+
+    Long userId = getUserId(authentication);
     return ResponseEntity.ok().body(userThumbnailService.getUserThumbnail(userId));
   }
 

src/main/java/com/yapp/artie/domain/user/domain/User.java

@@ -35,4 +35,13 @@ public static User create(String uid, String name, String picture) {
     user.setProfileImage(picture);
     return user;
   }
+
+  public static User create(Long id, String uid, String name, String profileImage) {
+    User user = new User();
+    user.id = id;
+    user.uid = uid;
+    user.name = name;
+    user.profileImage = profileImage;
+    return user;
+  }
 }

src/main/java/com/yapp/artie/domain/user/service/UserService.java

@@ -2,6 +2,7 @@
 
 import static org.springframework.security.core.userdetails.User.builder;
 
+import com.yapp.artie.domain.archive.repository.CategoryRepository;
 import com.yapp.artie.domain.user.domain.User;
 import com.yapp.artie.domain.user.dto.response.CreateUserResponseDto;
 import com.yapp.artie.domain.user.exception.UserNotFoundException;
@@ -20,6 +21,8 @@
 public class UserService implements UserDetailsService {
 
   private final UserRepository userRepository;
+  private final CategoryRepository categoryRepository;
+  private final JwtService jwtService;
 
   public Optional<User> findByUid(String uid) {
     return userRepository.findByUid(uid);
@@ -42,10 +45,12 @@ public CreateUserResponseDto register(String uid, String username, String pictur
   }
 
   @Transactional
-  public void delete(Long id, JwtService jwtService) {
+  public void delete(Long id) {
     User user = findById(id);
     jwtService.withdraw(user.getUid());
-    userRepository.deleteById(id);
+
+    categoryRepository.deleteAllByUser(user);
+    userRepository.delete(user);
   }
 
   @Override

src/main/java/com/yapp/artie/global/exception/response/ErrorCode.java

@@ -22,7 +22,7 @@ public enum ErrorCode {
   FIREBASE_INVALID_TOKEN(401, "F004", "JWT 토큰 파싱에 실패했습니다."),
   FIREBASE_REVOKED_TOKEN(401, "F005", "취소된 토큰입니다."),
   FIREBASE_NOT_FOUND_USER(404, "F006", "존재하지 않는 파이어베이스 사용자입니다."),
-  FIREBASE_INVALID_UID(401, "F007", "유요하지 않은 파이어베이스 식별자입니다."),
+  FIREBASE_INVALID_UID(401, "F007", "유효하지 않은 파이어베이스 식별자입니다."),
 
   // User
   USER_NOT_FOUND(404, "U001", "회원을 찾을 수 없습니다."),

src/test/java/com/yapp/artie/BaseIntegrationTest.java

@@ -0,0 +1,21 @@
+package com.yapp.artie;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Disabled;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.transaction.annotation.Transactional;
+
+@SpringBootTest
+@Disabled
+@AutoConfigureMockMvc
+@Transactional
+public class BaseIntegrationTest {
+
+  @Autowired
+  protected MockMvc mvc;
+  @Autowired
+  protected ObjectMapper objectMapper;
+}

src/test/java/com/yapp/artie/domain/archive/repository/CategoryRepositoryTest.java

@@ -0,0 +1,64 @@
+package com.yapp.artie.domain.archive.repository;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.yapp.artie.domain.archive.domain.artwork.Artwork;
+import com.yapp.artie.domain.archive.domain.category.Category;
+import com.yapp.artie.domain.archive.domain.exhibit.Exhibit;
+import com.yapp.artie.domain.archive.domain.tag.Tag;
+import com.yapp.artie.domain.user.domain.User;
+import com.yapp.artie.domain.user.domain.UserTest;
+import com.yapp.artie.domain.user.repository.UserRepository;
+import java.time.LocalDate;
+import javax.persistence.EntityManager;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+
+@DataJpaTest
+@AutoConfigureTestDatabase(replace = Replace.NONE)
+public class CategoryRepositoryTest {
+
+  @Autowired
+  EntityManager em;
+
+  @Autowired
+  UserRepository userRepository;
+
+  @Autowired
+  CategoryRepository categoryRepository;
+
+  @Autowired
+  ExhibitRepository exhibitRepository;
+
+  @Autowired
+  ArtworkRepository artworkRepository;
+
+  @Autowired
+  TagRepository tagRepository;
+
+  @Test
+  @DisplayName("유저 기반 카테고리 삭제 - 카테고리가 삭제되면 해당하는 전시, 작품, 태그도 삭제되어야합니다")
+  void deleteAllByUser() {
+    User user = userRepository.save(UserTest.TEST_SAVED_USER);
+    Category category = categoryRepository.save(Category.create(user, "category-name", 1));
+    Exhibit exhibit = exhibitRepository.save(
+        Exhibit.create("exhibit-name", LocalDate.now(), category, user, "exhibit-link"));
+    Artwork artwork = artworkRepository.save(Artwork.create(exhibit, true, "artwork-uri"));
+    Tag tag = tagRepository.save(new Tag(user, artwork, 1, "tag-name"));
+    em.flush();
+    em.clear();
+
+    categoryRepository.deleteAllByUser(user);
+    em.flush();
+
+    assertThat(userRepository.findById(user.getId()).isPresent()).isTrue();
+    assertThat(categoryRepository.findById(category.getId()).isPresent()).isFalse();
+    assertThat(exhibitRepository.findById(exhibit.getId()).isPresent()).isFalse();
+    assertThat(artworkRepository.findById(artwork.getId()).isPresent()).isFalse();
+    assertThat(tagRepository.findById(tag.getId()).isPresent()).isFalse();
+  }
+}

src/test/java/com/yapp/artie/domain/archive/service/CategoryServiceTest.java

@@ -3,8 +3,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.yapp.artie.domain.archive.domain.artwork.Artwork;
 import com.yapp.artie.domain.archive.domain.category.Category;
 import com.yapp.artie.domain.archive.domain.exhibit.Exhibit;
+import com.yapp.artie.domain.archive.domain.tag.Tag;
 import com.yapp.artie.domain.archive.dto.cateogry.CategoryDto;
 import com.yapp.artie.domain.archive.dto.cateogry.CreateCategoryRequestDto;
 import com.yapp.artie.domain.archive.dto.cateogry.UpdateCategoryRequestDto;
@@ -13,8 +15,10 @@
 import com.yapp.artie.domain.archive.exception.ChangeCategoryWrongLengthException;
 import com.yapp.artie.domain.archive.exception.ExceededCategoryCountException;
 import com.yapp.artie.domain.archive.exception.NotOwnerOfCategoryException;
+import com.yapp.artie.domain.archive.repository.ArtworkRepository;
 import com.yapp.artie.domain.archive.repository.CategoryRepository;
 import com.yapp.artie.domain.archive.repository.ExhibitRepository;
+import com.yapp.artie.domain.archive.repository.TagRepository;
 import com.yapp.artie.domain.user.domain.User;
 import com.yapp.artie.domain.user.repository.UserRepository;
 import java.time.LocalDate;
@@ -52,6 +56,12 @@ class CategoryServiceTest {
   @Autowired
   ExhibitRepository exhibitRepository;
 
+  @Autowired
+  ArtworkRepository artworkRepository;
+
+  @Autowired
+  TagRepository tagRepository;
+
   @Autowired
   CategoryService categoryService;
 
@@ -165,6 +175,25 @@ private Category findCategory(Long id) {
     assertThat(Optional.ofNullable(findCategory(created))).isNotPresent();
   }
 
+  @Test
+  public void delete_카테고리를_삭제하면_전시데이터도_삭제된다() throws Exception {
+    User user = findUser("1");
+    Long created = createCategory(user, "test");
+    Exhibit exhibit = exhibitRepository.save(
+        Exhibit.create("test", LocalDate.now(), findCategory(created), user, "link"));
+    Artwork artwork = artworkRepository.save(Artwork.create(exhibit, true, "url"));
+    Tag tag = tagRepository.save(new Tag(user, artwork, 1, "tagName"));
+    em.clear();
+
+    categoryService.delete(created, user.getId());
+    em.flush();
+
+    assertThat(Optional.ofNullable(findCategory(created))).isNotPresent();
+    assertThat(exhibitRepository.findById(exhibit.getId()).isEmpty()).isTrue();
+    assertThat(artworkRepository.findById(artwork.getId()).isEmpty()).isTrue();
+    assertThat(tagRepository.findById(tag.getId()).isEmpty()).isTrue();
+  }
+
   @Test
   public void delete_존재하지_않는_카테고리를_삭제하면_예외를_발생한다() throws Exception {
     assertThatThrownBy(() -> {

src/test/java/com/yapp/artie/domain/user/controller/UserControllerTest.java

@@ -0,0 +1,78 @@
+package com.yapp.artie.domain.user.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doNothing;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import com.yapp.artie.BaseIntegrationTest;
+import com.yapp.artie.domain.archive.domain.artwork.Artwork;
+import com.yapp.artie.domain.archive.domain.category.Category;
+import com.yapp.artie.domain.archive.domain.exhibit.Exhibit;
+import com.yapp.artie.domain.archive.domain.tag.Tag;
+import com.yapp.artie.domain.archive.repository.ArtworkRepository;
+import com.yapp.artie.domain.archive.repository.CategoryRepository;
+import com.yapp.artie.domain.archive.repository.ExhibitRepository;
+import com.yapp.artie.domain.archive.repository.TagRepository;
+import com.yapp.artie.domain.user.domain.User;
+import com.yapp.artie.domain.user.domain.UserTest;
+import com.yapp.artie.domain.user.repository.UserRepository;
+import com.yapp.artie.global.authentication.JwtServiceImpl;
+import java.time.LocalDate;
+import javax.persistence.EntityManager;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+class UserControllerTest extends BaseIntegrationTest {
+
+  @Autowired
+  EntityManager em;
+
+  @Autowired
+  UserRepository userRepository;
+
+  @Autowired
+  CategoryRepository categoryRepository;
+
+  @Autowired
+  ExhibitRepository exhibitRepository;
+
+  @Autowired
+  ArtworkRepository artworkRepository;
+
+  @Autowired
+  TagRepository tagRepository;
+
+  @MockBean
+  JwtServiceImpl jwtService;
+
+  // TODO : 헤더 토큰 ( Authentication ) 모킹 필요. 현재는 getUserId 메소드에 의존하고 있음
+  @Test
+  @DisplayName("유저 삭제(탈퇴) API - 유저 데이터가 삭제되면 해당 유저의 카테고리, 전시, 작품, 태그 데이터가 함께 삭제되어야합니다.")
+  public void deleteUser() throws Exception {
+    User user = userRepository.save(UserTest.TEST_SAVED_USER);
+    Category category = categoryRepository.save(Category.create(user, "category-name", 1));
+    Exhibit exhibit = exhibitRepository.save(
+        Exhibit.create("exhibit-name", LocalDate.now(), category, user, "exhibit-link"));
+    Artwork artwork = artworkRepository.save(Artwork.create(exhibit, true, "artwork-uri"));
+    Tag tag = tagRepository.save(new Tag(user, artwork, 1, "tag-name"));
+    em.clear();
+
+    doNothing().when(jwtService).withdraw(anyString());
+
+    mvc.perform(delete("/user"))
+        .andExpect(status().isNoContent())
+        .andDo(print());
+
+    em.flush();
+    assertThat(userRepository.findById(user.getId()).isPresent()).isFalse();
+    assertThat(categoryRepository.findById(category.getId()).isPresent()).isFalse();
+    assertThat(exhibitRepository.findById(exhibit.getId()).isPresent()).isFalse();
+    assertThat(artworkRepository.findById(artwork.getId()).isPresent()).isFalse();
+    assertThat(tagRepository.findById(tag.getId()).isPresent()).isFalse();
+  }
+}

src/test/java/com/yapp/artie/domain/user/domain/UserTest.java

@@ -0,0 +1,11 @@
+package com.yapp.artie.domain.user.domain;
+
+import org.junit.jupiter.api.DisplayName;
+
+@DisplayName("User 테스트")
+public class UserTest {
+
+  public static final User TEST_USER = User.create("test-uid", "test-name", "test-profile");
+  public static final User TEST_SAVED_USER = User.create(1L, "test-uid", "test-name",
+      "test-profile");
+}

src/test/java/com/yapp/artie/domain/user/repository/UserRepositoryTest.java

@@ -0,0 +1,37 @@
+package com.yapp.artie.domain.user.repository;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.yapp.artie.domain.user.domain.User;
+import com.yapp.artie.domain.user.domain.UserTest;
+import javax.persistence.EntityManager;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+
+@DataJpaTest
+@AutoConfigureTestDatabase(replace = Replace.NONE)
+public class UserRepositoryTest {
+
+  @Autowired
+  EntityManager em;
+
+  @Autowired
+  UserRepository userRepository;
+
+  @Test
+  @DisplayName("유저 삭제")
+  void delete() {
+    User user = userRepository.save(UserTest.TEST_SAVED_USER);
+    em.clear();
+
+    userRepository.delete(user);
+    em.flush();
+
+    assertThat(userRepository.findById(user.getId()).isPresent()).isFalse();
+  }
+
+}