Merge pull request #32 from CAUSOLDOUTMEN/refactor/29-foodServiceTest…

…-mock
CAUSOLDOUTMEN · Oct 15, 2023 · 37e9a28 · 37e9a28
2 parents a0ba351 + 111c0f4
commit 37e9a28
Show file tree

Hide file tree

Showing 4 changed files with 208 additions and 95 deletions.
diff --git a/src/main/java/com/diareat/diareat/food/domain/FavoriteFood.java b/src/main/java/com/diareat/diareat/food/domain/FavoriteFood.java
@@ -55,4 +55,8 @@ public static Food createFoodFromFavoriteFood(FavoriteFood favoriteFood) {
         favoriteFood.addCount();
         return Food.createFood(favoriteFood.getName(), favoriteFood.getUser(), favoriteFood.getBaseNutrition());
     }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
 }
diff --git a/src/main/java/com/diareat/diareat/food/domain/Food.java b/src/main/java/com/diareat/diareat/food/domain/Food.java
@@ -5,7 +5,6 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.CreatedDate;
 
 import javax.persistence.*;
 import java.time.LocalDate;
@@ -56,4 +55,6 @@ public void updateFood(String name, BaseNutrition baseNutrition) {
     public boolean isFavorite() {
         return this.favoriteFood != null;
     }
+
+    public void setId(long id) {this.id = id;}
 }
diff --git a/src/main/java/com/diareat/diareat/food/service/FoodService.java b/src/main/java/com/diareat/diareat/food/service/FoodService.java
@@ -9,13 +9,13 @@
 import com.diareat.diareat.user.domain.User;
 import com.diareat.diareat.user.repository.UserRepository;
 import com.diareat.diareat.util.api.ResponseCode;
+import com.diareat.diareat.util.exception.FavoriteException;
 import com.diareat.diareat.util.exception.FoodException;
 import com.diareat.diareat.util.exception.UserException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.rmi.registry.LocateRegistry;
 import java.time.LocalDate;
 import java.util.Comparator;
 import java.util.List;
@@ -41,6 +41,7 @@ public Long saveFood(CreateFoodDto createFoodDto) {
     // 회원이 특정 날짜에 먹은 음식 반환
     @Transactional(readOnly = true)
     public List<ResponseFoodDto> getFoodListByDate(Long userId, LocalDate date){
+        validateUser(userId);
         List<Food> foodList = foodRepository.findAllByUserIdAndDate(userId, date);
         return foodList.stream()
                 .map(food -> ResponseFoodDto.of(food.getId(), food.getUser().getId(), food.getName(), food.getDate(), food.getTime(), food.getBaseNutrition(), food.isFavorite())).collect(Collectors.toList());
@@ -57,6 +58,7 @@ public void updateFood(UpdateFoodDto updateFoodDto) {
     // 음식 삭제
     @Transactional
     public void deleteFood(Long foodId) {
+        validateFood(foodId);
         foodRepository.deleteById(foodId);
     }
 
@@ -73,6 +75,7 @@ public Long saveFavoriteFood(CreateFavoriteFoodDto createFavoriteFoodDto) {
     //즐겨찾기 음식 리스트 반환
     @Transactional(readOnly = true)
     public List<ResponseFavoriteFoodDto> getFavoriteFoodList(Long userId){
+        validateUser(userId);
         List<FavoriteFood> foodList = favoriteFoodRepository.findAllByUserId(userId);
         return foodList.stream()
                 .map(favoriteFood -> ResponseFavoriteFoodDto.of(favoriteFood.getId(), favoriteFood.getName(),
@@ -89,19 +92,22 @@ public void updateFavoriteFood(UpdateFavoriteFoodDto updateFavoriteFoodDto) {
     // 즐겨찾기 해제
     @Transactional
     public void deleteFavoriteFood(Long favoriteFoodId) {
+        validateFavoriteFood(favoriteFoodId);
         favoriteFoodRepository.deleteById(favoriteFoodId);
     }
 
     @Transactional(readOnly = true)
     // 유저의 특정 날짜에 먹은 음식들의 영양성분별 총합 조회 (섭취영양소/기준영양소 및 비율까지 계산해서 반환, dto 구체적 협의 필요)
     public ResponseNutritionSumByDateDto getNutritionSumByDate(Long userId, LocalDate date) {
+        validateUser(userId);
         List<Food> foodList = foodRepository.findAllByUserIdAndDate(userId, date);
         return calculateNutritionSumAndRatio(userId, foodList, date, 1);
     }
 
     @Transactional(readOnly = true)
     // 유저의 최근 7일간의 영양성분별 총합 조회 (섭취영양소/기준영양소 및 비율까지 계산해서 반환, dto 구체적 협의 필요)
     public ResponseNutritionSumByDateDto getNutritionSumByWeek(Long userId) {
+        validateUser(userId);
         LocalDate endDate = LocalDate.now();
         List<Food> foodList = foodRepository.findAllByUserIdAndDateBetween(userId, endDate.minusWeeks(1), endDate);
 
@@ -111,6 +117,7 @@ public ResponseNutritionSumByDateDto getNutritionSumByWeek(Long userId) {
     @Transactional(readOnly = true)
     // 유저의 최근 1개월간의 영양성분별 총합 조회 (섭취영양소/기준영양소 및 비율까지 계산해서 반환, dto 구체적 협의 필요)
     public ResponseNutritionSumByDateDto getNutritionSumByMonth(Long userId) {
+        validateUser(userId);
         LocalDate endDate = LocalDate.now();
         List<Food> foodList = foodRepository.findAllByUserIdAndDateBetween(userId, endDate.minusWeeks(1), endDate);
 
@@ -120,6 +127,7 @@ public ResponseNutritionSumByDateDto getNutritionSumByMonth(Long userId) {
     @Transactional(readOnly = true)
     // 유저의 최근 7일간의 Best 3 음식 조회 (dto 구체적 협의 필요)
     public ResponseFoodRankDto getBestFoodByWeek(Long userId) {
+        validateUser(userId);
         LocalDate endDate = LocalDate.now();
         List<Food> foodList = foodRepository.findAllByUserIdAndDateBetween(userId, endDate.minusWeeks(1), endDate);
 
@@ -140,6 +148,7 @@ public ResponseFoodRankDto getBestFoodByWeek(Long userId) {
     @Transactional(readOnly = true)
     // 유저의 최근 7일간의 Worst 3 음식 조회 (dto 구체적 협의 필요)
     public ResponseFoodRankDto getWorstFoodByWeek(Long userId) {
+        validateUser(userId);
         LocalDate endDate = LocalDate.now();
         List<Food> foodList = foodRepository.findAllByUserIdAndDateBetween(userId, endDate.minusWeeks(1), endDate);
 
@@ -198,6 +207,21 @@ private ResponseNutritionSumByDateDto calculateNutritionSumAndRatio(Long userId,
         return ResponseNutritionSumByDateDto.of(userId, checkDate, nutritionSumType, totalKcal,totalCarbohydrate, totalProtein, totalFat, ratioKcal, ratioCarbohydrate, ratioProtein, ratioFat);
     }
 
+    private void validateUser(Long userId) {
+        if (!userRepository.existsById(userId))
+            throw new UserException(ResponseCode.USER_NOT_FOUND);
+    }
+
+    private void validateFood(Long foodId) {
+        if (!foodRepository.existsById(foodId))
+            throw new FoodException(ResponseCode.FOOD_NOT_FOUND);
+    }
+
+    private void validateFavoriteFood(Long favoriteFoodId) {
+        if (!favoriteFoodRepository.existsById(favoriteFoodId))
+            throw new FavoriteException(ResponseCode.FAVORITE_NOT_FOUND);
+    }
+
 
     /**
      * 메서드 구현 유의사항