fix: 탈퇴 시 userTag 삭제

Author: jaelyangChoi

capturecat-core/src/main/java/com/capturecat/core/domain/user/UserTagRepository.java

@@ -3,6 +3,9 @@
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import com.capturecat.core.domain.tag.Tag;
 
@@ -13,4 +16,8 @@ public interface UserTagRepository extends JpaRepository<UserTag, Long>, UserTag
 	boolean existsByUserAndTag(User user, Tag tag);
 
 	long countByUser(User user);
+
+	@Modifying
+	@Query("delete from UserTag ut where ut.user.id = :userId")
+	void deleteAllByUserId(@Param("userId") Long userId);
 }

capturecat-core/src/main/java/com/capturecat/core/service/user/UserService.java

@@ -23,6 +23,7 @@
 import com.capturecat.core.domain.user.UserSettingsRepository;
 import com.capturecat.core.domain.user.UserSocialAccount;
 import com.capturecat.core.domain.user.UserSocialAccountRepository;
+import com.capturecat.core.domain.user.UserTagRepository;
 import com.capturecat.core.service.auth.LoginUser;
 import com.capturecat.core.service.auth.SocialService;
 import com.capturecat.core.service.auth.SocialService.OidcUserPayload;
@@ -37,6 +38,7 @@ public class UserService {
 	private final UserRepository userRepository;
 	private final UserSocialAccountRepository userSocialAccountRepository;
 	private final UserSettingsRepository userSettingsRepository;
+	private final UserTagRepository userTagRepository;
 	private final ImageRepository imageRepository;
 	private final ImageTagRepository imageTagRepository;
 	private final BookmarkRepository bookmarkRepository;
@@ -149,18 +151,22 @@ public UserSettings setUserSettings(String username, boolean enabled) {
 		return setUserSettings(user.getId(), enabled);
 	}
 
+	// TODO: user 관련된 것 삭제할 때 repository를 계속 추가할 순 없다.. 테스트코드가 변경된다. cascade?
 	protected void deleteUserAndRelated(Long userId) {
 		//1. 즐겨찾기 삭제
 		bookmarkRepository.deleteByUserId(userId);
 
-		// 2. 해당 User가 소유한 이미지모두 삭제
+		//2. 해당 User가 소유한 이미지모두 삭제
 		imageTagRepository.deleteAllTagsByUserId(userId);
 		imageRepository.deleteAllImagesByUserId(userId);
 
-		// 3. UserSettings 삭제
+		//3. UserSettings 삭제
 		userSettingsRepository.deleteById(userId);
 
-		// 4. User 삭제 -> social account도 삭제됨
+		//4. UserTag 삭제
+		userTagRepository.deleteAllByUserId(userId);
+
+		//5. User 삭제 -> social account도 삭제됨
 		userRepository.deleteById(userId);
 	}
 

capturecat-core/src/test/java/com/capturecat/core/service/user/UserServiceTest.java

@@ -29,6 +29,7 @@
 import com.capturecat.core.domain.user.UserSettings;
 import com.capturecat.core.domain.user.UserSettingsRepository;
 import com.capturecat.core.domain.user.UserSocialAccountRepository;
+import com.capturecat.core.domain.user.UserTagRepository;
 import com.capturecat.core.service.auth.LoginUser;
 import com.capturecat.core.support.error.CoreException;
 import com.capturecat.core.support.error.ErrorType;
@@ -60,6 +61,9 @@ class UserServiceTest {
 	@Mock
 	private UserSettingsRepository userSettingsRepository;
 
+	@Mock
+	private UserTagRepository userTagRepository;
+
 	@Spy
 	private PasswordEncoder passwordEncoder;
 
@@ -118,6 +122,8 @@ class UserServiceTest {
 		verify(bookmarkRepository).deleteByUserId(savedUser.getId());
 		verify(imageTagRepository).deleteAllTagsByUserId(savedUser.getId());
 		verify(imageRepository).deleteAllImagesByUserId(savedUser.getId());
+		verify(userSettingsRepository).deleteById(savedUser.getId());
+		verify(userTagRepository).deleteAllByUserId(savedUser.getId());
 
 		ArgumentCaptor<Long> captor = ArgumentCaptor.forClass(Long.class);
 		verify(userRepository).deleteById(captor.capture());