[LIME-33] 아이템 폴더 목록 조회 추가 및 기존 기능 수정

lime-api/src/main/java/com/programmers/lime/domains/item/api/ItemController.java

@@ -21,13 +21,15 @@
 import com.programmers.lime.domains.item.api.dto.response.ItemGetNamesResponse;
 import com.programmers.lime.domains.item.api.dto.response.ItemGetRankingResponse;
 import com.programmers.lime.domains.item.api.dto.response.ItemGetResponse;
+import com.programmers.lime.domains.item.api.dto.response.MemberItemFolderGetByCursorResponse;
 import com.programmers.lime.domains.item.api.dto.response.MemberItemGetByCursorResponse;
 import com.programmers.lime.domains.item.application.ItemEnrollService;
 import com.programmers.lime.domains.item.application.ItemService;
 import com.programmers.lime.domains.item.application.dto.ItemAddServiceResponse;
 import com.programmers.lime.domains.item.application.dto.ItemGetByCursorServiceResponse;
 import com.programmers.lime.domains.item.application.dto.ItemGetNamesServiceResponse;
 import com.programmers.lime.domains.item.application.dto.ItemGetServiceResponse;
+import com.programmers.lime.domains.item.application.dto.MemberItemFolderGetServiceResponse;
 import com.programmers.lime.domains.item.application.dto.MemberItemGetServiceResponse;
 import com.programmers.lime.global.cursor.CursorRequest;
 
@@ -107,15 +109,35 @@ public ResponseEntity<ItemGetByCursorResponse> getItemsByCursor(
 		return ResponseEntity.ok(response);
 	}
 
+	@Operation(summary = "나의 아이템 폴더 조회", description = "나의 아이템 폴더 목록을 조회 합니다.")
+	@GetMapping("/myitems/folders")
+	public ResponseEntity<MemberItemFolderGetByCursorResponse> getMemberItemFoldersByCursor(
+		@RequestParam(required = false) final String hobbyName,
+		@ModelAttribute("request") @Valid final CursorRequest request
+	) {
+		Hobby hobby = Hobby.from(hobbyName);
+		MemberItemFolderGetServiceResponse memberItemFolderByCursor = itemService.getMemberItemFolderByCursor(
+			hobby,
+			request.toParameters()
+		);
+
+		MemberItemFolderGetByCursorResponse response = MemberItemFolderGetByCursorResponse
+			.from(memberItemFolderByCursor);
+
+		return ResponseEntity.ok(response);
+	}
+
 	@Operation(summary = "나의 아이템 목록 조회", description = "나의 아이템 목록을 조회 합니다.")
-	@GetMapping("/myitems")
+	@GetMapping("/myitems/folders/{folderId}")
 	public ResponseEntity<MemberItemGetByCursorResponse> getMemberItemsByCursor(
+		@PathVariable final Long folderId,
 		@RequestParam(required = false) final String hobbyName,
 		@ModelAttribute("request") @Valid final CursorRequest request
 	) {
 		Hobby hobby = Hobby.from(hobbyName);
 		MemberItemGetServiceResponse serviceResponse = itemService.getMemberItemsByCursor(
 			hobby,
+			folderId,
 			request.toParameters()
 		);
 		MemberItemGetByCursorResponse response = MemberItemGetByCursorResponse.from(serviceResponse);

lime-api/src/main/java/com/programmers/lime/domains/item/api/dto/request/ItemEnrollRequest.java

@@ -13,12 +13,16 @@ public record ItemEnrollRequest(
 
 	@Schema(description = "아이템 URL", example = "https://www.coupang.com/vp/products/5720604355?itemId=9567481661")
 	@NotNull(message = "아이템 URL을 입력하지 않았습니다.")
-	String itemUrl
+	String itemUrl,
+
+	@Schema(description = "폴더 ID", example = "1")
+	@NotNull(message = "폴더 ID를 입력하지 않았습니다.")
+	Long folderId
 ) {
 
 	public ItemEnrollServiceRequest toEnrollItemServiceRequest() {
 		Hobby hobby = Hobby.from(hobbyValue);
 
-		return new ItemEnrollServiceRequest(hobby, itemUrl);
+		return new ItemEnrollServiceRequest(hobby, itemUrl, folderId);
 	}
 }

lime-api/src/main/java/com/programmers/lime/domains/item/api/dto/response/FolderGetByCursorResponse.java

@@ -0,0 +1,21 @@
+package com.programmers.lime.domains.item.api.dto.response;
+
+import java.util.List;
+
+import com.programmers.lime.domains.item.application.dto.FolderGetByCursorServiceResponse;
+import com.programmers.lime.domains.item.model.MemberItemFolderCursorSummary;
+
+public record FolderGetByCursorResponse(
+	String nextCursorId,
+	int totalCount,
+	List<MemberItemFolderCursorSummary> summaries
+) {
+
+	public static FolderGetByCursorResponse from(final FolderGetByCursorServiceResponse response) {
+		return new FolderGetByCursorResponse(
+			response.cursorSummary().nextCursorId(),
+			response.folderTotalCount(),
+			response.cursorSummary().summaries()
+		);
+	}
+}

lime-api/src/main/java/com/programmers/lime/domains/item/api/dto/response/MemberItemFolderGetByCursorResponse.java

@@ -0,0 +1,30 @@
+package com.programmers.lime.domains.item.api.dto.response;
+
+import java.util.List;
+
+import com.programmers.lime.common.cursor.CursorSummary;
+import com.programmers.lime.domains.item.application.dto.MemberItemFolderGetServiceResponse;
+import com.programmers.lime.domains.item.model.MemberItemFolderCursorSummary;
+
+public record MemberItemFolderGetByCursorResponse (
+
+	String nextCursorId,
+
+	int totalMemberItemFolderCount,
+
+	int totalCount,
+
+	List<MemberItemFolderCursorSummary> memberItemFolderCursorSummaries
+) {
+
+	public static MemberItemFolderGetByCursorResponse from(final MemberItemFolderGetServiceResponse serviceResponse) {
+		CursorSummary<MemberItemFolderCursorSummary> cursorSummary = serviceResponse.memberItemFolderSummarySummary();
+
+		return new MemberItemFolderGetByCursorResponse(
+			cursorSummary.nextCursorId(),
+			serviceResponse.totalMemberItemFolderCount(),
+			cursorSummary.summaryCount(),
+			cursorSummary.summaries()
+		);
+	}
+}

lime-api/src/main/java/com/programmers/lime/domains/item/application/ItemEnrollService.java

@@ -37,7 +37,7 @@ public Long enrollItem(final ItemEnrollServiceRequest request) {
 		ItemCrawlerInfo itemCrawlerInfo = itemCrawlerResultToInfo(itemCrawlerResult);
 
 		// 아이템 등록
-		Long enrolledItemId = itemAppender.append(request.hobby(), itemCrawlerInfo);
+		Long enrolledItemId = itemAppender.append(request.hobby(), request.folderId(), itemCrawlerInfo);
 
 		// 아이텥 랭킹 등록
 		itemRanking.addRanking(itemCrawlerInfo.itemName());

lime-api/src/main/java/com/programmers/lime/domains/item/application/ItemService.java

@@ -13,6 +13,7 @@
 import com.programmers.lime.domains.item.application.dto.ItemGetByCursorServiceResponse;
 import com.programmers.lime.domains.item.application.dto.ItemGetNamesServiceResponse;
 import com.programmers.lime.domains.item.application.dto.ItemGetServiceResponse;
+import com.programmers.lime.domains.item.application.dto.MemberItemFolderGetServiceResponse;
 import com.programmers.lime.domains.item.application.dto.MemberItemGetServiceResponse;
 import com.programmers.lime.domains.item.domain.Item;
 import com.programmers.lime.domains.item.domain.MemberItem;
@@ -21,10 +22,12 @@
 import com.programmers.lime.domains.item.implementation.ItemReader;
 import com.programmers.lime.domains.item.implementation.MemberItemAppender;
 import com.programmers.lime.domains.item.implementation.MemberItemChecker;
+import com.programmers.lime.domains.item.implementation.MemberItemFolderReader;
 import com.programmers.lime.domains.item.implementation.MemberItemReader;
 import com.programmers.lime.domains.item.implementation.MemberItemRemover;
 import com.programmers.lime.domains.item.model.ItemCursorSummary;
 import com.programmers.lime.domains.item.model.ItemInfo;
+import com.programmers.lime.domains.item.model.MemberItemFolderCursorSummary;
 import com.programmers.lime.domains.item.model.MemberItemSummary;
 import com.programmers.lime.domains.review.implementation.ReviewReader;
 import com.programmers.lime.domains.review.implementation.ReviewStatistics;
@@ -60,6 +63,8 @@ public class ItemService {
 
 	private final ReviewReader reviewReader;
 
+	private final MemberItemFolderReader memberItemFolderReader;
+
 	public ItemAddServiceResponse addItem(final ItemIdRegistry itemIdRegistry) {
 		List<String> items = itemIdRegistry.itemIds().stream()
 			.map(itemReader::read)
@@ -131,20 +136,39 @@ public ItemGetByCursorServiceResponse getItemsByCursor(
 
 	public MemberItemGetServiceResponse getMemberItemsByCursor(
 		final Hobby hobby,
+		final Long folderId,
 		final CursorPageParameters parameters
 	) {
 		Long memberId = memberUtils.getCurrentMemberId();
 		int totalMemberItemCount = memberItemReader.countByMemberIdAndHobby(memberId, hobby);
 
 		CursorSummary<MemberItemSummary> cursorSummary = memberItemReader.readMemberItem(
 			hobby,
+			folderId,
 			memberId,
 			parameters
 		);
 
 		return new MemberItemGetServiceResponse(cursorSummary, totalMemberItemCount);
 	}
 
+	public MemberItemFolderGetServiceResponse getMemberItemFolderByCursor(
+			final Hobby hobby,
+			final CursorPageParameters parameters
+	) {
+		Long memberId = memberUtils.getCurrentMemberId();
+		int totalMemberItemFolderCount = memberItemFolderReader.countByMemberIdAndHobby(memberId, hobby);
+
+		CursorSummary<MemberItemFolderCursorSummary> cursorSummary = memberItemFolderReader.readMemberItemFolderByCursor(
+			hobby,
+			memberId,
+			parameters
+		);
+
+		return new MemberItemFolderGetServiceResponse(cursorSummary, totalMemberItemFolderCount);
+	}
+
+
 	public List<ItemRankingServiceResponse> getRanking() {
 		return itemRanking.viewRanking();
 	}

lime-api/src/main/java/com/programmers/lime/domains/item/application/dto/FolderGetByCursorServiceResponse.java

@@ -0,0 +1,10 @@
+package com.programmers.lime.domains.item.application.dto;
+
+import com.programmers.lime.common.cursor.CursorSummary;
+import com.programmers.lime.domains.item.model.MemberItemFolderCursorSummary;
+
+public record FolderGetByCursorServiceResponse(
+	int folderTotalCount,
+	CursorSummary<MemberItemFolderCursorSummary> cursorSummary
+) {
+}

lime-api/src/main/java/com/programmers/lime/domains/item/application/dto/ItemEnrollServiceRequest.java

@@ -4,6 +4,7 @@
 
 public record ItemEnrollServiceRequest(
 	Hobby hobby,
-	String itemUrl
+	String itemUrl,
+	Long folderId
 ) {
 }

lime-api/src/main/java/com/programmers/lime/domains/item/application/dto/MemberItemFolderGetServiceResponse.java

@@ -0,0 +1,13 @@
+package com.programmers.lime.domains.item.application.dto;
+
+import com.programmers.lime.common.cursor.CursorSummary;
+import com.programmers.lime.domains.item.model.MemberItemFolderCursorSummary;
+import com.programmers.lime.domains.item.model.MemberItemFolderSummary;
+
+public record MemberItemFolderGetServiceResponse(
+
+	CursorSummary<MemberItemFolderCursorSummary> memberItemFolderSummarySummary,
+	int totalMemberItemFolderCount
+
+	) {
+}

lime-domain/src/main/java/com/programmers/lime/domains/item/domain/Item.java

@@ -47,18 +47,23 @@ public class Item extends BaseEntity {
 	@Column(name = "image", nullable = false)
 	private String image;
 
+	@Column(name = "folder_id", nullable = false)
+	private Long folderId;
+
 	@Builder
 	public Item(
 		final Hobby hobby,
 		final String name,
 		final Integer price,
 		final String url,
-		final String image
+		final String image,
+		final Long folderId
 	) {
 		this.hobby = Objects.requireNonNull(hobby);
 		this.name = Objects.requireNonNull(name);
 		this.price = Objects.requireNonNull(price);
 		this.url = Objects.requireNonNull(url);
 		this.image = Objects.requireNonNull(image);
+		this.folderId = Objects.requireNonNull(folderId);
 	}
 }

lime-domain/src/main/java/com/programmers/lime/domains/item/domain/MemberItemFolder.java

@@ -0,0 +1,46 @@
+package com.programmers.lime.domains.item.domain;
+
+import java.util.Objects;
+
+import com.programmers.lime.common.model.Hobby;
+import com.programmers.lime.domains.BaseEntity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+@Table(name = "member_item_folders")
+public class MemberItemFolder extends BaseEntity {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Long id;
+
+	@Column(name = "name", nullable = false)
+	private String name;
+
+	@Column(name = "member_id", nullable = false)
+	private Long memberId;
+
+	@Column(name = "hobby", nullable = false)
+	@Enumerated(EnumType.STRING)
+	private Hobby hobby;
+
+	public MemberItemFolder(final String name, final Long memberId, final Hobby hobby) {
+		this.name = Objects.requireNonNull(name);
+		this.memberId = Objects.requireNonNull(memberId);
+		this.hobby = Objects.requireNonNull(hobby);
+	}
+}

lime-domain/src/main/java/com/programmers/lime/domains/item/implementation/ItemAppender.java

@@ -17,10 +17,12 @@ public class ItemAppender {
 
 	public Long append(
 		final Hobby hobby,
+		final Long folderId,
 		final ItemCrawlerInfo itemInfo
 	) {
 		Item item = Item.builder().
 			hobby(hobby).
+			folderId(folderId).
 			image(itemInfo.imageUrl()).
 			url(itemInfo.url()).
 			price(itemInfo.price()).

lime-domain/src/main/java/com/programmers/lime/domains/item/implementation/MemberItemFolderReader.java

@@ -0,0 +1,58 @@
+package com.programmers.lime.domains.item.implementation;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.programmers.lime.common.cursor.CursorPageParameters;
+import com.programmers.lime.common.cursor.CursorSummary;
+import com.programmers.lime.common.cursor.CursorUtils;
+import com.programmers.lime.common.model.Hobby;
+import com.programmers.lime.domains.item.model.MemberItemFolderCursorSummary;
+import com.programmers.lime.domains.item.repository.MemberItemFolderRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class MemberItemFolderReader {
+
+	private final MemberItemFolderRepository memberItemFolderRepository;
+	private static final int DEFAULT_PAGE_SIZE = 20;
+
+	public int countByMemberIdAndHobby(
+		final Long memberId,
+		final Hobby hobby
+	) {
+		return memberItemFolderRepository.countByHobbyAndMemberId(hobby, memberId);
+	}
+
+	public CursorSummary<MemberItemFolderCursorSummary> readMemberItemFolderByCursor(
+		final Hobby hobby,
+		final Long memberId,
+		final CursorPageParameters parameters
+	) {
+		int size = getPageSize(parameters);
+		List<MemberItemFolderCursorSummary> memberItemFoldersByCursor =
+			memberItemFolderRepository.findMemberItemFoldersByCursor(
+				memberId,
+				hobby,
+				parameters.cursorId(),
+				size
+			);
+
+		return CursorUtils.getCursorSummaries(memberItemFoldersByCursor);
+	}
+
+	private int getPageSize(final CursorPageParameters parameters) {
+		Integer parameterSize = parameters.size();
+
+		if (parameterSize == null) {
+			return DEFAULT_PAGE_SIZE;
+		}
+
+		return parameterSize;
+	}
+}

lime-domain/src/main/java/com/programmers/lime/domains/item/implementation/MemberItemReader.java

@@ -68,12 +68,14 @@ public List<BucketMemberItemSummary> readBucketMemberItem(
 
 	public CursorSummary<MemberItemSummary> readMemberItem(
 		final Hobby hobby,
+		final Long folderId,
 		final Long memberId,
 		final CursorPageParameters parameters
 	) {
 		int size = getPageSize(parameters);
 		List<MemberItemSummary> memberItemsByCursor = memberItemRepository.findMemberItemsByCursor(
 			hobby,
+			folderId,
 			memberId,
 			parameters.cursorId(),
 			size