[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;
 
@@ -58,7 +60,9 @@ public ResponseEntity<ItemEnrollResponse> enrollItem(@Valid @RequestBody final I
 	@Operation(summary = "아이템 담기", description = "MemberItemAddRequest을 이용하여 사용자에 아이템을 담기 합니다.")
 	@PostMapping("/myitems")
 	public ResponseEntity<ItemAddResponse> addItems(@Valid @RequestBody final MemberItemAddRequest request) {
-		ItemAddServiceResponse serviceResponse = itemService.addItem(request.toAddMemberItemServiceRequest());
+		ItemAddServiceResponse serviceResponse = itemService.addItem(
+			request.toMemberItemIdRegistry()
+		);
 		ItemAddResponse response = ItemAddResponse.from(serviceResponse);
 
 		return ResponseEntity.ok(response);
@@ -107,15 +111,35 @@ public ResponseEntity<ItemGetByCursorResponse> getItemsByCursor(
 		return ResponseEntity.ok(response);
 	}
 
-	@Operation(summary = "나의 아이템 목록 조회", description = "나의 아이템 목록을 조회 합니다.")
-	@GetMapping("/myitems")
+	@Operation(summary = "나의 아이템 폴더 조회", description = "나의 아이템 폴더 목록을 조회 합니다.")
+	@GetMapping("/myitems/folders")
+	public ResponseEntity<MemberItemFolderGetByCursorResponse> getMemberItemFoldersByCursor(
+		@RequestParam 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/folders/{folderId}")
 	public ResponseEntity<MemberItemGetByCursorResponse> getMemberItemsByCursor(
-		@RequestParam(required = false) final String hobbyName,
+		@PathVariable final Long folderId,
+		@RequestParam 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/MemberItemAddRequest.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import com.programmers.lime.common.model.ItemIdRegistry;
+import com.programmers.lime.domains.item.model.MemberItemIdRegistry;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
@@ -11,9 +11,13 @@ public record MemberItemAddRequest(
 
 	@Schema(description = "여러 아이템 id", example = "[1, 2, 3]")
 	@NotNull(message = "아이템 목록은 필수 값 입니다.")
-	List<Long> itemIds
+	List<Long> itemIds,
+
+	@Schema(description = "아이템 폴더 id", example = "1")
+	@NotNull(message = "아이템 폴더 id는 필수 값 입니다.")
+	Long folderId
 ) {
-	public ItemIdRegistry toAddMemberItemServiceRequest() {
-		return new ItemIdRegistry(itemIds);
+	public MemberItemIdRegistry toMemberItemIdRegistry() {
+		return new MemberItemIdRegistry(itemIds, 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

@@ -21,8 +21,6 @@ public class ItemEnrollService {
 
 	private final ItemAppender itemAppender;
 
-	private final ItemService itemService;
-
 	private final ItemEnrollValidator itemEnrollValidator;
 
 	private final ItemRanking itemRanking;
@@ -42,11 +40,6 @@ public Long enrollItem(final ItemEnrollServiceRequest request) {
 		// 아이텥 랭킹 등록
 		itemRanking.addRanking(itemCrawlerInfo.itemName());
 
-		// 아이템 담기
-		ItemIdRegistry itemIdRegistry = getItemIdRegistry(enrolledItemId);
-		itemService.addItem(itemIdRegistry);
-		itemRanking.increasePoint(itemCrawlerInfo.itemName(), 1);
-
 		return enrolledItemId;
 	}
 
@@ -59,10 +52,4 @@ private ItemCrawlerInfo itemCrawlerResultToInfo(final ItemCrawlerResult itemCraw
 			.url(itemCrawlerResult.url())
 			.build();
 	}
-
-	private ItemIdRegistry getItemIdRegistry(final Long enrolledItemId) {
-		List<Long> ids = List.of(enrolledItemId);
-
-		return new ItemIdRegistry(ids);
-	}
 }

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

@@ -7,12 +7,12 @@
 import com.programmers.lime.common.cursor.CursorPageParameters;
 import com.programmers.lime.common.cursor.CursorSummary;
 import com.programmers.lime.common.model.Hobby;
-import com.programmers.lime.common.model.ItemIdRegistry;
 import com.programmers.lime.common.model.ItemRemovalList;
 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.domains.item.domain.Item;
 import com.programmers.lime.domains.item.domain.MemberItem;
@@ -21,10 +21,13 @@
 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.MemberItemIdRegistry;
 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,8 +63,12 @@ public class ItemService {
 
 	private final ReviewReader reviewReader;
 
-	public ItemAddServiceResponse addItem(final ItemIdRegistry itemIdRegistry) {
-		List<String> items = itemIdRegistry.itemIds().stream()
+	private final MemberItemFolderReader memberItemFolderReader;
+
+	public ItemAddServiceResponse addItem(
+		final MemberItemIdRegistry memberItemIdRegistry
+	) {
+		List<String> items = memberItemIdRegistry.itemIds().stream()
 			.map(itemReader::read)
 			.map(Item::getName)
 			.toList();
@@ -71,7 +78,11 @@ public ItemAddServiceResponse addItem(final ItemIdRegistry itemIdRegistry) {
 		}
 
 		Long memberId = memberUtils.getCurrentMemberId();
-		List<Long> memberItemIds = memberItemAppender.addMemberItems(itemIdRegistry.itemIds(), memberId);
+		List<Long> memberItemIds = memberItemAppender.addMemberItems(
+			memberItemIdRegistry.itemIds(),
+			memberItemIdRegistry.folderId(),
+			memberId
+		);
 
 		return new ItemAddServiceResponse(memberItemIds);
 	}
@@ -131,20 +142,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/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-api/src/test/java/com/programmers/lime/domains/item/application/ItemServiceTest.java

@@ -9,11 +9,11 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import com.programmers.lime.IntegrationTest;
-import com.programmers.lime.common.model.ItemIdRegistry;
-import com.programmers.lime.common.model.ItemIdRegistryBuilder;
 import com.programmers.lime.domains.item.application.dto.ItemAddServiceResponse;
 import com.programmers.lime.domains.item.domain.setup.ItemSetup;
 import com.programmers.lime.domains.item.implementation.MemberItemValidator;
+import com.programmers.lime.domains.item.model.MemberItemIdRegistry;
+import com.programmers.lime.domains.item.model.MemberItemIdRegistryBuilder;
 import com.programmers.lime.global.util.MemberUtils;
 
 class ItemServiceTest extends IntegrationTest {
@@ -39,14 +39,14 @@ public void addItemTest() {
 		// memberSetup이 만들어지면 변경할 예정
 		doNothing().when(memberItemValidator).validateExistMemberItem(any(), any());
 
-		ItemIdRegistry itemIdRegistry = ItemIdRegistryBuilder.build();
-		ItemAddServiceResponse expectedResponse = new ItemAddServiceResponse(itemIdRegistry.itemIds());
+		MemberItemIdRegistry memberItemIdRegistryBuilder = MemberItemIdRegistryBuilder.build();
+		ItemAddServiceResponse expectedResponse = new ItemAddServiceResponse(memberItemIdRegistryBuilder.itemIds());
 
-		itemIdRegistry.itemIds()
+		memberItemIdRegistryBuilder.itemIds()
 			.forEach(itemId -> itemSetup.saveOne(itemId));
 
 		// when
-		ItemAddServiceResponse actualResponse = itemService.addItem(itemIdRegistry);
+		ItemAddServiceResponse actualResponse = itemService.addItem(memberItemIdRegistryBuilder);
 
 		// then
 		assertThat(actualResponse)

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

@@ -35,11 +35,16 @@ public class MemberItem extends BaseEntity {
 	@JoinColumn(name = "item_id", nullable = false)
 	private Item item;
 
+	@Column(name = "folder_id")
+	private Long folderId;
+
 	public MemberItem(
 		final Long memberId,
-		final Item item
+		final Item item,
+		final Long folderId
 	) {
 		this.memberId = Objects.requireNonNull(memberId);
 		this.item = Objects.requireNonNull(item);
+		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);
+	}
+}