fix: menu mapper feature

TEAM-SYLUV · Jul 29, 2024 · 4638ce7 · 4638ce7
1 parent f2f4e8a
commit 4638ce7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/api-module/src/main/java/com/likelion/apimodule/store/application/StoreInfoUseCase.java b/api-module/src/main/java/com/likelion/apimodule/store/application/StoreInfoUseCase.java
@@ -4,6 +4,7 @@
 import com.likelion.apimodule.store.dto.MenuDetailDTO;
 import com.likelion.apimodule.store.dto.StoreInfo;
 import com.likelion.apimodule.store.dto.StoreResponse;
+import com.likelion.apimodule.store.mapper.MenuMapper;
 import com.likelion.coremodule.cart.domain.Cart;
 import com.likelion.coremodule.cart.service.CartQueryService;
 import com.likelion.coremodule.menu.domain.Menu;
@@ -22,7 +23,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -60,22 +60,10 @@ public List<StoreInfo> findStoreInfo() {
         return storeInfoList;
     }
 
-    public StoreInfo findStoreInfoByMenuId(Long menuId) {
+    public MenuDetailDTO findMenuById(Long menuId) {
+
         Menu menu = menuQueryService.findMenuById(menuId);
-        Store store = menu.getStore();
-
-        List<Menu> menus = menuQueryService.findMenusByStoreId(store.getId());
-        List<MenuDetailDTO> menuDetails = menus.stream()
-                .map(m -> new MenuDetailDTO(
-                        m.getId(),
-                        m.getName(),
-                        m.getPrice(),
-                        m.getContent(),
-                        m.getImageUrl()))
-                .collect(Collectors.toList());
-
-        List<Review> reviews = reviewQueryService.findReviewsByStoreId(store.getId());
-        return getStoreInfo(store, reviews, menuDetails);
+        return MenuMapper.toInfoDTO(menu);
     }
 
     private StoreInfo getStoreInfo(Store store, List<Review> reviews, List<MenuDetailDTO> menuDetails) {

diff --git a/api-module/src/main/java/com/likelion/apimodule/store/mapper/MenuMapper.java b/api-module/src/main/java/com/likelion/apimodule/store/mapper/MenuMapper.java
@@ -0,0 +1,20 @@
+package com.likelion.apimodule.store.mapper;
+
+import com.likelion.apimodule.store.dto.MenuDetailDTO;
+import com.likelion.coremodule.menu.domain.Menu;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class MenuMapper {
+
+    public static MenuDetailDTO toInfoDTO(Menu menu) {
+        return new MenuDetailDTO(
+                menu.getId(),
+                menu.getName(),
+                menu.getPrice(),
+                menu.getContent(),
+                menu.getImageUrl()
+        );
+    }
+}
diff --git a/api-module/src/main/java/com/likelion/apimodule/store/presentation/StoreController.java b/api-module/src/main/java/com/likelion/apimodule/store/presentation/StoreController.java
@@ -1,6 +1,7 @@
 package com.likelion.apimodule.store.presentation;
 
 import com.likelion.apimodule.store.application.StoreInfoUseCase;
+import com.likelion.apimodule.store.dto.MenuDetailDTO;
 import com.likelion.apimodule.store.dto.StoreInfo;
 import com.likelion.commonmodule.exception.common.ApplicationResponse;
 import com.likelion.commonmodule.security.util.AuthConsts;
@@ -52,9 +53,9 @@ public ApplicationResponse<List<StoreInfo>> getStoreInfo() {
             }
     )
     @Operation(summary = "가게 메뉴 정보 확인 API", description = "가게 메뉴 정보 확인 API 입니다.")
-    public ApplicationResponse<StoreInfo> getStoreInfoByMenuId(@PathVariable Long menuId) {
+    public ApplicationResponse<MenuDetailDTO> getMenuInfoById(@PathVariable Long menuId) {
 
-        StoreInfo info = storeInfoUseCase.findStoreInfoByMenuId(menuId);
+        MenuDetailDTO info = storeInfoUseCase.findMenuById(menuId);
         return ApplicationResponse.ok(info);
     }