[#42] Refactor: 식단 추가 시 title 필드도 추가

EAT-SSU · Jan 26, 2024 · ac8f653 · ac8f653
1 parent fa3efc0
commit ac8f653
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 15 deletions.
diff --git a/src/main/java/ssu/eatssu/domain/menu/dto/MenuRequest.java b/src/main/java/ssu/eatssu/domain/menu/dto/MenuRequest.java
@@ -19,5 +19,7 @@ public static class MealCreateRequest {
 
         @Schema(description = "메뉴명 리스트", example = "[\"돈까스\", \"샐러드\", \"김치\"]")
         private List<String> menuNames;
+
+        private String title;
     }
 }
diff --git a/src/main/java/ssu/eatssu/domain/menu/entity/Meal.java b/src/main/java/ssu/eatssu/domain/menu/entity/Meal.java
@@ -2,7 +2,6 @@
 
 import jakarta.persistence.*;
 import lombok.AccessLevel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -32,14 +31,24 @@ public class Meal {
     @Enumerated(EnumType.STRING)
     private Restaurant restaurant;
 
+    private String title;
+
     @OneToMany(mappedBy = "meal", cascade = CascadeType.ALL)
     private List<MealMenu> mealMenus = new ArrayList<>();
 
-    @Builder
-    public Meal(Date date, TimePart timePart, Restaurant restaurant) {
+    private Meal(Date date, TimePart timePart, Restaurant restaurant, String title) {
         this.date = date;
         this.timePart = timePart;
         this.restaurant = restaurant;
+        this.title = title;
+    }
+
+    public static Meal withTitle(Date date, TimePart timePart, Restaurant restaurant, String title) {
+        return new Meal(date, timePart, restaurant, title);
+    }
+
+    public static Meal withoutTitle(Date date, TimePart timePart, Restaurant restaurant) {
+        return new Meal(date, timePart, restaurant, null);
     }
 
     public List<String> getMenuNames() {

diff --git a/src/main/java/ssu/eatssu/domain/menu/entity/Menu.java b/src/main/java/ssu/eatssu/domain/menu/entity/Menu.java
@@ -26,14 +26,15 @@ public class Menu {
 
     private Integer price;
 
-    @OneToMany(mappedBy = "menu", cascade = CascadeType.ALL)
-    private List<MealMenu> mealMenus = new ArrayList<>();
-
+    @Enumerated(EnumType.STRING)
     private Restaurant restaurant;
 
     @Embedded
     private Reviews reviews = new Reviews();
 
+    @OneToMany(mappedBy = "menu", cascade = CascadeType.ALL)
+    private List<MealMenu> mealMenus = new ArrayList<>();
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "menu_category_id")
     private MenuCategory category;

diff --git a/src/main/java/ssu/eatssu/domain/menu/service/MenuService.java b/src/main/java/ssu/eatssu/domain/menu/service/MenuService.java
@@ -59,15 +59,17 @@ public void createMeal(Date date, Restaurant restaurant, TimePart timePart,
         if (MenuValidator.validateExistedMeal(meals, request)) {
             return;
         }
+        Meal meal;
 
-        Meal newMeal = Meal.builder()
-                .date(date)
-                .restaurant(restaurant)
-                .timePart(timePart)
-                .build();
-        mealRepository.save(newMeal);
+        if(request.getTitle() == null){
+            meal = Meal.withoutTitle(date, timePart, restaurant);
+        } else{
+            meal = Meal.withTitle(date, timePart, restaurant, request.getTitle());
+        }
+
+        mealRepository.save(meal);
 
-        addMenusToMeal(newMeal, restaurant, request);
+        addMenusToMeal(meal, restaurant, request.getMenuNames());
     }
 
     public MenusInformationResponse findMenusInMeal(Long mealId) {
@@ -88,8 +90,8 @@ public void deleteMeal(Long mealId) {
         deleteUnusedMenus(menus);
     }
 
-    private void addMenusToMeal(Meal meal, Restaurant restaurant, MealCreateRequest request) {
-        for (String menuName : request.getMenuNames()) {
+    private void addMenusToMeal(Meal meal, Restaurant restaurant, List<String> menuNames) {
+        for (String menuName : menuNames) {
             Menu menu = createMenuIfNotExists(menuName, restaurant);
             createMealMenu(meal, menu);
         }