Merge pull request #120 from realBULK/fix/119

[FIX] cascade로 인한 삭제 버그 수정

Author: RCNR

src/main/java/umc7th/bulk/meal/service/command/MealCommandServiceImpl.java

@@ -9,6 +9,7 @@
 import umc7th.bulk.meal.entity.Meal;
 import umc7th.bulk.meal.repository.MealRepository;
 import umc7th.bulk.mealItem.entity.MealItem;
+import umc7th.bulk.mealItem.service.command.MealItemCommandService;
 import umc7th.bulk.mealMealItemMapping.entity.MealMealItemMapping;
 import umc7th.bulk.mealMealItemMapping.service.command.MealMealItemMappingCommandService;
 import umc7th.bulk.mealPlan.dto.MealPlanRequestDTO;
@@ -22,6 +23,7 @@ public class MealCommandServiceImpl implements MealCommandService {
     private final MealMealItemMappingCommandService mealMealItemMappingCommandService;
     private final MealRepository mealRepository;
     private final DailyMealRepository dailyMealRepository;
+    private final MealItemCommandService mealItemCommandService;
 
     @Override
     @Transactional
@@ -34,8 +36,8 @@ public Meal createMeal(DailyMeal dailyMeal, MealPlanRequestDTO.MealDTO dto) {
         List<MealMealItemMapping> mappings = mealItems.stream()
                 .map(mealItemDTO -> {
                     // mealItem 저장
-//                    MealItem mealItem = mealItemCommandService.createMealItem(mealItemDTO);
-                    MealItem mealItemEntity = mealItemDTO.toMealItemEntity(mealItemDTO);
+                    MealItem mealItemEntity = mealItemCommandService.createMealItem(mealItemDTO);
+//                    MealItem mealItemEntity = mealItemDTO.toMealItemEntity(mealItemDTO);
                     return mealMealItemMappingCommandService.createMapping(meal, mealItemEntity);
                 })
                 .toList();

src/main/java/umc7th/bulk/mealItem/service/command/MealItemCommandServiceImpl.java

@@ -8,6 +8,8 @@
 import umc7th.bulk.mealItem.repository.MealItemRepository;
 import umc7th.bulk.mealPlan.dto.MealPlanRequestDTO;
 
+import java.util.Optional;
+
 
 @Service
 @RequiredArgsConstructor
@@ -20,26 +22,15 @@ public class MealItemCommandServiceImpl implements MealItemCommandService {
     @Transactional
     public MealItem createMealItem(MealPlanRequestDTO.MealItemDTO dto) {
 
-        log.info("🔍 Checking if meal item exists: {}", dto.getName());
-        MealItem saveMealItem = mealItemRepository.saveAndFlush(dto.toMealItemEntity(dto));
-        return saveMealItem;
-
-//        System.out.println(mealItem.getName());
-
-        /*if (mealItem == null) {
-            MealItem saveMeal = mealItemRepository.save(dto.toMealItemEntity(dto));
-            return saveMeal;
-        }*/
-
-        /*if (mealItems.size() >= 2) {
-            log.warn("⚠️ Found existing meal item: {}", dto.getName());
-            mealItemRepository.deleteLastByName(dto.getName());
-        }*/
-
-        /*MealItem newMealItem = mealItemRepository.save(dto.toMealItemEntity(dto));
-        log.info("💾 Saving new meal item: {}", newMealItem);*/
+        Optional<MealItem> mealItem1 = mealItemRepository.findByName(dto.getName());
 
-//        return mealItem;
+        MealItem mealItem2 = null;
+        if (mealItem1.isPresent()) {
+            mealItem2 = mealItem1.get();
+        } else {
+            mealItem2 = mealItemRepository.save(dto.toMealItemEntity(dto));
+        }
 
+        return mealItem2;
     }
 }

src/main/java/umc7th/bulk/mealMealItemMapping/entity/MealMealItemMapping.java

@@ -21,7 +21,7 @@ public class MealMealItemMapping {
     @JoinColumn(name = "meal_id")
     private Meal meal;
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "meal_item_id")
     private MealItem mealItem;