[#83] Refactor : menu 패키지로 클래스 경로를 리팩토링 한다

EAT-SSU · Jan 15, 2024 · a5af8de · a5af8de
1 parent 54eed6e
commit a5af8de
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 58 deletions.
diff --git a/...a/ssu/eatssu/web/menu/dto/MenuReqDto.java → ...u/eatssu/domain/menu/dto/MenuRequest.java b/...a/ssu/eatssu/web/menu/dto/MenuReqDto.java → ...u/eatssu/domain/menu/dto/MenuRequest.java
@@ -1,15 +1,15 @@
-package ssu.eatssu.web.menu.dto;
+package ssu.eatssu.domain.menu.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
-public class MenuReqDto {
+public class MenuRequest {
 
-    private MenuReqDto() {}
+    private MenuRequest() {
+    }
 
     @Schema(title = "식단 추가")
     @Getter
@@ -19,6 +19,5 @@ public static class AddTodayMenuList {
 
         @Schema(description = "메뉴명 리스트", example = "[\"돈까스\", \"샐러드\", \"김치\"]")
         private List<String> todayMenuList;
-
     }
 }
diff --git a/...ssu/eatssu/web/menu/dto/MenuResponse.java → .../eatssu/domain/menu/dto/MenuResponse.java b/...ssu/eatssu/web/menu/dto/MenuResponse.java → .../eatssu/domain/menu/dto/MenuResponse.java
@@ -1,15 +1,14 @@
-package ssu.eatssu.web.menu.dto;
+package ssu.eatssu.domain.menu.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import ssu.eatssu.domain.menu.Meal;
-import ssu.eatssu.domain.menu.MealMenu;
-import ssu.eatssu.domain.menu.Menu;
-
-import java.util.ArrayList;
-import java.util.List;
+import ssu.eatssu.domain.menu.entity.Meal;
+import ssu.eatssu.domain.menu.entity.MealMenu;
+import ssu.eatssu.domain.menu.entity.Menu;
 
 public class MenuResponse {
 

diff --git a/...ain/java/ssu/eatssu/domain/menu/Meal.java → ...a/ssu/eatssu/domain/menu/entity/Meal.java b/...ain/java/ssu/eatssu/domain/menu/Meal.java → ...a/ssu/eatssu/domain/menu/entity/Meal.java
@@ -1,4 +1,4 @@
-package ssu.eatssu.domain.menu;
+package ssu.eatssu.domain.menu.entity;
 
 import jakarta.persistence.*;
 import lombok.AccessLevel;

diff --git a/...java/ssu/eatssu/domain/menu/MealMenu.java → ...u/eatssu/domain/menu/entity/MealMenu.java b/...java/ssu/eatssu/domain/menu/MealMenu.java → ...u/eatssu/domain/menu/entity/MealMenu.java
@@ -1,4 +1,4 @@
-package ssu.eatssu.domain.menu;
+package ssu.eatssu.domain.menu.entity;
 
 import jakarta.persistence.*;
 import lombok.*;

diff --git a/...ain/java/ssu/eatssu/domain/menu/Menu.java → ...a/ssu/eatssu/domain/menu/entity/Menu.java b/...ain/java/ssu/eatssu/domain/menu/Menu.java → ...a/ssu/eatssu/domain/menu/entity/Menu.java
@@ -1,4 +1,4 @@
-package ssu.eatssu.domain.menu;
+package ssu.eatssu.domain.menu.entity;
 
 import jakarta.persistence.*;
 import lombok.*;

diff --git a/...java/ssu/eatssu/domain/menu/MenuType.java → ...u/eatssu/domain/menu/entity/MenuType.java b/...java/ssu/eatssu/domain/menu/MenuType.java → ...u/eatssu/domain/menu/entity/MenuType.java
@@ -1,11 +1,10 @@
-package ssu.eatssu.domain.menu;
+package ssu.eatssu.domain.menu.entity;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import lombok.Getter;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
 import ssu.eatssu.domain.restaurant.RestaurantName;
 
 import static ssu.eatssu.domain.restaurant.RestaurantName.*;

diff --git a/...domain/repository/MealMenuRepository.java → ...n/menu/repository/MealMenuRepository.java b/...domain/repository/MealMenuRepository.java → ...n/menu/repository/MealMenuRepository.java
@@ -1,7 +1,7 @@
-package ssu.eatssu.domain.repository;
+package ssu.eatssu.domain.menu.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import ssu.eatssu.domain.menu.MealMenu;
+import ssu.eatssu.domain.menu.entity.MealMenu;
 
 public interface MealMenuRepository extends JpaRepository<MealMenu, Long> {
 }
diff --git a/...ssu/domain/repository/MealRepository.java → ...omain/menu/repository/MealRepository.java b/...ssu/domain/repository/MealRepository.java → ...omain/menu/repository/MealRepository.java
@@ -1,7 +1,7 @@
-package ssu.eatssu.domain.repository;
+package ssu.eatssu.domain.menu.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import ssu.eatssu.domain.menu.Meal;
+import ssu.eatssu.domain.menu.entity.Meal;
 import ssu.eatssu.domain.restaurant.Restaurant;
 import ssu.eatssu.domain.enums.TimePart;
 

diff --git a/...ssu/domain/repository/MenuRepository.java → ...omain/menu/repository/MenuRepository.java b/...ssu/domain/repository/MenuRepository.java → ...omain/menu/repository/MenuRepository.java
@@ -1,7 +1,7 @@
-package ssu.eatssu.domain.repository;
+package ssu.eatssu.domain.menu.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import ssu.eatssu.domain.menu.Menu;
+import ssu.eatssu.domain.menu.entity.Menu;
 import ssu.eatssu.domain.restaurant.Restaurant;
 
 import java.util.List;

diff --git a/.../java/ssu/eatssu/service/MenuService.java → ...tssu/domain/menu/service/MenuService.java b/.../java/ssu/eatssu/service/MenuService.java → ...tssu/domain/menu/service/MenuService.java
@@ -1,30 +1,33 @@
-package ssu.eatssu.service;
+package ssu.eatssu.domain.menu.service;
+
+import static ssu.eatssu.global.util.DateUtils.toDate;
 
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import ssu.eatssu.domain.menu.Meal;
-import ssu.eatssu.domain.menu.MealMenu;
-import ssu.eatssu.domain.menu.Menu;
-import ssu.eatssu.domain.rating.RatingCalculator;
+import ssu.eatssu.domain.menu.dto.MenuRequest;
+import ssu.eatssu.domain.menu.dto.MenuResponse.FixMenuInfo;
+import ssu.eatssu.domain.menu.dto.MenuResponse.MenuList;
+import ssu.eatssu.domain.menu.dto.MenuResponse.TodayMeal;
+import ssu.eatssu.domain.menu.entity.Meal;
+import ssu.eatssu.domain.menu.entity.MealMenu;
+import ssu.eatssu.domain.menu.entity.Menu;
+import ssu.eatssu.domain.rating.JpaProjectionRatingCalculator;
 import ssu.eatssu.domain.restaurant.Restaurant;
 import ssu.eatssu.domain.restaurant.RestaurantName;
 import ssu.eatssu.domain.enums.TimePart;
-import ssu.eatssu.domain.repository.MealMenuRepository;
-import ssu.eatssu.domain.repository.MealRepository;
-import ssu.eatssu.domain.repository.MenuRepository;
+import ssu.eatssu.domain.menu.repository.MealMenuRepository;
+import ssu.eatssu.domain.menu.repository.MealRepository;
+import ssu.eatssu.domain.menu.repository.MenuRepository;
 import ssu.eatssu.domain.repository.RestaurantRepository;
-import ssu.eatssu.handler.response.BaseException;
+import ssu.eatssu.global.handler.response.BaseException;
 import ssu.eatssu.handler.response.BaseResponseStatus;
 import ssu.eatssu.utils.validators.MenuValidator;
-import ssu.eatssu.web.menu.dto.MenuReqDto;
 
 import java.util.Collections;
 import java.util.List;
 
-import static ssu.eatssu.utils.DateUtils.toDate;
-import static ssu.eatssu.web.menu.dto.MenuResponse.*;
 
 @Slf4j
 @Service
@@ -36,47 +39,48 @@ public class MenuService {
     private final MealRepository mealRepository;
     private final MealMenuRepository mealMenuRepository;
     private final RestaurantRepository restaurantRepository;
-
-    private final RatingCalculator ratingCalculator;
+    private final JpaProjectionRatingCalculator ratingCalculator;
 
     /**
      * 고정 메뉴 조회
      * <p>특정 식당에 해당하는 고정메뉴 목록을 조회합니다.</p>
      */
-    public List<FixMenuInfo> findFixMenuList(RestaurantName restaurantName) {
+    public List<FixMenuInfo> findMenus(RestaurantName restaurantName) {
 
         Restaurant restaurant = restaurantRepository.findByRestaurantName(restaurantName)
-                .orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_RESTAURANT));
+            .orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_RESTAURANT));
 
         List<Menu> menuList = menuRepository.findAllByRestaurant(restaurant);
         return menuList.stream()
-                .map(menu -> FixMenuInfo.from(menu, ratingCalculator.menuAverageMainRating(menu)))
-                .toList();
+            .map(menu -> FixMenuInfo.from(menu, ratingCalculator.menuAverageMainRating(menu)))
+            .toList();
     }
 
     /**
      * 식단 목록 조회
      * <p>변동메뉴 식당(학생식당, 도담, 기숙사 식당)의 특정날짜(yyyyMMdd), 특정시간대(아침/점심/저녁)에 해당하는 식단 목록을 조회한다.</p>
      */
-    public List<TodayMeal> findMealList(TimePart timePart, String date, RestaurantName restaurantName) {
+    public List<TodayMeal> findMealList(TimePart timePart, String date,
+        RestaurantName restaurantName) {
 
         Restaurant restaurant = restaurantRepository.findByRestaurantName(restaurantName)
-                .orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_RESTAURANT));
+            .orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_RESTAURANT));
 
-        List<Meal> mealList = mealRepository.findAllByDateAndTimePartAndRestaurant(toDate(date), timePart, restaurant);
+        List<Meal> mealList = mealRepository.findAllByDateAndTimePartAndRestaurant(toDate(date),
+            timePart, restaurant);
 
         //mealList 를 TodayMeal 로 매핑 후 반환
         return mealList.stream()
-                .map(meal -> TodayMeal.from(meal, ratingCalculator.mealAverageMainRating(meal)))
-                .toList();
+            .map(meal -> TodayMeal.from(meal, ratingCalculator.mealAverageMainRating(meal)))
+            .toList();
     }
 
 
     /**
      * 식단 등록
      */
     public void createMeal(TimePart timePart, String date, RestaurantName restaurantName,
-                           MenuReqDto.AddTodayMenuList addTodayMenuList) {
+        MenuRequest.AddTodayMenuList addTodayMenuList) {
 
         Restaurant restaurant = restaurantRepository.findByRestaurantName(restaurantName)
             .orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_RESTAURANT));
@@ -101,7 +105,7 @@ public void createMeal(TimePart timePart, String date, RestaurantName restaurant
     /**
      * 식단에 메뉴 추가
      */
-    private void addMenu(Meal meal, MenuReqDto.AddTodayMenuList addTodayMenuList) {
+    private void addMenu(Meal meal, MenuRequest.AddTodayMenuList addTodayMenuList) {
         Restaurant restaurant = meal.getRestaurant();
 
         for (String addMenuName : addTodayMenuList.getTodayMenuList()) {
@@ -110,7 +114,7 @@ private void addMenu(Meal meal, MenuReqDto.AddTodayMenuList addTodayMenuList) {
 
             //메뉴 찾아서
             Menu menu = menuRepository.findByNameAndRestaurant(addMenuName, restaurant)
-                    .orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_MENU));
+	.orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_MENU));
 
             //식단에 메뉴 추가
             MealMenu mealMenu = MealMenu.builder().menu(menu).meal(meal).build();
@@ -137,9 +141,10 @@ private void checkAndCreateMenu(String menuName, Restaurant restaurant) {
      * 이미 존재하는 식단인지 확인
      */
     public boolean isExistMeal(TimePart timePart, String date, Restaurant restaurant,
-                               MenuReqDto.AddTodayMenuList addTodayMenuList) {
+        MenuRequest.AddTodayMenuList addTodayMenuList) {
 
-        List<Meal> meals = mealRepository.findAllByDateAndTimePartAndRestaurant(toDate(date), timePart, restaurant);
+        List<Meal> meals = mealRepository.findAllByDateAndTimePartAndRestaurant(toDate(date),
+            timePart, restaurant);
 
         //비교를 위한 정렬
         Collections.sort(addTodayMenuList.getTodayMenuList());
@@ -151,7 +156,7 @@ public boolean isExistMeal(TimePart timePart, String date, Restaurant restaurant
 
             //메뉴 목록이 같다면 이미 존재하는 식단
             if (menuNameList.equals(addTodayMenuList.getTodayMenuList())) {
-                return true;
+	return true;
             }
         }
 
@@ -164,7 +169,7 @@ public boolean isExistMeal(TimePart timePart, String date, Restaurant restaurant
     public MenuList findMenuListInMeal(Long mealId) {
 
         Meal meal = mealRepository.findById(mealId)
-                        .orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_MEAL));
+            .orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_MEAL));
 
         return MenuList.from(meal);
     }
@@ -175,7 +180,7 @@ public MenuList findMenuListInMeal(Long mealId) {
     public void deleteMeal(Long mealId) {
 
         Meal meal = mealRepository.findById(mealId)
-                .orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_MEAL));
+            .orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_MEAL));
 
         //식단에 포함된 메뉴 목록 조회
         List<Menu> menuList = meal.getMealMenus().stream().map(MealMenu::getMenu).toList();
@@ -194,9 +199,9 @@ public void deleteMeal(Long mealId) {
      */
     public void cleanupGarbageMenu(List<Menu> menuList) {
 
-        for(Menu menu : menuList){
-            if(menu.getMealMenus().isEmpty()) {
-                menuRepository.delete(menu);
+        for (Menu menu : menuList) {
+            if (menu.getMealMenus().isEmpty()) {
+	menuRepository.delete(menu);
             }
         }
     }