Feat/#174/auction search optimization

api/src/main/java/dev/handsup/auction/controller/AuctionApiController.java

@@ -1,23 +1,18 @@
 package dev.handsup.auction.controller;
 
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import dev.handsup.auction.dto.request.RegisterAuctionRequest;
 import dev.handsup.auction.dto.response.AuctionDetailResponse;
-import dev.handsup.auction.dto.response.RecommendAuctionResponse;
 import dev.handsup.auction.service.AuctionService;
 import dev.handsup.auth.annotation.NoAuth;
 import dev.handsup.auth.jwt.JwtAuthorization;
-import dev.handsup.common.dto.PageResponse;
 import dev.handsup.user.domain.User;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -54,32 +49,4 @@ public ResponseEntity<AuctionDetailResponse> getAuctionDetail(@PathVariable("auc
 		AuctionDetailResponse response = auctionService.getAuctionDetail(auctionId);
 		return ResponseEntity.ok(response);
 	}
-
-	@NoAuth
-	@Operation(summary = "경매 추천 API", description = "정렬 조건에 따라 경매를 추천한다.")
-	@ApiResponse(useReturnTypeSchema = true)
-	@GetMapping("/recommend")
-	@Cacheable(cacheNames = "auctions")
-	public ResponseEntity<PageResponse<RecommendAuctionResponse>> getRecommendAuctions(
-		@RequestParam(value = "si", required = false) String si,
-		@RequestParam(value = "gu", required = false) String gu,
-		@RequestParam(value = "dong", required = false) String dong,
-		Pageable pageable
-	) {
-		PageResponse<RecommendAuctionResponse> response = auctionService.getRecommendAuctions(si, gu, dong, pageable);
-		return ResponseEntity.ok(response);
-	}
-
-	@Operation(summary = "유저 선호 카테고리 경매 조회 API", description = "유저가 선호하는 카테고리의 경매를 조회한다.")
-	@ApiResponse(useReturnTypeSchema = true)
-	@GetMapping("/recommend/category")
-	public ResponseEntity<PageResponse<RecommendAuctionResponse>> getUserPreferredCategoryAuctions(
-		@Parameter(hidden = true) @JwtAuthorization User user,
-		Pageable pageable
-	) {
-		PageResponse<RecommendAuctionResponse> response = auctionService.getUserPreferredCategoryAuctions(user,
-			pageable);
-		return ResponseEntity.ok(response);
-	}
-
 }

api/src/main/java/dev/handsup/recommend/controller/RecommendApiController.java

@@ -0,0 +1,82 @@
+package dev.handsup.recommend.controller;
+
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import dev.handsup.auth.annotation.NoAuth;
+import dev.handsup.auth.jwt.JwtAuthorization;
+import dev.handsup.common.dto.PageResponse;
+import dev.handsup.recommend.dto.RecommendAuctionResponse;
+import dev.handsup.recommend.service.RecommendService;
+import dev.handsup.user.domain.User;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+
+@Tag(name = "홈 추천 API")
+@RestController
+@RequiredArgsConstructor
+public class RecommendApiController {
+	private final RecommendService recommendService;
+
+	@NoAuth
+	@Operation(summary = "경매 추천 API", description = "정렬 조건에 따라 경매를 추천한다.")
+	@ApiResponse(useReturnTypeSchema = true)
+	@GetMapping("/api/auctions/recommend")
+	@Cacheable(cacheNames = "auctions")
+	public ResponseEntity<PageResponse<RecommendAuctionResponse>> getRecommendAuctions(
+		@RequestParam(value = "si", required = false) String si,
+		@RequestParam(value = "gu", required = false) String gu,
+		@RequestParam(value = "dong", required = false) String dong,
+		Pageable pageable
+	) {
+		PageResponse<RecommendAuctionResponse> response = recommendService.getRecommendAuctions(si, gu, dong, pageable);
+		return ResponseEntity.ok(response);
+	}
+
+	@NoAuth
+	@Operation(summary = "성능 개선된 경매 추천 API", description = "정렬 조건에 따라 경매를 추천한다.")
+	@ApiResponse(useReturnTypeSchema = true)
+	@GetMapping("/api/v2/auctions/recommend")
+	@Cacheable(cacheNames = "auctions")
+	public ResponseEntity<PageResponse<RecommendAuctionResponse>> getRecommendAuctionsV2(
+		@RequestParam(value = "si", required = false) String si,
+		@RequestParam(value = "gu", required = false) String gu,
+		@RequestParam(value = "dong", required = false) String dong,
+		Pageable pageable
+	) {
+		PageResponse<RecommendAuctionResponse> response = recommendService.getRecommendAuctionsV2(si, gu, dong, pageable);
+		return ResponseEntity.ok(response);
+	}
+
+	@Operation(summary = "유저 선호 카테고리 경매 조회 API", description = "유저가 선호하는 카테고리의 경매를 조회한다.")
+	@ApiResponse(useReturnTypeSchema = true)
+	@GetMapping("/api/auctions/recommend/category")
+	public ResponseEntity<PageResponse<RecommendAuctionResponse>> getUserPreferredCategoryAuctions(
+		@Parameter(hidden = true) @JwtAuthorization User user,
+		Pageable pageable
+	) {
+		PageResponse<RecommendAuctionResponse> response = recommendService.getUserPreferredCategoryAuctions(user,
+			pageable);
+		return ResponseEntity.ok(response);
+	}
+
+	@Operation(summary = "성능 개선된 유저 선호 카테고리 경매 조회 API", description = "유저가 선호하는 카테고리의 경매를 조회한다.")
+	@ApiResponse(useReturnTypeSchema = true)
+	@GetMapping("/api/v2/auctions/recommend/category")
+	public ResponseEntity<PageResponse<RecommendAuctionResponse>> getUserPreferredCategoryAuctionsV2(
+		@Parameter(hidden = true) @JwtAuthorization User user,
+		Pageable pageable
+	) {
+		PageResponse<RecommendAuctionResponse> response = recommendService.getUserPreferredCategoryAuctionsV2(user,
+			pageable);
+		return ResponseEntity.ok(response);
+	}
+}
+

api/src/main/java/dev/handsup/search/controller/SearchApiController.java

@@ -5,13 +5,12 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import dev.handsup.auction.dto.request.AuctionSearchCondition;
-import dev.handsup.auction.dto.response.AuctionSimpleResponse;
 import dev.handsup.auth.annotation.NoAuth;
 import dev.handsup.common.dto.PageResponse;
+import dev.handsup.search.dto.AuctionSearchCondition;
+import dev.handsup.search.dto.AuctionSearchResponse;
 import dev.handsup.search.dto.PopularKeywordsResponse;
 import dev.handsup.search.service.SearchService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -23,25 +22,35 @@
 @Tag(name = "검색 API")
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/auctions/search")
 public class SearchApiController {
 	private final SearchService searchService;
 
 	@NoAuth
 	@Operation(summary = "경매 검색 API", description = "경매를 검색한다")
 	@ApiResponse(useReturnTypeSchema = true)
-	@PostMapping
-	public ResponseEntity<PageResponse<AuctionSimpleResponse>> searchAuctions(
+	@PostMapping("/api/auctions/search")
+	public ResponseEntity<PageResponse<AuctionSearchResponse>> searchAuctions(
 		@Valid @RequestBody AuctionSearchCondition condition,
 		Pageable pageable) {
-		PageResponse<AuctionSimpleResponse> response = searchService.searchAuctions(condition, pageable);
+		PageResponse<AuctionSearchResponse> response = searchService.searchAuctions(condition, pageable);
+		return ResponseEntity.ok(response);
+	}
+
+	@NoAuth
+	@Operation(summary = "최적화된 경매 검색 API", description = "경매를 검색한다")
+	@ApiResponse(useReturnTypeSchema = true)
+	@PostMapping("/api/v2/auctions/search")
+	public ResponseEntity<PageResponse<AuctionSearchResponse>> searchAuctionsV2(
+		@Valid @RequestBody AuctionSearchCondition condition,
+		Pageable pageable) {
+		PageResponse<AuctionSearchResponse> response = searchService.searchAuctionsV2(condition, pageable);
 		return ResponseEntity.ok(response);
 	}
 
 	@NoAuth
 	@Operation(summary = "인기 검색어 조회 API", description = "인기 검색어를 조회한다.")
 	@ApiResponse(useReturnTypeSchema = true)
-	@GetMapping("/popular")
+	@GetMapping("/api/auctions/search/popular")
 	public ResponseEntity<PopularKeywordsResponse> getPopularKeywords() {
 		PopularKeywordsResponse response = searchService.getPopularKeywords();
 		return ResponseEntity.ok(response);

api/src/test/java/dev/handsup/auction/controller/AuctionApiControllerTest.java

@@ -12,21 +12,17 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.util.ReflectionTestUtils;
-import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 
 import dev.handsup.auction.domain.Auction;
 import dev.handsup.auction.domain.auction_field.PurchaseTime;
 import dev.handsup.auction.domain.auction_field.TradeMethod;
 import dev.handsup.auction.domain.auction_field.TradingLocation;
 import dev.handsup.auction.domain.product.Product;
 import dev.handsup.auction.domain.product.ProductStatus;
-import dev.handsup.auction.domain.product.product_category.PreferredProductCategory;
 import dev.handsup.auction.domain.product.product_category.ProductCategory;
 import dev.handsup.auction.dto.request.RegisterAuctionRequest;
 import dev.handsup.auction.exception.AuctionErrorCode;
 import dev.handsup.auction.repository.auction.AuctionRepository;
-import dev.handsup.auction.repository.product.PreferredProductCategoryRepository;
 import dev.handsup.auction.repository.product.ProductCategoryRepository;
 import dev.handsup.common.support.ApiTestSupport;
 import dev.handsup.fixture.AuctionFixture;
@@ -42,9 +38,6 @@ class AuctionApiControllerTest extends ApiTestSupport {
 	@Autowired
 	private ProductCategoryRepository productCategoryRepository;
 
-	@Autowired
-	private PreferredProductCategoryRepository preferredProductCategoryRepository;
-
 	@BeforeEach
 	void setUp() {
 		productCategory = ProductFixture.productCategory(DIGITAL_DEVICE);
@@ -128,96 +121,4 @@ void getAuctionDetail() throws Exception {
 			.andExpect(jsonPath("$.tradeDong").value(tradingLocation.getDong()))
 			.andExpect(jsonPath("$.bookmarkCount").value(auction.getBookmarkCount()));
 	}
-
-	@DisplayName("[정렬 조건과 지역 필터에 따라 경매글 목록을 반환한다.]")
-	@Test
-	void getRecommendAuctionsWithFilter() throws Exception {
-		//given
-		String si = "서울시", gu = "서초구", dong1 = "방배동", dong2 = "반포동";
-		String earlyEndDate = "2024-03-02", lateEndDate = "2024-03-10";
-		Auction auction1 = AuctionFixture.auction(productCategory, lateEndDate, si, gu, dong1);
-		Auction auction2 = AuctionFixture.auction(productCategory, earlyEndDate, si, gu, dong1);
-		Auction auction3 = AuctionFixture.auction(productCategory, lateEndDate, si, gu, dong2);
-		auctionRepository.saveAll(List.of(auction1, auction2, auction3));
-
-		//when
-		mockMvc.perform(get("/api/auctions/recommend").param("sort", "마감일")
-				.param("si", si)
-				.param("gu", gu)
-				.param("dong", dong1)
-				.contentType(APPLICATION_JSON))
-			.andExpect(status().isOk())
-			.andExpect(jsonPath("$.size").value(2))
-			.andExpect(jsonPath("$.content[0].auctionId").value(auction2.getId()))
-			.andExpect(jsonPath("$.content[0].endDate").value(auction2.getEndDate().atStartOfDay().toString()))
-			.andExpect(jsonPath("$.content[1].auctionId").value(auction1.getId()))
-			.andExpect(jsonPath("$.content[1].endDate").value(auction1.getEndDate().atStartOfDay().toString()))
-			.andExpect(jsonPath("$.hasNext").value(false));
-	}
-
-	@DisplayName("[정렬 조건에 따라 경매글 목록을 반환한다.]")
-	@Test
-	void getRecommendAuctionsWithOutFilter() throws Exception {
-		//given
-		Auction auction1 = AuctionFixture.auction(productCategory);
-		Auction auction2 = AuctionFixture.auction(productCategory);
-		Auction auction3 = AuctionFixture.auction(productCategory);
-		auctionRepository.saveAll(List.of(auction1, auction2, auction3));
-
-		//when
-		mockMvc.perform(get("/api/auctions/recommend").param("sort", "최근생성").contentType(APPLICATION_JSON))
-			.andExpect(status().isOk())
-			.andExpect(jsonPath("$.size").value(3))
-			.andExpect(jsonPath("$.content[0].auctionId").value(auction3.getId()))
-			.andExpect(jsonPath("$.content[1].auctionId").value(auction2.getId()))
-			.andExpect(jsonPath("$.content[2].auctionId").value(auction1.getId()))
-			.andExpect(jsonPath("$.hasNext").value(false));
-	}
-
-	@DisplayName("[정렬 조건이 없을 시 예외를 반환한다.]")
-	@Test
-	void getRecommendAuctions_fails() throws Exception {
-		mockMvc.perform(get("/api/auctions/recommend").contentType(APPLICATION_JSON))
-			.andDo(MockMvcResultHandlers.print())
-			.andExpect(jsonPath("$.message").value(AuctionErrorCode.EMPTY_SORT_INPUT.getMessage()))
-			.andExpect(jsonPath("$.code").value(AuctionErrorCode.EMPTY_SORT_INPUT.getCode()));
-	}
-
-	@DisplayName("[정렬 조건이 잘못되면 예외를 반환한다.]")
-	@Test
-	void getRecommendAuctions_fails2() throws Exception {
-		mockMvc.perform(get("/api/auctions/recommend").contentType(APPLICATION_JSON).param("sort", "NAN"))
-			.andDo(MockMvcResultHandlers.print())
-			.andExpect(jsonPath("$.message").value(AuctionErrorCode.INVALID_SORT_INPUT.getMessage()))
-			.andExpect(jsonPath("$.code").value(AuctionErrorCode.INVALID_SORT_INPUT.getCode()));
-	}
-
-	@DisplayName("[유저 선호 카테고리 경매를 북마크 순으로 정렬한다.]")
-	@Test
-	void getUserPreferredCategoryAuctions() throws Exception {
-		ProductCategory productCategory2 = productCategoryRepository.save(ProductCategory.from("생활/주방"));
-		ProductCategory notPreferredProductCategory = productCategoryRepository.save(ProductCategory.from("티켓/교환권"));
-
-		preferredProductCategoryRepository.saveAll(List.of(
-			PreferredProductCategory.of(user, productCategory),
-			PreferredProductCategory.of(user, productCategory2)
-		));
-		Auction auction1 = AuctionFixture.auction(productCategory);
-		ReflectionTestUtils.setField(auction1, "bookmarkCount", 3);
-		Auction auction2 = AuctionFixture.auction(productCategory2);
-		ReflectionTestUtils.setField(auction2, "bookmarkCount", 5);
-
-		Auction auction3 = AuctionFixture.auction(notPreferredProductCategory);
-		auctionRepository.saveAll(List.of(auction1, auction2, auction3));
-
-		//when
-		mockMvc.perform(get("/api/auctions/recommend/category")
-				.header(AUTHORIZATION, "Bearer " + accessToken)
-				.contentType(APPLICATION_JSON))
-			.andExpect(status().isOk())
-			.andExpect(jsonPath("$.size").value(2))
-			.andExpect(jsonPath("$.content[0].auctionId").value(auction2.getId()))
-			.andExpect(jsonPath("$.content[1].auctionId").value(auction1.getId()))
-			.andExpect(jsonPath("$.hasNext").value(false));
-	}
 }