feat: 유저 태그 삭제 API

Author: leeedohyun

capturecat-core/src/main/java/com/capturecat/core/api/user/UserTagController.java

@@ -1,6 +1,7 @@
 package com.capturecat.core.api.user;
 
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -26,4 +27,25 @@ public ApiResponse<TagResponse> create(@AuthenticationPrincipal LoginUser loginU
 
 		return ApiResponse.success(tagResponse);
 	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	@DeleteMapping
+	public ApiResponse<?> delete(@AuthenticationPrincipal LoginUser loginUser, @RequestParam Long tagId) {
+		userTagService.delete(loginUser, tagId);
+
+		return ApiResponse.success();
+	}
 }

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

@@ -1,11 +1,15 @@
 package com.capturecat.core.domain.user;
 
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import com.capturecat.core.domain.tag.Tag;
 
 public interface UserTagRepository extends JpaRepository<UserTag, Long> {
 
+	Optional<UserTag> findByUserAndTag(User user, Tag tag);
+
 	boolean existsByUserAndTag(User user, Tag tag);
 
 	long countByUser(User user);

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

@@ -9,6 +9,7 @@
 
 import com.capturecat.core.domain.tag.Tag;
 import com.capturecat.core.domain.tag.TagRegister;
+import com.capturecat.core.domain.tag.TagRepository;
 import com.capturecat.core.domain.user.User;
 import com.capturecat.core.domain.user.UserRepository;
 import com.capturecat.core.domain.user.UserTag;
@@ -28,6 +29,7 @@ public class UserTagService {
 	private final UserRepository userRepository;
 	private final UserTagRepository userTagRepository;
 	private final TagRegister tagRegister;
+	private final TagRepository tagRepository;
 
 	@Transactional
 	public TagResponse create(LoginUser loginUser, String tagName) {
@@ -46,6 +48,18 @@ public TagResponse create(LoginUser loginUser, String tagName) {
 		}
 	}
 
+	@Transactional
+	public void delete(LoginUser loginUser, Long tagId) {
+		User user = userRepository.findByUsername(loginUser.getUsername())
+			.orElseThrow(() -> new CoreException(ErrorType.USER_NOT_FOUND));
+		Tag tag = tagRepository.findById(tagId)
+			.orElseThrow(() -> new CoreException(ErrorType.TAG_NOT_FOUND));
+		UserTag userTag = userTagRepository.findByUserAndTag(user, tag)
+			.orElseThrow(() -> new CoreException(ErrorType.USER_TAG_NOT_FOUND));
+
+		userTagRepository.delete(userTag);
+	}
+
 	private void validate(User user, Tag tag) {
 		validateDuplicateUserTag(user, tag);
 		validateUserTagCountLimit(user);

capturecat-core/src/main/java/com/capturecat/core/support/error/ErrorCode.java

@@ -40,7 +40,8 @@ public enum ErrorCode {
 	INTERNAL_SERVER_ERROR("서버에서 오류가 발생했습니다."),
 	INVALID_LOGOUT_AUTH_TOKEN("ACCESS 토큰 또는 REFRESH 토큰이 유효하지 않습니다."),
 	ALREADY_EXISTS_USER_TAG("이미 등록된 유저 태그입니다."),
-	EXCEED_MAX_USER_TAG_COUNT("태그는 한 계정당 최대 30개까지 추가할 수 있어요.");
+	EXCEED_MAX_USER_TAG_COUNT("태그는 한 계정당 최대 30개까지 추가할 수 있어요."),
+	NOT_FOUND_USER_TAG("유저 태그를 찾을 수 없습니다.");
 
 	private final String message;
 

capturecat-core/src/main/java/com/capturecat/core/support/error/ErrorType.java

@@ -45,7 +45,8 @@ public enum ErrorType {
 	MISSING_PARAMETER(HttpStatus.BAD_REQUEST, ErrorCode.MISSING_PARAMETER, LogLevel.WARN),
 	INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, ErrorCode.INTERNAL_SERVER_ERROR, LogLevel.ERROR),
 	USER_TAG_ALREADY_EXISTS(HttpStatus.BAD_REQUEST, ErrorCode.ALREADY_EXISTS_USER_TAG, LogLevel.WARN),
-	TOO_MANY_USER_TAGS(HttpStatus.BAD_REQUEST, ErrorCode.EXCEED_MAX_USER_TAG_COUNT, LogLevel.WARN);
+	TOO_MANY_USER_TAGS(HttpStatus.BAD_REQUEST, ErrorCode.EXCEED_MAX_USER_TAG_COUNT, LogLevel.WARN),
+	USER_TAG_NOT_FOUND(HttpStatus.NOT_FOUND, ErrorCode.NOT_FOUND_USER_TAG, LogLevel.WARN);
 
 	private final HttpStatus status;
 

capturecat-core/src/test/java/com/capturecat/core/api/user/UserErrorCodeControllerTest.java

@@ -1,8 +1,10 @@
 package com.capturecat.core.api.user;
 
+import static com.capturecat.core.support.error.ErrorType.TAG_NOT_FOUND;
 import static com.capturecat.core.support.error.ErrorType.TOO_MANY_USER_TAGS;
 import static com.capturecat.core.support.error.ErrorType.USER_NOT_FOUND;
 import static com.capturecat.core.support.error.ErrorType.USER_TAG_ALREADY_EXISTS;
+import static com.capturecat.core.support.error.ErrorType.USER_TAG_NOT_FOUND;
 
 import java.util.List;
 
@@ -19,4 +21,18 @@ class UserErrorCodeControllerTest extends ErrorCodeDocumentTest {
 			TOO_MANY_USER_TAGS, USER_NOT_FOUND);
 		generateErrorDocs("errorCode/createUserTag", errorCodeDescriptors);
 	}
+
+
+
+
+
+
+
+
+	@Test
+	void 유저_태그_삭제_에러_코드_문서화() {
+		List<ErrorCodeDescriptor> errorCodeDescriptors = generateErrorCodeDescriptors(USER_NOT_FOUND, TAG_NOT_FOUND,
+			USER_TAG_NOT_FOUND);
+		generateErrorDocs("errorCode/deleteUserTag", errorCodeDescriptors);
+	}
 }

capturecat-core/src/test/java/com/capturecat/core/api/user/UserTagControllerTest.java

@@ -62,4 +62,23 @@ void setUp() {
 					fieldWithPath("data.id").type(JsonFieldType.NUMBER).description("태그 ID"),
 					fieldWithPath("data.name").type(JsonFieldType.STRING).description("태그 이름"))));
 	}
+
+	@Test
+	void 유저_태그_삭제() {
+		// given
+		BDDMockito.given(userTagService.create(any(), anyString())).willReturn(new TagResponse(1L, "java"));
+
+		// when & then
+		given()
+			.header(HttpHeaders.AUTHORIZATION, JwtUtil.BEARER_PREFIX + ACCESS_TOKEN)
+			.contentType(ContentType.JSON)
+			.queryParam("tagId", 1L)
+			.when().delete("/v1/user-tags")
+			.then().status(HttpStatus.OK)
+			.apply(document("deleteUserTag", requestPreprocessor(), responsePreprocessor(),
+				requestHeaders(headerWithName(HttpHeaders.AUTHORIZATION).description("유효한 Access 토큰")),
+				queryParameters(parameterWithName("tagId").description("태그 ID")),
+				responseFields(
+					fieldWithPath("result").type(JsonFieldType.STRING).description("요청 결과"))));
+	}
 }

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

@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
@@ -21,6 +22,7 @@
 import com.capturecat.core.DummyObject;
 import com.capturecat.core.domain.tag.TagFixture;
 import com.capturecat.core.domain.tag.TagRegister;
+import com.capturecat.core.domain.tag.TagRepository;
 import com.capturecat.core.domain.user.UserRepository;
 import com.capturecat.core.domain.user.UserTagFixture;
 import com.capturecat.core.domain.user.UserTagRepository;
@@ -37,6 +39,9 @@ class UserTagServiceTest {
 	@Mock
 	UserTagRepository userTagRepository;
 
+	@Mock
+	TagRepository tagRepository;
+
 	@Mock
 	TagRegister tagRegister;
 
@@ -114,4 +119,68 @@ class UserTagServiceTest {
 
 		verify(userTagRepository, never()).save(any());
 	}
+
+	@Test
+	void 유저_태그를_삭제한다() {
+		// given
+		var user = DummyObject.newUser("test");
+		var tag = TagFixture.createTag(1L, "java");
+		var userTag = UserTagFixture.createUserTag(1L, user, tag);
+
+		given(userRepository.findByUsername(anyString())).willReturn(Optional.of(user));
+		given(tagRepository.findById(anyLong())).willReturn(Optional.of(tag));
+		given(userTagRepository.findByUserAndTag(eq(user), eq(tag))).willReturn(Optional.of(userTag));
+
+		// when
+		userTagService.delete(new LoginUser(user), 1L);
+
+		// then
+		verify(userTagRepository, times(1)).delete(eq(userTag));
+	}
+
+	@Test
+	void 유저_태그_삭제_시_회원이_없으면_실패한다() {
+		// given
+		given(userRepository.findByUsername(anyString())).willReturn(Optional.empty());
+
+		// when & then
+		assertThatThrownBy(() -> userTagService.delete(new LoginUser(DummyObject.newUser("test")), 1L))
+			.isInstanceOf(CoreException.class)
+			.hasMessage(ErrorType.USER_NOT_FOUND.getCode().getMessage());
+
+		verify(userTagRepository, never()).delete(any());
+	}
+
+	@Test
+	void 유저_태그_삭제_시_태그가_없으면_실패한다() {
+		// given
+		var user = DummyObject.newUser("test");
+
+		given(userRepository.findByUsername(anyString())).willReturn(Optional.of(user));
+		given(tagRepository.findById(anyLong())).willReturn(Optional.empty());
+
+		// when & then
+		assertThatThrownBy(() -> userTagService.delete(new LoginUser(DummyObject.newUser("test")), 1L))
+			.isInstanceOf(CoreException.class)
+			.hasMessage(ErrorType.TAG_NOT_FOUND.getCode().getMessage());
+
+		verify(userTagRepository, never()).delete(any());
+	}
+
+	@Test
+	void 유저_태그_삭제_시_유저_태그가_없으면_실패한다() {
+		// given
+		var user = DummyObject.newUser("test");
+		var tag = TagFixture.createTag(1L, "java");
+
+		given(userRepository.findByUsername(anyString())).willReturn(Optional.of(user));
+		given(tagRepository.findById(anyLong())).willReturn(Optional.of(tag));
+		given(userTagRepository.findByUserAndTag(eq(user), eq(tag))).willReturn(Optional.empty());
+
+		// when & then
+		assertThatThrownBy(() -> userTagService.delete(new LoginUser(DummyObject.newUser("test")), 1L))
+			.isInstanceOf(CoreException.class);
+
+		verify(userTagRepository, never()).delete(any());
+	}
 }