diff --git a/src/main/java/com/sparta/tdd/domain/ai/controller/AiController.java b/src/main/java/com/sparta/tdd/domain/ai/controller/AiController.java deleted file mode 100644 index 14f2b8c7..00000000 --- a/src/main/java/com/sparta/tdd/domain/ai/controller/AiController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.sparta.tdd.domain.ai.controller; - -import com.sparta.tdd.domain.ai.dto.AiRequestDto; -import com.sparta.tdd.domain.ai.dto.AiResponseDto; -import com.sparta.tdd.domain.ai.service.AiService; -import com.sparta.tdd.domain.auth.UserDetailsImpl; -import io.swagger.v3.oas.annotations.Operation; -import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.security.core.annotation.AuthenticationPrincipal; -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 java.net.URI; - -@RestController -@RequiredArgsConstructor -@RequestMapping("/v1/ai") -public class AiController { - - private final AiService aiService; - - @PostMapping("/req") - @Operation(summary = "AI 글 생성") - public ResponseEntity createComment(@RequestBody AiRequestDto requestDto, - @AuthenticationPrincipal UserDetailsImpl userDetails) { - AiResponseDto createdComment = aiService.createComment(requestDto, userDetails.getUserId()); - - return ResponseEntity.ok(createdComment); - } -} diff --git a/src/main/java/com/sparta/tdd/domain/ai/dto/AiRequestDto.java b/src/main/java/com/sparta/tdd/domain/ai/dto/AiRequestDto.java deleted file mode 100644 index 38cee72c..00000000 --- a/src/main/java/com/sparta/tdd/domain/ai/dto/AiRequestDto.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.sparta.tdd.domain.ai.dto; - -public record AiRequestDto( - String comment -) { -} diff --git a/src/main/java/com/sparta/tdd/domain/ai/dto/AiResponseDto.java b/src/main/java/com/sparta/tdd/domain/ai/dto/AiResponseDto.java deleted file mode 100644 index adcf8ea9..00000000 --- a/src/main/java/com/sparta/tdd/domain/ai/dto/AiResponseDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.sparta.tdd.domain.ai.dto; - -import com.sparta.tdd.domain.ai.entity.Ai; - -import java.time.LocalDateTime; -import java.util.UUID; - -public record AiResponseDto( - UUID id, - String inputText, - String outputText, - LocalDateTime createdAt -) { - public static AiResponseDto from(Ai ai) { - return new AiResponseDto( - ai.getId(), - ai.getInputText(), - ai.getOutputText(), - ai.getCreatedAt() - ); - } -} diff --git a/src/main/java/com/sparta/tdd/domain/ai/service/AiService.java b/src/main/java/com/sparta/tdd/domain/ai/service/AiService.java index 810d1f8a..a81aaeeb 100644 --- a/src/main/java/com/sparta/tdd/domain/ai/service/AiService.java +++ b/src/main/java/com/sparta/tdd/domain/ai/service/AiService.java @@ -2,17 +2,14 @@ import com.google.genai.Client; import com.google.genai.types.GenerateContentConfig; -import com.google.genai.types.GenerateContentResponse; -import com.sparta.tdd.domain.ai.dto.AiRequestDto; -import com.sparta.tdd.domain.ai.dto.AiResponseDto; import com.sparta.tdd.domain.ai.entity.Ai; import com.sparta.tdd.domain.ai.repository.AiRepository; -import com.sparta.tdd.domain.auth.UserDetailsImpl; import com.sparta.tdd.domain.user.entity.User; import com.sparta.tdd.domain.user.repository.UserRepository; +import com.sparta.tdd.global.exception.BusinessException; +import com.sparta.tdd.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @Slf4j(topic = "AI 코멘트 생성") @@ -25,28 +22,31 @@ public class AiService { private final Client client; private final GenerateContentConfig config; - public AiResponseDto createComment(AiRequestDto requestDto, Long userId) { + public String createComment(String menuName, Long userId) { User user = userRepository.findById(userId).orElseThrow(() -> - new IllegalArgumentException("존재하지 않는 회원입니다.") + new BusinessException(ErrorCode.USER_NOT_FOUND) ); - String response = generateText(requestDto.comment()); - Ai ai = Ai.of(requestDto.comment(), response, user); + String response = generateText(menuName); + Ai ai = Ai.of(menuName, response, user); aiRepository.save(ai); log.info(getLog(ai)); - return AiResponseDto.from(ai); + return response; } + + private String generateText(String comment) { return client.models.generateContent("gemini-2.5-flash", comment, config).text(); } + private String getLog(Ai ai) { return String.format( - "AI Comment Log => User: %d | Input: \"%s\" | Output: \"%s\" | CreatedAt: %s", - ai.getUser().getId(), - ai.getInputText(), - ai.getOutputText(), - ai.getCreatedAt() + "AI Comment Log => User: %d | Input: \"%s\" | Output: \"%s\" | CreatedAt: %s", + ai.getUser().getId(), + ai.getInputText(), + ai.getOutputText(), + ai.getCreatedAt() ); } } diff --git a/src/main/java/com/sparta/tdd/domain/menu/dto/MenuRequestDto.java b/src/main/java/com/sparta/tdd/domain/menu/dto/MenuRequestDto.java index 08d98b65..f409d5f3 100644 --- a/src/main/java/com/sparta/tdd/domain/menu/dto/MenuRequestDto.java +++ b/src/main/java/com/sparta/tdd/domain/menu/dto/MenuRequestDto.java @@ -9,12 +9,27 @@ public record MenuRequestDto( String name, String description, Integer price, - String imageUrl + String imageUrl, + boolean useAiDescription ) { + public Menu toEntity(Store store, String description) { + return Menu.builder() + .name(name) + .description(description) + .price(price) + .imageUrl(imageUrl) + .store(store) + .build(); + } + public Menu toEntity(Store store) { return Menu.builder() - .dto(this) - .store(store).build(); + .name(name) + .description(description) + .price(price) + .imageUrl(imageUrl) + .store(store) + .build(); } } diff --git a/src/main/java/com/sparta/tdd/domain/menu/entity/Menu.java b/src/main/java/com/sparta/tdd/domain/menu/entity/Menu.java index e0afee23..72ceb6c6 100644 --- a/src/main/java/com/sparta/tdd/domain/menu/entity/Menu.java +++ b/src/main/java/com/sparta/tdd/domain/menu/entity/Menu.java @@ -51,11 +51,11 @@ public class Menu extends BaseEntity { private Store store; @Builder - public Menu(MenuRequestDto dto, Store store) { - this.name = dto.name(); - this.description = dto.description(); - this.price = dto.price(); - this.imageUrl = dto.imageUrl(); + public Menu(String name, String description, Integer price, String imageUrl, Store store) { + this.name = name; + this.description = description; + this.price = price; + this.imageUrl = imageUrl; this.store = store; } diff --git a/src/main/java/com/sparta/tdd/domain/menu/service/MenuService.java b/src/main/java/com/sparta/tdd/domain/menu/service/MenuService.java index ad172293..e576a200 100644 --- a/src/main/java/com/sparta/tdd/domain/menu/service/MenuService.java +++ b/src/main/java/com/sparta/tdd/domain/menu/service/MenuService.java @@ -1,5 +1,6 @@ package com.sparta.tdd.domain.menu.service; +import com.sparta.tdd.domain.ai.service.AiService; import com.sparta.tdd.domain.menu.dto.MenuRequestDto; import com.sparta.tdd.domain.menu.dto.MenuResponseDto; import com.sparta.tdd.domain.menu.entity.Menu; @@ -9,6 +10,8 @@ import com.sparta.tdd.domain.user.entity.User; import com.sparta.tdd.domain.user.enums.UserAuthority; import com.sparta.tdd.domain.user.repository.UserRepository; +import com.sparta.tdd.global.exception.BusinessException; +import com.sparta.tdd.global.exception.ErrorCode; import java.util.List; import java.util.UUID; import lombok.RequiredArgsConstructor; @@ -23,6 +26,7 @@ public class MenuService { private final MenuRepository menuRepository; private final StoreRepository storeRepository; private final UserRepository userRepository; + private final AiService aiService; public List getMenus(UUID storeId, UserAuthority authority) { List menus; @@ -40,7 +44,7 @@ public List getMenus(UUID storeId, UserAuthority authority) { public MenuResponseDto getMenu(UUID storeId, UUID menuId, UserAuthority authority) { Menu menu = findMenu(storeId, menuId); if (authority.isCustomerOrManager() && menu.isHidden()) { - throw new IllegalArgumentException("숨겨진 메뉴입니다."); + throw new BusinessException(ErrorCode.IS_HIDDEN_MENU); } return MenuResponseDto.from(menu); } @@ -50,8 +54,15 @@ public MenuResponseDto createMenu(UUID storeId, MenuRequestDto menuRequestDto, L User user = findUser(userId); Store store = findStore(storeId); validateUserOnMenu(user, store); + Menu menu; + + if (menuRequestDto.useAiDescription()) { + String aiDescription = aiService.createComment(menuRequestDto.name(), userId); + menu = menuRequestDto.toEntity(store, aiDescription); + } else { + menu = menuRequestDto.toEntity(store); + } - Menu menu = menuRequestDto.toEntity(store); menuRepository.save(menu); return MenuResponseDto.from(menu); @@ -89,22 +100,22 @@ public void deleteMenu(UUID storeId, UUID menuId, Long userId) { private Menu findMenu(UUID storeId, UUID menuId) { return menuRepository.findByIdAndStoreIdAndIsDeletedFalse(menuId, storeId) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 메뉴입니다.")); + .orElseThrow(() -> new BusinessException(ErrorCode.MENU_NOT_FOUND)); } private Store findStore(UUID storeId) { return storeRepository.findById(storeId) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 가게입니다.")); + .orElseThrow(() -> new BusinessException(ErrorCode.STORE_NOT_FOUND)); } private User findUser(Long userId) { return userRepository.findById(userId) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자입니다.")); + .orElseThrow(() -> new BusinessException(ErrorCode.USER_NOT_FOUND)); } private void validateUserOnMenu(User user, Store store) { if (!store.isOwner(user)) { - throw new IllegalArgumentException("권한이 없는 사용자입니다."); + throw new BusinessException(ErrorCode.STORE_OWNERSHIP_DENIED); } } } diff --git a/src/main/java/com/sparta/tdd/global/exception/ErrorCode.java b/src/main/java/com/sparta/tdd/global/exception/ErrorCode.java index 2720a6a3..6f7c465b 100644 --- a/src/main/java/com/sparta/tdd/global/exception/ErrorCode.java +++ b/src/main/java/com/sparta/tdd/global/exception/ErrorCode.java @@ -40,13 +40,14 @@ public enum ErrorCode { // ORDER 도메인 관련 ORDER_PERMISSION_DENIED(HttpStatus.FORBIDDEN, "권한이 없습니다."), - MENU_NOT_IN_STORE(HttpStatus.BAD_REQUEST, "해당 가게의 메뉴가 아닙니다."), - MENU_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 메뉴가 포함되어 있습니다."), - MENU_INVALID_INFO(HttpStatus.BAD_REQUEST, "메뉴 정보가 올바르지 않습니다."), - ORDER_CANCELLATION_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "주문 생성 후 5분이 지나 취소할 수 없습니다."), ORDER_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 주문입니다."), + ORDER_CANCELLATION_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "주문 생성 후 5분이 지나 취소할 수 없습니다."), // MENU 도메인 관련 + IS_HIDDEN_MENU(HttpStatus.BAD_REQUEST, "숨겨진 메뉴입니다."), + MENU_NOT_IN_STORE(HttpStatus.BAD_REQUEST, "해당 가게의 메뉴가 아닙니다."), + MENU_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 메뉴가 포함되어 있습니다."), + MENU_INVALID_INFO(HttpStatus.BAD_REQUEST, "메뉴 정보가 올바르지 않습니다."), // REVIEW 도메인 관련 REVIEW_NOT_OWNED(HttpStatus.FORBIDDEN, "본인의 리뷰만 수정/삭제할 수 있습니다."), diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dc66f987..1dc3735d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -99,5 +99,4 @@ ai: naver: client: id: testClientId - secret: testClientSecret - + secret: testClientSecret \ No newline at end of file diff --git a/src/test/java/com/sparta/tdd/domain/cart/repository/CartItemRepositoryTest.java b/src/test/java/com/sparta/tdd/domain/cart/repository/CartItemRepositoryTest.java index 8190d2d4..f72a5d3c 100644 --- a/src/test/java/com/sparta/tdd/domain/cart/repository/CartItemRepositoryTest.java +++ b/src/test/java/com/sparta/tdd/domain/cart/repository/CartItemRepositoryTest.java @@ -68,17 +68,19 @@ void setUp() { // 테스트 메뉴 생성 menu1 = Menu.builder() - .dto(new com.sparta.tdd.domain.menu.dto.MenuRequestDto( - "김치찌개", "맛있는 김치찌개", 8000, null - )) + .name("김치찌개") + .description("맛있는 김치찌개") + .price(8000) + .imageUrl(null) .store(store) .build(); em.persist(menu1); menu2 = Menu.builder() - .dto(new com.sparta.tdd.domain.menu.dto.MenuRequestDto( - "된장찌개", "구수한 된장찌개", 7000, null - )) + .name("된장찌개") + .description("구수한 된장찌개") + .price(7000) + .imageUrl(null) .store(store) .build(); em.persist(menu2); diff --git a/src/test/java/com/sparta/tdd/domain/cart/repository/CartRepositoryTest.java b/src/test/java/com/sparta/tdd/domain/cart/repository/CartRepositoryTest.java index d51f8760..eb33b2cb 100644 --- a/src/test/java/com/sparta/tdd/domain/cart/repository/CartRepositoryTest.java +++ b/src/test/java/com/sparta/tdd/domain/cart/repository/CartRepositoryTest.java @@ -66,9 +66,10 @@ void setUp() { // 테스트 메뉴 생성 menu = Menu.builder() - .dto(new com.sparta.tdd.domain.menu.dto.MenuRequestDto( - "김치찌개", "맛있는 김치찌개", 8000, null - )) + .name("김치찌개") + .description("맛있는 김치찌개") + .price(8000) + .imageUrl(null) .store(store) .build(); em.persist(menu); diff --git a/src/test/java/com/sparta/tdd/domain/cart/service/CartServiceTest.java b/src/test/java/com/sparta/tdd/domain/cart/service/CartServiceTest.java index c51f3f98..7095cfd2 100644 --- a/src/test/java/com/sparta/tdd/domain/cart/service/CartServiceTest.java +++ b/src/test/java/com/sparta/tdd/domain/cart/service/CartServiceTest.java @@ -91,9 +91,10 @@ void setUp() { // 메뉴 menu = Menu.builder() - .dto(new com.sparta.tdd.domain.menu.dto.MenuRequestDto( - "김치찌개", "맛있는 김치찌개", 8000, null - )) + .name("김치찌개") + .description("맛있는 김치찌개") + .price(8000) + .imageUrl(null) .store(store) .build(); setId(menu, UUID.randomUUID()); @@ -266,9 +267,10 @@ void addItemToCart_DifferentStore_Fail() { setId(differentStore, UUID.randomUUID()); Menu differentMenu = Menu.builder() - .dto(new com.sparta.tdd.domain.menu.dto.MenuRequestDto( - "짜장면", "맛있는 짜장면", 6000, null - )) + .name("짜장면") + .description("맛있는 짜장면") + .price(6000) + .imageUrl(null) .store(differentStore) .build(); setId(differentMenu, menuId); diff --git a/src/test/java/com/sparta/tdd/domain/menu/MenuIntegrationTest.java b/src/test/java/com/sparta/tdd/domain/menu/MenuIntegrationTest.java index de60d569..14acff0f 100644 --- a/src/test/java/com/sparta/tdd/domain/menu/MenuIntegrationTest.java +++ b/src/test/java/com/sparta/tdd/domain/menu/MenuIntegrationTest.java @@ -71,15 +71,11 @@ void setUp() { .build(); storeRepository.save(store); - MenuRequestDto dto = MenuRequestDto.builder() + menu = Menu.builder() .name("menu") .description("this is menu") .price(30000) .imageUrl("this is image url") - .build(); - - menu = Menu.builder() - .dto(dto) .store(store) .build(); menuRepository.save(menu); @@ -264,7 +260,7 @@ void ownerDeletesMenu() throws Exception { mockMvc.perform( get("/v1/store/{storeId}/menu/{menuId}", storeId, menuId) .with(csrf())) - .andExpectAll(status().isBadRequest()); + .andExpectAll(status().isNotFound()); } @Test diff --git a/src/test/java/com/sparta/tdd/domain/menu/service/MenuServiceTest.java b/src/test/java/com/sparta/tdd/domain/menu/service/MenuServiceTest.java index 167e0c73..5461f4e1 100644 --- a/src/test/java/com/sparta/tdd/domain/menu/service/MenuServiceTest.java +++ b/src/test/java/com/sparta/tdd/domain/menu/service/MenuServiceTest.java @@ -20,6 +20,7 @@ import com.sparta.tdd.domain.user.entity.User; import com.sparta.tdd.domain.user.enums.UserAuthority; import com.sparta.tdd.domain.user.repository.UserRepository; +import com.sparta.tdd.global.exception.BusinessException; import java.lang.reflect.Field; import java.util.List; import java.util.Optional; @@ -170,7 +171,7 @@ void getMenusCustomerTest() { .thenReturn(Optional.of(menu2)); // when & then - assertThrows(IllegalArgumentException.class, + assertThrows(BusinessException.class, () -> menuService.getMenu(store.getId(), menu2.getId(), customer.getAuthority())); verify(menuRepository, times(1)).findByIdAndStoreIdAndIsDeletedFalse(menu2.getId(), store.getId()); diff --git a/src/test/java/com/sparta/tdd/domain/order/service/OrderServiceTest.java b/src/test/java/com/sparta/tdd/domain/order/service/OrderServiceTest.java index 2a08a77f..45d97c0d 100644 --- a/src/test/java/com/sparta/tdd/domain/order/service/OrderServiceTest.java +++ b/src/test/java/com/sparta/tdd/domain/order/service/OrderServiceTest.java @@ -6,26 +6,21 @@ import static org.mockito.Mockito.when; import com.sparta.tdd.domain.auth.UserDetailsImpl; -import com.sparta.tdd.domain.menu.dto.MenuRequestDto; import com.sparta.tdd.domain.menu.entity.Menu; import com.sparta.tdd.domain.menu.repository.MenuRepository; import com.sparta.tdd.domain.order.dto.OrderRequestDto; import com.sparta.tdd.domain.order.dto.OrderResponseDto; -import com.sparta.tdd.domain.order.dto.OrderStatusRequestDto; import com.sparta.tdd.domain.order.entity.Order; -import com.sparta.tdd.domain.order.enums.OrderStatus; import com.sparta.tdd.domain.order.mapper.OrderMapper; import com.sparta.tdd.domain.order.mapper.OrderMapperImpl; import com.sparta.tdd.domain.order.repository.OrderRepository; import com.sparta.tdd.domain.orderMenu.dto.OrderMenuRequestDto; -import com.sparta.tdd.domain.orderMenu.entity.OrderMenu; import com.sparta.tdd.domain.orderMenu.mapper.OrderMenuMapper; import com.sparta.tdd.domain.store.entity.Store; import com.sparta.tdd.domain.store.repository.StoreRepository; import com.sparta.tdd.domain.user.entity.User; import com.sparta.tdd.domain.user.enums.UserAuthority; import com.sparta.tdd.domain.user.repository.UserRepository; -import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -41,10 +36,14 @@ @ExtendWith(MockitoExtension.class) class OrderServiceTest { - @Mock private OrderRepository orderRepository; - @Mock private UserRepository userRepository; - @Mock private StoreRepository storeRepository; - @Mock private MenuRepository menuRepository; + @Mock + private OrderRepository orderRepository; + @Mock + private UserRepository userRepository; + @Mock + private StoreRepository storeRepository; + @Mock + private MenuRepository menuRepository; private OrderMapper orderMapper; private OrderService orderService; @@ -87,12 +86,22 @@ void setUp() { ReflectionTestUtils.setField(store, "id", storeUUID); // 5. 메뉴 세팅 - MenuRequestDto friedDto = new MenuRequestDto("후라이드", "바삭한 후라이드 치킨", 15000, null); - friedMenu = Menu.builder().dto(friedDto).store(store).build(); + friedMenu = Menu.builder() + .name("후라이드") + .description("바삭한 후라이드 치킨") + .price(15000) + .imageUrl(null) + .store(store) + .build(); ReflectionTestUtils.setField(friedMenu, "id", UUID.randomUUID()); - MenuRequestDto seasonedDto = new MenuRequestDto("양념치킨", "매콤달콤 양념치킨", 16000, null); - seasonedMenu = Menu.builder().dto(seasonedDto).store(store).build(); + seasonedMenu = Menu.builder() + .name("양념치킨") + .description("매콤달콤 양념치킨") + .price(16000) + .imageUrl(null) + .store(store) + .build(); ReflectionTestUtils.setField(seasonedMenu, "id", UUID.randomUUID()); // 6. 주문 요청 DTO 세팅 diff --git a/src/test/java/com/sparta/tdd/domain/orderMenu/repository/OrderMenuRepositoryTest.java b/src/test/java/com/sparta/tdd/domain/orderMenu/repository/OrderMenuRepositoryTest.java index dd2931c8..2eb7532a 100644 --- a/src/test/java/com/sparta/tdd/domain/orderMenu/repository/OrderMenuRepositoryTest.java +++ b/src/test/java/com/sparta/tdd/domain/orderMenu/repository/OrderMenuRepositoryTest.java @@ -57,9 +57,11 @@ void setUp() { .build(); em.persist(testOrder); - menuDto = new MenuRequestDto("테스트 메뉴", "맛있는 메뉴", 5000, "string"); testMenu = Menu.builder() - .dto(menuDto) + .name("테스트 메뉴") + .description("맛있는 메뉴") + .price(5000) + .imageUrl("string") .store(testStore) .build(); em.persist(testMenu); diff --git a/src/test/java/com/sparta/tdd/domain/payment/service/PaymentServiceTest.java b/src/test/java/com/sparta/tdd/domain/payment/service/PaymentServiceTest.java index 77ea7771..3f0afe58 100644 --- a/src/test/java/com/sparta/tdd/domain/payment/service/PaymentServiceTest.java +++ b/src/test/java/com/sparta/tdd/domain/payment/service/PaymentServiceTest.java @@ -112,12 +112,10 @@ void setUp() { // Menu menu = Menu.builder() - .dto(new MenuRequestDto( - "김치찌개", - "맛있는 김치찌개", - 11000, - null - )) + .name("김치찌개") + .description("맛있는 김치찌개") + .price(11000) + .imageUrl(null) .store(store) .build(); ReflectionTestUtils.setField(menu, "id", UUID.randomUUID()); diff --git a/src/test/java/com/sparta/tdd/domain/store/repository/StoreRepositoryImplTest.java b/src/test/java/com/sparta/tdd/domain/store/repository/StoreRepositoryImplTest.java index 812b7a55..2f6415da 100644 --- a/src/test/java/com/sparta/tdd/domain/store/repository/StoreRepositoryImplTest.java +++ b/src/test/java/com/sparta/tdd/domain/store/repository/StoreRepositoryImplTest.java @@ -291,7 +291,10 @@ private Store createStore(String storeName, StoreCategory storeCategory, String private Menu createMenu(String menuName, String description, int price, String image, Store store) { return Menu.builder() - .dto(new MenuRequestDto(menuName, description, price, image)) + .name(menuName) + .description(description) + .price(price) + .imageUrl(image) .store(store) .build(); } diff --git a/src/test/java/com/sparta/tdd/domain/store/service/StoreServiceTest.java b/src/test/java/com/sparta/tdd/domain/store/service/StoreServiceTest.java index 8e34d46d..5b7da0eb 100644 --- a/src/test/java/com/sparta/tdd/domain/store/service/StoreServiceTest.java +++ b/src/test/java/com/sparta/tdd/domain/store/service/StoreServiceTest.java @@ -225,7 +225,10 @@ private Store createStore(String storeName, StoreCategory storeCategory, String private Menu createMenu(String menuName, String description, int price, Store store) { return Menu.builder() - .dto(new MenuRequestDto(menuName, description, price, "image")) + .name(menuName) + .description(description) + .price(price) + .imageUrl("image") .store(store) .build(); }