Merge pull request #65 from 28th-meetup/feat/search-1121

fix: 음식 검색시 응답형식 수정
28th-meetup · Nov 21, 2023 · 7af1a97 · 7af1a97
2 parents b095cc6 + c62da35
commit 7af1a97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/com/kusitms/jipbap/store/StoreService.java b/src/main/java/com/kusitms/jipbap/store/StoreService.java
@@ -7,6 +7,7 @@
 import com.kusitms.jipbap.common.exception.S3RegisterFailureException;
 import com.kusitms.jipbap.common.utils.S3Utils;
 import com.kusitms.jipbap.food.dto.FoodDto;
+import com.kusitms.jipbap.food.dto.FoodPreviewResponse;
 import com.kusitms.jipbap.store.dto.*;
 import com.kusitms.jipbap.store.exception.StoreExistsException;
 import com.kusitms.jipbap.store.exception.StoreNotExistsException;
@@ -138,8 +139,8 @@ public StoreFoodResponseDto searchStoresAndFoods(String email, Pageable pageable
                 )
                 .collect(Collectors.toList());
 
-        List<FoodDto> foodList = foodRepository.searchByNameOrderBySort(user, pageable, keyword, standard, order)
-                .stream().map(f -> new FoodDto(f.getId(), f.getStore().getId(), f.getCategory().getId(), f.getName(), f.getDollarPrice(), f.getCanadaPrice(), f.getDescription(), f.getImage()))
+        List<FoodPreviewResponse> foodList = foodRepository.searchByNameOrderBySort(user, pageable, keyword, standard, order)
+                .stream().map(f -> new FoodPreviewResponse(f.getId(), f.getName(), f.getStore().getId(), f.getStore().getName(), f.getDollarPrice(), f.getCanadaPrice(), f.getImage(), f.getStore().getAvgRate()))
                 .collect(Collectors.toList());
 
 

diff --git a/src/main/java/com/kusitms/jipbap/store/dto/StoreFoodResponseDto.java b/src/main/java/com/kusitms/jipbap/store/dto/StoreFoodResponseDto.java
@@ -1,6 +1,7 @@
 package com.kusitms.jipbap.store.dto;
 
 import com.kusitms.jipbap.food.dto.FoodDto;
+import com.kusitms.jipbap.food.dto.FoodPreviewResponse;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -15,5 +16,5 @@
 public class StoreFoodResponseDto {
 
     private List<StoreDetailResponseDto> stores;
-    private List<FoodDto> foods;
+    private List<FoodPreviewResponse> foods;
 }