Merge pull request #326 from IceButler/refactor/#325-modify-cart-food…

…-user

#325 food, cart, user exception 구조 변경 및 assembler 삭제

src/main/java/com/example/icebutler_server/admin/dto/assembler/AdminAssembler.java

@@ -3,9 +3,11 @@
 import com.example.icebutler_server.admin.dto.request.ModifyFoodRequest;
 import com.example.icebutler_server.food.entity.Food;
 import com.example.icebutler_server.food.entity.FoodCategory;
-import com.example.icebutler_server.food.exception.DuplicateFoodNameException;
+import com.example.icebutler_server.global.exception.BaseException;
 import org.springframework.stereotype.Component;
 
+import static com.example.icebutler_server.global.exception.ReturnCode.ALREADY_EXIST_FOOD_NAME;
+
 @Component
 public class AdminAssembler {
   public Food toUpdateFoodInfo(Food food, ModifyFoodRequest request) {
@@ -16,6 +18,6 @@ public Food toUpdateFoodInfo(Food food, ModifyFoodRequest request) {
   }
 
   public void validateFoodName(Food checkFood, String foodName) {
-    if(checkFood.getFoodName().equals(foodName)) throw new DuplicateFoodNameException();
+    if (checkFood.getFoodName().equals(foodName)) throw new BaseException(ALREADY_EXIST_FOOD_NAME);
   }
 }

src/main/java/com/example/icebutler_server/admin/service/AdminServiceImpl.java

@@ -2,37 +2,40 @@
 
 
 import com.example.icebutler_server.admin.dto.assembler.AdminAssembler;
-import com.example.icebutler_server.admin.dto.request.*;
+import com.example.icebutler_server.admin.dto.request.JoinRequest;
+import com.example.icebutler_server.admin.dto.request.LoginRequest;
+import com.example.icebutler_server.admin.dto.request.ModifyFoodRequest;
 import com.example.icebutler_server.admin.dto.response.AdminResponse;
-import com.example.icebutler_server.admin.dto.response.SearchFoodsResponse;
-import com.example.icebutler_server.admin.exception.AlreadyExistEmailException;
-import com.example.icebutler_server.admin.exception.FoodNotFoundException;
-import com.example.icebutler_server.food.entity.Food;
-import com.example.icebutler_server.food.repository.FoodRepository;
 import com.example.icebutler_server.admin.dto.response.PostAdminRes;
+import com.example.icebutler_server.admin.dto.response.SearchFoodsResponse;
 import com.example.icebutler_server.admin.dto.response.UserResponse;
 import com.example.icebutler_server.admin.entity.Admin;
 import com.example.icebutler_server.admin.exception.AdminNotFoundException;
+import com.example.icebutler_server.admin.exception.AlreadyExistEmailException;
+import com.example.icebutler_server.admin.exception.FoodNotFoundException;
 import com.example.icebutler_server.admin.exception.PasswordNotMatchException;
 import com.example.icebutler_server.admin.repository.AdminRepository;
+import com.example.icebutler_server.food.entity.Food;
+import com.example.icebutler_server.food.repository.FoodRepository;
+import com.example.icebutler_server.global.exception.BaseException;
 import com.example.icebutler_server.global.feign.dto.AdminReq;
 import com.example.icebutler_server.global.feign.feignClient.RecipeServerClient;
 import com.example.icebutler_server.global.feign.publisher.RecipeServerEventPublisherImpl;
-import com.example.icebutler_server.global.util.redis.RedisTemplateService;
 import com.example.icebutler_server.global.util.TokenUtils;
+import com.example.icebutler_server.global.util.redis.RedisTemplateService;
 import com.example.icebutler_server.user.entity.User;
-import com.example.icebutler_server.user.exception.UserNotFoundException;
 import com.example.icebutler_server.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.util.HashMap;
 
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import static com.example.icebutler_server.global.exception.ReturnCode.NOT_FOUND_USER;
 
 @RequiredArgsConstructor
 @Service
@@ -73,7 +76,7 @@ public PostAdminRes login(LoginRequest request)
     @Override
     public void logout(Long adminIdx)
     {
-        Admin admin = adminRepository.findByIdAndIsEnable(adminIdx, true).orElseThrow(UserNotFoundException::new);
+        Admin admin = adminRepository.findByIdAndIsEnable(adminIdx, true).orElseThrow(() -> new BaseException(NOT_FOUND_USER));
         admin.logout();
         redisTemplateService.deleteUserRefreshToken(admin.getId().toString());
     }
@@ -92,7 +95,7 @@ public Page<UserResponse> search(
     public void withdraw(Long userIdx, Long adminIdx, String authorization)
     {
         adminRepository.findByIdAndIsEnable(adminIdx,true).orElseThrow(AdminNotFoundException::new);
-        User user = userRepository.findById(userIdx).orElseThrow(UserNotFoundException::new);
+        User user = userRepository.findById(userIdx).orElseThrow(() -> new BaseException(NOT_FOUND_USER));
         HashMap<String, String> requestHeaders = new HashMap<>();
         requestHeaders.put("Authorization", authorization);
         recipeServerClient.withdrawUser(userIdx, requestHeaders);

src/main/java/com/example/icebutler_server/cart/controller/CartController.java

@@ -36,9 +36,9 @@ public class CartController {
     @ApiResponses(value = {
             @ApiResponse(responseCode = "403", description = "냉장고의 멤버가 아닙니다.",
                     content = @Content(schema = @Schema(implementation = ResponseCustom.class))),
-            @ApiResponse(responseCode = "404", description = "요청한 id를 가진 유저를 찾을 수 없습니다.\t\n" +
+            @ApiResponse(responseCode = "404", description = "(U0005)해당 유저를 찾을 수 없습니다.\t\n" +
                     "요청한 id를 가진 냉장고를 찾을 수 없습니다.\t\n" +
-                    "요청한 id를 가진 장바구니를 찾을 수 없습니다.",
+                    "(C0000)장바구니를 찾을 수 없습니다.",
                     content = @Content(schema = @Schema(implementation = ResponseCustom.class))),
     })
     @Auth
@@ -53,10 +53,10 @@ public ResponseCustom<List<CartResponse>> getCartFoods(@Parameter(name = "냉장
     @ApiResponses(value = {
             @ApiResponse(responseCode = "403", description = "냉장고의 멤버가 아닙니다.",
                     content = @Content(schema = @Schema(implementation = ResponseCustom.class))),
-            @ApiResponse(responseCode = "404", description = "요청한 id를 가진 유저를 찾을 수 없습니다.\t\n" +
+            @ApiResponse(responseCode = "404", description = "(U0005)해당 유저를 찾을 수 없습니다.\t\n" +
                     "요청한 id를 가진 냉장고를 찾을 수 없습니다.\t\n" +
-                    "요청한 id를 가진 장바구니를 찾을 수 없습니다.\t\n" +
-                    "존재하지 않는 카테고리입니다.",
+                    "(C0000)장바구니를 찾을 수 없습니다.\t\n" +
+                    "(F0000)존재하지 않는 카테고리입니다.",
                     content = @Content(schema = @Schema(implementation = ResponseCustom.class))),
     })
     @Auth
@@ -73,10 +73,10 @@ public ResponseCustom<?> addCartFoods(@Parameter(name = "냉장고 ID") @PathVar
     @ApiResponses(value = {
             @ApiResponse(responseCode = "403", description = "냉장고의 멤버가 아닙니다.",
                     content = @Content(schema = @Schema(implementation = ResponseCustom.class))),
-            @ApiResponse(responseCode = "404", description = "요청한 id를 가진 유저를 찾을 수 없습니다.\t\n" +
+            @ApiResponse(responseCode = "404", description = "(U0005)해당 유저를 찾을 수 없습니다.\t\n" +
                     "요청한 id를 가진 냉장고를 찾을 수 없습니다.\t\n" +
-                    "요청한 id를 가진 장바구니를 찾을 수 없습니다.\t\n" +
-                    "존재하지 않는 카테고리입니다.",
+                    "(C0000)장바구니를 찾을 수 없습니다.\t\n" +
+                    "(F0000)존재하지 않는 카테고리입니다.",
                     content = @Content(schema = @Schema(implementation = ResponseCustom.class))),
     })
     @Auth

src/main/java/com/example/icebutler_server/cart/entity/Cart.java

@@ -31,4 +31,9 @@ public Cart(Fridge fridge) {
         this.fridge = fridge;
     }
 
+    public static Cart toEntity(Fridge fridge) {
+        return Cart.builder()
+                .fridge(fridge)
+                .build();
+    }
 }

src/main/java/com/example/icebutler_server/cart/entity/CartFood.java

@@ -34,4 +34,10 @@ public CartFood(Food food, Cart cart) {
         this.cart = cart;
     }
 
+    public static CartFood toEntity(Cart cart, Food food) {
+        return CartFood.builder()
+                .cart(cart)
+                .food(food)
+                .build();
+    }
 }

src/main/java/com/example/icebutler_server/cart/service/CartServiceImpl.java

@@ -1,16 +1,13 @@
 package com.example.icebutler_server.cart.service;
 
-import com.example.icebutler_server.cart.dto.assembler.CartFoodAssembler;
 import com.example.icebutler_server.cart.dto.request.AddFoodRequest;
 import com.example.icebutler_server.cart.dto.request.AddFoodToCartRequest;
 import com.example.icebutler_server.cart.dto.request.RemoveFoodFromCartRequest;
 import com.example.icebutler_server.cart.dto.response.CartResponse;
 import com.example.icebutler_server.cart.entity.Cart;
 import com.example.icebutler_server.cart.entity.CartFood;
-import com.example.icebutler_server.cart.exception.CartNotFoundException;
 import com.example.icebutler_server.cart.repository.CartFoodRepository;
 import com.example.icebutler_server.cart.repository.CartRepository;
-import com.example.icebutler_server.food.dto.assembler.FoodAssembler;
 import com.example.icebutler_server.food.entity.Food;
 import com.example.icebutler_server.food.entity.FoodCategory;
 import com.example.icebutler_server.food.repository.FoodRepository;
@@ -19,18 +16,22 @@
 import com.example.icebutler_server.fridge.exception.FridgeUserNotFoundException;
 import com.example.icebutler_server.fridge.repository.FridgeRepository;
 import com.example.icebutler_server.fridge.repository.FridgeUserRepository;
+import com.example.icebutler_server.global.exception.BaseException;
 import com.example.icebutler_server.global.sqs.AmazonSQSSender;
 import com.example.icebutler_server.global.sqs.FoodData;
 import com.example.icebutler_server.user.entity.User;
-import com.example.icebutler_server.user.exception.UserNotFoundException;
 import com.example.icebutler_server.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.example.icebutler_server.global.exception.ReturnCode.NOT_FOUND_CART;
+import static com.example.icebutler_server.global.exception.ReturnCode.NOT_FOUND_USER;
+
 
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -43,8 +44,6 @@ public class CartServiceImpl implements CartService {
     private final FridgeRepository fridgeRepository;
     private final FridgeUserRepository fridgeUserRepository;
     private final CartRepository cartRepository;
-    private final FoodAssembler foodAssembler;
-    private final CartFoodAssembler cartFoodAssembler;
     private final AmazonSQSSender amazonSQSSender;
 
     // 장바구니 식품 조회
@@ -74,7 +73,7 @@ public void addCartFoods(Long fridgeIdx, AddFoodToCartRequest request, Long user
         for(AddFoodRequest foodRequest : request.getFoodRequests()) {
             Food food = this.foodRepository.findByFoodNameAndFoodCategory(foodRequest.getFoodName(), FoodCategory.getFoodCategoryByName(foodRequest.getFoodCategory()));
             if(food == null) {
-                food = this.foodRepository.save(foodAssembler.toEntity(foodRequest));
+                food = this.foodRepository.save(Food.toEntity(foodRequest));
                 amazonSQSSender.sendMessage(FoodData.toDto(food));
             }
             foodRequests.add(food);
@@ -89,7 +88,7 @@ public void addCartFoods(Long fridgeIdx, AddFoodToCartRequest request, Long user
                     for (Long foodInIdx : foodsInNowCart) if(foodInIdx.equals(f.getId())) return false;
                     return true;
                 })
-                .map((food) -> cartFoodAssembler.toEntity(cart, food))
+                .map((food) -> CartFood.toEntity(cart, food))
                 .collect(Collectors.toList());
 
         cartFoodRepository.saveAll(cartFoods);
@@ -105,9 +104,9 @@ public void deleteCartFoods(Long fridgeIdx, RemoveFoodFromCartRequest request, L
     }
 
     private Cart getCart(Long userIdx, Long fridgeIdx) {
-        User user = userRepository.findByIdAndIsEnable(userIdx, true).orElseThrow(UserNotFoundException::new);
+        User user = userRepository.findByIdAndIsEnable(userIdx, true).orElseThrow(() -> new BaseException(NOT_FOUND_USER));
         Fridge fridge = fridgeRepository.findByIdAndIsEnable(fridgeIdx, true).orElseThrow(FridgeNotFoundException::new);
         fridgeUserRepository.findByUserAndFridgeAndIsEnable(user, fridge, true).orElseThrow(FridgeUserNotFoundException::new);
-        return cartRepository.findByFridge_IdAndIsEnable(fridgeIdx, true).orElseThrow(CartNotFoundException::new);
+        return cartRepository.findByFridge_IdAndIsEnable(fridgeIdx, true).orElseThrow(() -> new BaseException(NOT_FOUND_CART));
     }
 }

src/main/java/com/example/icebutler_server/food/controller/FoodController.java

@@ -1,7 +1,6 @@
 package com.example.icebutler_server.food.controller;
 
 import com.example.icebutler_server.cart.dto.request.AddFoodRequest;
-import com.example.icebutler_server.food.dto.assembler.FoodAssembler;
 import com.example.icebutler_server.food.dto.response.BarcodeFoodRes;
 import com.example.icebutler_server.food.dto.response.FoodRes;
 import com.example.icebutler_server.food.entity.Food;
@@ -38,11 +37,10 @@ public class FoodController {
     private final AmazonSQSSender amazonSQSSender;
 
     private final FoodRepository foodRepository;
-    private final FoodAssembler foodAssembler;
 
     @Operation(summary = "식품 검색", description = "식품을 검색한다.")
     @SwaggerApiSuccess(implementation = FoodRes.class)
-    @ApiResponse(responseCode = "400", description = "존재하지 않는 카테고리입니다.",
+    @ApiResponse(responseCode = "404", description = "(F0000)존재하지 않는 카테고리입니다.",
             content = @Content(schema = @Schema(implementation = ResponseCustom.class)))
     @GetMapping("")
     public ResponseCustom<List<FoodRes>> searchFood(@Parameter(name = "category", description = "식품 카테고리") @RequestParam(required = false) String category,
@@ -55,7 +53,7 @@ public ResponseCustom<List<FoodRes>> searchFood(@Parameter(name = "category", de
 
     @Operation(summary = "식품 바코드 조회", description = "바코드 번호로 식품을 조회한다.")
     @SwaggerApiSuccess(implementation = BarcodeFoodRes.class)
-    @ApiResponse(responseCode = "400", description = "해당 바코드의 상품을 찾을 수 없습니다.",
+    @ApiResponse(responseCode = "404", description = "(F00001)해당 바코드의 상품을 찾을 수 없습니다.",
             content = @Content(schema = @Schema(implementation = ResponseCustom.class)))
     @GetMapping("/barcode")
     public ResponseCustom<BarcodeFoodRes> searchByBarcode(@RequestParam String code_num) throws IOException, org.json.simple.parser.ParseException {
@@ -69,7 +67,7 @@ public void hihiTest() {
         addFoodRequest.setFoodName("맛없는 고기");
         addFoodRequest.setFoodCategory("육류");
 
-        Food food = this.foodRepository.save(foodAssembler.toEntity(addFoodRequest));
+        Food food = this.foodRepository.save(Food.toEntity(addFoodRequest));
         FoodData foodData = FoodData.toDto(food);
         amazonSQSSender.sendMessage(FoodData.toDto(food));
     }