Merge branch 'develop' into feature/#131-userSettings-deleteScreenShot

jaelyangChoi · jaelyangChoi · commit b998f5fe3037 · 2025-10-20T20:33:41.000+09:00
# Conflicts:
#	capturecat-core/src/docs/asciidoc/user.adoc
diff --git a/capturecat-core/src/docs/asciidoc/bookmark.adoc b/capturecat-core/src/docs/asciidoc/bookmark.adoc
@@ -21,6 +21,16 @@ operation::getBookmarkImages[snippets='curl-request,query-parameters,http-respon
 
 <<error-codes#즐겨찾기한-이미지-조회, 즐겨찾기한 이미지 조회 API에서 발생할 수 있는 에러>>를 살펴보세요.
 
+[[즐겨찾기한-이미지의-태그-조회]]
+=== 즐겨찾기한 이미지의 태그 조회
+==== 성공
+operation::getBookmarkImageTags[snippets='curl-request,query-parameters,http-response,response-fields']
+
+==== 실패
+즐겨찾기한 이미지의 태그 조회가 실패했다면 HTTP 상태 코드와 함께 <<에러-객체-형식, 에러 객체>>가 돌아옵니다.
+
+<<error-codes#즐겨찾기한-이미지의-태그-조회, 즐겨찾기한 이미지의 태그 조회 API에서 발생할 수 있는 에러>>를 살펴보세요.
+
 [[즐겨찾기-삭제]]
 === 즐겨찾기 삭제
 ==== 성공
diff --git a/capturecat-core/src/docs/asciidoc/error-codes.adoc b/capturecat-core/src/docs/asciidoc/error-codes.adoc
@@ -54,6 +54,10 @@ include::{snippets}/errorCode/addBookmark/error-codes.adoc[]
 === 즐겨찾기한 이미지 조회
 include::{snippets}/errorCode/getBookmarkImages/error-codes.adoc[]
 
+[[즐겨찾기한-이미지의-태그-조회]]
+=== 즐겨찾기한 이미지의 태그 조회
+include::{snippets}/errorCode/getBookmarkImageTags/error-codes.adoc[]
+
 [[즐겨찾기-삭제]]
 === 즐겨찾기 삭제
 include::{snippets}/errorCode/deleteBookmark/error-codes.adoc[]
diff --git a/capturecat-core/src/main/java/com/capturecat/core/api/bookmark/BookmarkController.java b/capturecat-core/src/main/java/com/capturecat/core/api/bookmark/BookmarkController.java
@@ -15,6 +15,7 @@
 import com.capturecat.core.service.auth.LoginUser;
 import com.capturecat.core.service.bookmark.BookmarkService;
 import com.capturecat.core.service.image.ImageWithTagsResponse;
+import com.capturecat.core.service.image.TagResponse;
 import com.capturecat.core.support.response.ApiResponse;
 import com.capturecat.core.support.response.CursorResponse;
 
@@ -34,8 +35,17 @@ public ApiResponse<?> addBookmark(@RequestParam Long imageId, @AuthenticationPri
 	@GetMapping("/images")
 	public ApiResponse<CursorResponse<ImageWithTagsResponse>> getBookmarkImages(
 		@AuthenticationPrincipal LoginUser loginUser,
+		@RequestParam(required = false) Long tagId,
 		@PageableDefault Pageable pageable) {
-		return ApiResponse.success(bookmarkService.getBookmarkImages(loginUser, pageable));
+		return ApiResponse.success(bookmarkService.getBookmarkImages(loginUser, tagId, pageable));
+	}
+
+	@GetMapping("/tags")
+	public ApiResponse<CursorResponse<TagResponse>> getBookmarkImageTags(
+		@AuthenticationPrincipal LoginUser loginUser,
+		@PageableDefault Pageable pageable) {
+
+		return ApiResponse.success(bookmarkService.getBookmarkImageTags(loginUser, pageable));
 	}
 
 	@DeleteMapping
diff --git a/capturecat-core/src/main/java/com/capturecat/core/domain/bookmark/BookmarkCustomRepository.java b/capturecat-core/src/main/java/com/capturecat/core/domain/bookmark/BookmarkCustomRepository.java
@@ -3,9 +3,10 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 
+import com.capturecat.core.domain.tag.Tag;
 import com.capturecat.core.domain.user.User;
 
 public interface BookmarkCustomRepository {
 
-	Slice<Bookmark> searchBookmarksByUser(User user, Pageable pageable);
+	Slice<Bookmark> searchBookmarksByUser(User user, Tag tag, Pageable pageable);
 }
diff --git a/capturecat-core/src/main/java/com/capturecat/core/domain/bookmark/BookmarkCustomRepositoryImpl.java b/capturecat-core/src/main/java/com/capturecat/core/domain/bookmark/BookmarkCustomRepositoryImpl.java
@@ -2,16 +2,20 @@
 
 import static com.capturecat.core.domain.bookmark.QBookmark.bookmark;
 import static com.capturecat.core.domain.image.QImage.image;
+import static com.capturecat.core.domain.tag.QImageTag.imageTag;
 
 import java.util.List;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 
+import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
 import lombok.RequiredArgsConstructor;
 
+import com.capturecat.core.domain.tag.QTag;
+import com.capturecat.core.domain.tag.Tag;
 import com.capturecat.core.domain.user.User;
 import com.capturecat.core.support.util.SliceUtil;
 
@@ -21,16 +25,25 @@ public class BookmarkCustomRepositoryImpl implements BookmarkCustomRepository {
 	private final JPAQueryFactory queryFactory;
 
 	@Override
-	public Slice<Bookmark> searchBookmarksByUser(User user, Pageable pageable) {
+	public Slice<Bookmark> searchBookmarksByUser(User user, Tag tag, Pageable pageable) {
 		List<Bookmark> bookmarks = queryFactory
 			.selectFrom(bookmark)
 			.join(bookmark.image, image).fetchJoin()
-			.where(bookmark.user.eq(user))
+			.leftJoin(imageTag).on(imageTag.image.eq(image))
+			.leftJoin(QTag.tag).on(imageTag.tag.eq(QTag.tag))
+			.where(bookmark.user.eq(user), eqTag(tag))
 			.offset(pageable.getOffset())
 			.limit(pageable.getPageSize() + 1)
 			.orderBy(bookmark.id.desc())
 			.fetch();
 
 		return SliceUtil.toSlice(bookmarks, pageable);
 	}
+
+	private BooleanExpression eqTag(Tag tag) {
+		if (tag == null) {
+			return null;
+		}
+		return imageTag.tag.eq(tag);
+	}
 }
diff --git a/capturecat-core/src/main/java/com/capturecat/core/domain/tag/TagCustomRepository.java b/capturecat-core/src/main/java/com/capturecat/core/domain/tag/TagCustomRepository.java
@@ -16,4 +16,6 @@ public interface TagCustomRepository {
 	Slice<Tag> searchMostUsedTagsByUser(User user, Pageable pageable);
 
 	List<Tag> searchByKeyword(String keyword, Long userId, int size);
+
+	Slice<Tag> searchTagsByMemberBookmark(User user, Pageable pageable);
 }
diff --git a/capturecat-core/src/main/java/com/capturecat/core/domain/tag/TagCustomRepositoryImpl.java b/capturecat-core/src/main/java/com/capturecat/core/domain/tag/TagCustomRepositoryImpl.java
@@ -1,5 +1,6 @@
 package com.capturecat.core.domain.tag;
 
+import static com.capturecat.core.domain.bookmark.QBookmark.bookmark;
 import static com.capturecat.core.domain.image.QImage.image;
 import static com.capturecat.core.domain.tag.QImageTag.imageTag;
 import static com.capturecat.core.domain.tag.QTag.tag;
@@ -13,6 +14,7 @@
 
 import lombok.RequiredArgsConstructor;
 
+import com.capturecat.core.domain.user.QUser;
 import com.capturecat.core.domain.user.User;
 import com.capturecat.core.support.querydsl.CommonTagQueryConditions;
 import com.capturecat.core.support.util.SliceUtil;
@@ -87,4 +89,22 @@ public List<Tag> searchByKeyword(String keyword, Long userId, int size) {
 			.limit(size)
 			.fetch();
 	}
+
+	@Override
+	public Slice<Tag> searchTagsByMemberBookmark(User user, Pageable pageable) {
+		List<Tag> content = queryFactory
+			.select(tag)
+			.from(imageTag)
+			.join(imageTag.tag, tag)
+			.join(imageTag.image, image)
+			.join(bookmark).on(bookmark.image.eq(image))
+			.join(bookmark.user, QUser.user)
+			.where(QUser.user.eq(user))
+			.offset(pageable.getOffset())
+			.limit(pageable.getPageSize() + 1)
+			.orderBy(imageTag.createdDate.desc())
+			.fetch();
+
+		return SliceUtil.toSlice(content, pageable);
+	}
 }
diff --git a/capturecat-core/src/main/java/com/capturecat/core/domain/user/UserRepository.java b/capturecat-core/src/main/java/com/capturecat/core/domain/user/UserRepository.java
@@ -8,6 +8,4 @@ public interface UserRepository extends JpaRepository<User, Long> {
 	Optional<User> findByUsername(String username);
 
 	boolean existsByUsername(String username);
-
-	Optional<User> findByEmail(String email);
 }
diff --git a/capturecat-core/src/main/java/com/capturecat/core/service/bookmark/BookmarkService.java b/capturecat-core/src/main/java/com/capturecat/core/service/bookmark/BookmarkService.java
@@ -13,10 +13,13 @@
 import com.capturecat.core.domain.bookmark.BookmarkRepository;
 import com.capturecat.core.domain.image.Image;
 import com.capturecat.core.domain.image.ImageRepository;
+import com.capturecat.core.domain.tag.Tag;
+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.service.auth.LoginUser;
 import com.capturecat.core.service.image.ImageWithTagsResponse;
+import com.capturecat.core.service.image.TagResponse;
 import com.capturecat.core.support.error.CoreException;
 import com.capturecat.core.support.error.ErrorType;
 import com.capturecat.core.support.response.CursorResponse;
@@ -29,6 +32,7 @@ public class BookmarkService {
 	private final BookmarkRepository bookmarkRepository;
 	private final ImageRepository imageRepository;
 	private final UserRepository userRepository;
+	private final TagRepository tagRepository;
 
 	@Transactional
 	public void addBookmark(Long imageId, LoginUser loginUser) {
@@ -43,10 +47,11 @@ public void addBookmark(Long imageId, LoginUser loginUser) {
 	}
 
 	@Transactional(readOnly = true)
-	public CursorResponse<ImageWithTagsResponse> getBookmarkImages(LoginUser loginUser, Pageable pageable) {
+	public CursorResponse<ImageWithTagsResponse> getBookmarkImages(LoginUser loginUser, Long tagId, Pageable pageable) {
 		User user = userRepository.findByUsername(loginUser.getUsername())
 			.orElseThrow(() -> new CoreException(ErrorType.USER_NOT_FOUND));
-		Slice<Bookmark> bookmarks = bookmarkRepository.searchBookmarksByUser(user, pageable);
+		Tag tag = getTagOrNull(tagId);
+		Slice<Bookmark> bookmarks = bookmarkRepository.searchBookmarksByUser(user, tag, pageable);
 
 		List<ImageWithTagsResponse> responses = bookmarks.getContent().stream()
 			.map(Bookmark::getImage)
@@ -56,6 +61,19 @@ public CursorResponse<ImageWithTagsResponse> getBookmarkImages(LoginUser loginUs
 		return CursorUtil.toCursorResponse(responses, bookmarks.hasNext(), ImageWithTagsResponse::id);
 	}
 
+	@Transactional(readOnly = true)
+	public CursorResponse<TagResponse> getBookmarkImageTags(LoginUser loginUser, Pageable pageable) {
+		User user = userRepository.findByUsername(loginUser.getUsername())
+			.orElseThrow(() -> new CoreException(ErrorType.USER_NOT_FOUND));
+		Slice<Tag> tags = tagRepository.searchTagsByMemberBookmark(user, pageable);
+
+		List<TagResponse> responses = tags.getContent().stream()
+			.map(TagResponse::from)
+			.toList();
+
+		return CursorUtil.toCursorResponse(responses, tags.hasNext(), TagResponse::id);
+	}
+
 	@Transactional
 	public void deleteBookmark(Long imageId, LoginUser loginUser) {
 		User user = userRepository.findByUsername(loginUser.getUsername())
@@ -73,4 +91,12 @@ private void validateBookmarkDuplication(User user, Image image) {
 			throw new CoreException(ErrorType.BOOKMARK_DUPLICATION);
 		}
 	}
+
+	private Tag getTagOrNull(Long tagId) {
+		if (tagId == null) {
+			return null;
+		}
+		return tagRepository.findById(tagId)
+			.orElseThrow(() -> new CoreException(ErrorType.TAG_NOT_FOUND));
+	}
 }
diff --git a/capturecat-core/src/test/java/com/capturecat/core/api/bookmark/BookmarkControllerTest.java b/capturecat-core/src/test/java/com/capturecat/core/api/bookmark/BookmarkControllerTest.java
@@ -25,6 +25,7 @@
 import com.capturecat.core.DummyObject;
 import com.capturecat.core.service.bookmark.BookmarkService;
 import com.capturecat.core.service.image.ImageWithTagsResponse;
+import com.capturecat.core.service.image.TagResponse;
 import com.capturecat.core.support.util.CursorUtil;
 import com.capturecat.test.api.RestDocsTest;
 
@@ -62,7 +63,7 @@ void setUp() {
 	@Test
 	void 즐겨찾기한_이미지를_조회한다() {
 		// given
-		BDDMockito.given(bookmarkService.getBookmarkImages(any(), any())).willReturn(
+		BDDMockito.given(bookmarkService.getBookmarkImages(any(), any(), any())).willReturn(
 			CursorUtil.toCursorResponse(
 				List.of(ImageWithTagsResponse.from(DummyObject.newMockImage(1L))),
 				false,
@@ -78,7 +79,9 @@ void setUp() {
 			.apply(document("getBookmarkImages", requestPreprocessor(), responsePreprocessor(),
 				queryParameters(
 					parameterWithName("page").description("페이지 번호 (0부터 시작)").optional(),
-					parameterWithName("size").description("페이지 크기 (기본값: 10, 최대: 100)").optional()),
+					parameterWithName("size").description("페이지 크기 (기본값: 10, 최대: 100)").optional(),
+					parameterWithName("tagId").description("태그 ID (선택한 태그로 필터링)").optional()
+				),
 				responseFields(
 					fieldWithPath("result").type(JsonFieldType.STRING).description("요청 결과"),
 					fieldWithPath("data.hasNext").type(JsonFieldType.BOOLEAN).description("다음 페이지 여부"),
@@ -92,6 +95,35 @@ void setUp() {
 					fieldWithPath("error").type(JsonFieldType.NULL).optional().ignored())));
 	}
 
+	@Test
+	void 즐겨찾기한_이미지의_이미지태그를_조회한다() {
+		// given
+		BDDMockito.given(bookmarkService.getBookmarkImageTags(any(), any())).willReturn(
+			CursorUtil.toCursorResponse(List.of(new TagResponse(1L, "고양이"), new TagResponse(2L, "cat")),
+				false,
+				TagResponse::id));
+
+		// when & then
+		given().contentType(ContentType.JSON)
+			.accept(ContentType.JSON)
+			.queryParam("page", 0)
+			.queryParam("size", 10)
+			.when().get("/v1/bookmarks/tags")
+			.then().status(HttpStatus.OK).log().all()
+			.apply(document("getBookmarkImageTags", requestPreprocessor(), responsePreprocessor(),
+				queryParameters(
+					parameterWithName("page").description("페이지 번호 (0부터 시작)").optional(),
+					parameterWithName("size").description("페이지 크기 (기본값: 10, 최대: 100)").optional()),
+				responseFields(
+					fieldWithPath("result").type(JsonFieldType.STRING).description("요청 결과"),
+					fieldWithPath("data.hasNext").type(JsonFieldType.BOOLEAN).description("다음 페이지 여부"),
+					fieldWithPath("data.lastCursor").type(JsonFieldType.NUMBER).description("마지막 커서 ID"),
+					fieldWithPath("data.items").type(JsonFieldType.ARRAY).description("즐겨찾기한 이미지 태그 목록"),
+					fieldWithPath("data.items[].id").type(JsonFieldType.NUMBER).description("이미지 태그 ID"),
+					fieldWithPath("data.items[].name").type(JsonFieldType.STRING).description("이미지 태그 이름"),
+					fieldWithPath("error").type(JsonFieldType.NULL).optional().ignored())));
+	}
+
 	@Test
 	void 즐겨찾기에서_삭제한다() {
 		// given
diff --git a/capturecat-core/src/test/java/com/capturecat/core/api/error/ErrorCodeControllerTest.java b/capturecat-core/src/test/java/com/capturecat/core/api/error/ErrorCodeControllerTest.java
@@ -114,10 +114,15 @@ void setUp() {
 		generateErrorDocs("errorCode/getBookmarkImages", errorCodeDescriptors);
 	}
 
+	@Test
+	void 즐겨찾기한_이미지의_이미지태그_조회_에러_코드_문서() {
+		List<ErrorCodeDescriptor> errorCodeDescriptors = generateErrorCodeDescriptors(USER_NOT_FOUND);
+		generateErrorDocs("errorCode/getBookmarkImageTags", errorCodeDescriptors);
+	}
+
 	@Test
 	void 이미지_즐겨찾기_삭제_에러_코드_문서() {
-		List<ErrorCodeDescriptor> errorCodeDescriptors = generateErrorCodeDescriptors(USER_NOT_FOUND,
-			IMAGE_NOT_FOUND, BOOKMARK_NOT_FOUND);
+		List<ErrorCodeDescriptor> errorCodeDescriptors = generateErrorCodeDescriptors(USER_NOT_FOUND);
 		generateErrorDocs("errorCode/deleteBookmark", errorCodeDescriptors);
 	}
 
diff --git a/capturecat-core/src/test/java/com/capturecat/core/api/user/UserTagControllerTest.java b/capturecat-core/src/test/java/com/capturecat/core/api/user/UserTagControllerTest.java
@@ -83,6 +83,10 @@ void setUp() {
 			.then().status(HttpStatus.OK)
 			.apply(document("getUserTags", requestPreprocessor(), responsePreprocessor(),
 				requestHeaders(headerWithName(HttpHeaders.AUTHORIZATION).description("유효한 Access 토큰")),
+				queryParameters(
+					parameterWithName("page").description("페이지 번호").optional(),
+					parameterWithName("size").description("페이지 크기").optional()
+				),
 				responseFields(
 					fieldWithPath("result").type(JsonFieldType.STRING).description("요청 결과"),
 					fieldWithPath("data").type(JsonFieldType.OBJECT).description("커서 페이지 응답"),
diff --git a/capturecat-core/src/test/java/com/capturecat/core/domain/bookmark/BookmarkRepositoryTest.java b/capturecat-core/src/test/java/com/capturecat/core/domain/bookmark/BookmarkRepositoryTest.java
diff --git a/capturecat-core/src/test/java/com/capturecat/core/domain/tag/TagRepositoryTest.java b/capturecat-core/src/test/java/com/capturecat/core/domain/tag/TagRepositoryTest.java
diff --git a/capturecat-core/src/test/java/com/capturecat/core/service/bookmark/BookmarkServiceTest.java b/capturecat-core/src/test/java/com/capturecat/core/service/bookmark/BookmarkServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,10 @@`
`3`	`3`	`import org.springframework.data.domain.Pageable;`
`4`	`4`	`import org.springframework.data.domain.Slice;`
`5`	`5`
	`6`	`+import com.capturecat.core.domain.tag.Tag;`
`6`	`7`	`import com.capturecat.core.domain.user.User;`
`7`	`8`
`8`	`9`	`public interface BookmarkCustomRepository {`
`9`	`10`
`10`		`- Slice<Bookmark> searchBookmarksByUser(User user, Pageable pageable);`
	`11`	`+ Slice<Bookmark> searchBookmarksByUser(User user, Tag tag, Pageable pageable);`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,6 @@ public interface TagCustomRepository {`
`16`	`16`	`Slice<Tag> searchMostUsedTagsByUser(User user, Pageable pageable);`
`17`	`17`
`18`	`18`	`List<Tag> searchByKeyword(String keyword, Long userId, int size);`
	`19`	`+`
	`20`	`+ Slice<Tag> searchTagsByMemberBookmark(User user, Pageable pageable);`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,4 @@ public interface UserRepository extends JpaRepository<User, Long> {`
`8`	`8`	`Optional<User> findByUsername(String username);`
`9`	`9`
`10`	`10`	`boolean existsByUsername(String username);`
`11`		`-`
`12`		`- Optional<User> findByEmail(String email);`
`13`	`11`	`}`