From 57b20a5513be7ac60879f3fafdf3f95f420128e1 Mon Sep 17 00:00:00 2001 From: parkrootseok Date: Tue, 21 Feb 2023 21:48:11 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Refactor]=20#163=20-=20=EB=A9=94=EB=89=B4?= =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=97=86=EC=9D=84=20=EB=95=8C?= =?UTF-8?q?=20=EB=93=B1=EB=A1=9D=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cazait/domain/cafemenu/service/CafeMenuService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/shop/cazait/domain/cafemenu/service/CafeMenuService.java b/src/main/java/shop/cazait/domain/cafemenu/service/CafeMenuService.java index 712b20af..079d3088 100644 --- a/src/main/java/shop/cazait/domain/cafemenu/service/CafeMenuService.java +++ b/src/main/java/shop/cazait/domain/cafemenu/service/CafeMenuService.java @@ -54,13 +54,16 @@ public List getMenu(Long cafeId) { public PostCafeMenuRes registerMenu(Long cafeId, PostCafeMenuReq postCafeMenuReq, MultipartFile menuImage) throws CafeException, IOException { + String uploadFileName = null; Cafe findCafe = getCafe(cafeId); - // todo: image가 없을 떄는 업로드 하지 않도록 수정 - String uploadFileName = awsS3Servicel.uploadImage(menuImage); + + if (menuImage != null) { + uploadFileName = awsS3Servicel.uploadImage(menuImage); + } + CafeMenu menu = PostCafeMenuReq.toEntity(findCafe, postCafeMenuReq, uploadFileName); CafeMenu addMenu = cafeMenuRepository.save(menu); return PostCafeMenuRes.of(addMenu); - } private Cafe getCafe(Long cafeId) throws CafeException { From 05ef5b0fb0fafc7910de7f1006b39480d397f94a Mon Sep 17 00:00:00 2001 From: parkrootseok Date: Tue, 21 Feb 2023 23:00:50 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Add]=20#163=20-=20=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20Response=EC=97=90=20=EA=B4=80=ED=95=9C=20S?= =?UTF-8?q?wagger=20=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/cafemenu/api/CafeMenuApiController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/shop/cazait/domain/cafemenu/api/CafeMenuApiController.java b/src/main/java/shop/cazait/domain/cafemenu/api/CafeMenuApiController.java index a6176cad..9f0861d3 100644 --- a/src/main/java/shop/cazait/domain/cafemenu/api/CafeMenuApiController.java +++ b/src/main/java/shop/cazait/domain/cafemenu/api/CafeMenuApiController.java @@ -36,6 +36,7 @@ import shop.cazait.domain.cafemenu.dto.PostCafeMenuReq; import shop.cazait.domain.cafemenu.dto.PostCafeMenuRes; import shop.cazait.domain.cafemenu.service.CafeMenuService; +import shop.cazait.global.common.dto.response.FailResponse; import shop.cazait.global.common.dto.response.SuccessResponse; import shop.cazait.global.error.status.SuccessStatus; @@ -59,8 +60,16 @@ public class CafeMenuApiController { description = "메뉴 등록 성공", content = @Content(schema = @Schema(implementation = PostCafeMenuRes.class)) ), - @ApiResponse(responseCode = "400", description = "유효하지 않은 요청"), - @ApiResponse(responseCode = "404", description = "존재하지 않는 카페"), + @ApiResponse( + responseCode = "400", + description = "유효하지 않은 요청", + content = @Content(schema = @Schema(implementation = FailResponse.class)) + ), + @ApiResponse( + responseCode = "404", + description = "존재하지 않는 카페", + content = @Content(schema = @Schema(implementation = FailResponse.class)) + ), }) @PostMapping(value ="/cafe/{cafeId}", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE}) public SuccessResponse registerMenu(@PathVariable Long cafeId,