-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #60 from everymeals/feature/meal-review
[Feature/meal review] 학식 리뷰 API 기능 개발
- Loading branch information
Showing
36 changed files
with
1,273 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
src/main/java/everymeal/server/meal/repository/MealDao.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package everymeal.server.meal.repository; | ||
|
|
||
|
|
||
| import everymeal.server.meal.controller.dto.response.DayMealListGetRes; | ||
| import everymeal.server.meal.entity.Meal; | ||
| import jakarta.persistence.EntityManager; | ||
| import java.sql.PreparedStatement; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.jdbc.core.JdbcTemplate; | ||
| import org.springframework.stereotype.Repository; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| @Repository | ||
| @RequiredArgsConstructor | ||
| public class MealDao { | ||
| private final EntityManager em; | ||
|
|
||
| private final JdbcTemplate jdbcTemplate; | ||
|
|
||
| @Transactional | ||
| public void saveAll(List<Meal> mealList) { | ||
| String sql = | ||
| "INSERT INTO meal ( meal_status, meal_type, menu, offered_at, price, restaurant_idx, category) " | ||
| + "VALUES ( ?, ?, ?, ?, ?, ?, ?)"; | ||
|
|
||
| jdbcTemplate.batchUpdate( | ||
| sql, | ||
| mealList, | ||
| mealList.size(), | ||
| (PreparedStatement ps, Meal meal) -> { | ||
| ps.setString(1, meal.getMealStatus().toString()); | ||
| ps.setString(2, meal.getMealType().toString()); | ||
| ps.setString(3, meal.getMenu()); | ||
| ps.setString(4, meal.getOfferedAt().toString()); | ||
| ps.setDouble(5, meal.getPrice()); | ||
| ps.setLong(6, meal.getRestaurant().getIdx()); | ||
| ps.setString(7, meal.getCategory().toString()); | ||
| }); | ||
| } | ||
|
|
||
| public Map<String, List<DayMealListGetRes>> findDayListByOfferedAtAndUniversity( | ||
| Optional<String> offeredAt, | ||
| Optional<String> universityName, | ||
| Optional<String> campusName) { | ||
| // 쿼리 생성 | ||
| String query = | ||
| """ | ||
| SELECT NEW everymeal.server.meal.controller.dto.response.DayMealListGetRes( | ||
| COALESCE(m.idx, 0) AS mealIdx, | ||
| COALESCE(m.offeredAt, :offeredAt) AS offeredAt, | ||
| COALESCE(m.mealStatus, 'OPEN') AS mealStatus, | ||
| meal_types.mealType, | ||
| COALESCE(m.menu, '등록된 식단이 없습니다.') AS menu, | ||
| COALESCE(m.price, 0) AS price, | ||
| COALESCE(m.category, 'DEFAULT') AS category, | ||
| r.name AS restaurantName, | ||
| CONCAT(u.name, ' ', u.campusName) AS universityName) | ||
| FROM Restaurant r | ||
| JOIN (SELECT DISTINCT mealType AS mealType FROM Meal) AS meal_types ON 1=1 | ||
| LEFT JOIN Meal m ON m.restaurant = r AND m.offeredAt = DATE(:offeredAt) AND m.mealType = meal_types.mealType | ||
| INNER JOIN University u ON r.university = u | ||
| WHERE | ||
| u.name = :universityName AND u.campusName = :campusName | ||
| ORDER BY r.name ASC | ||
| """; | ||
| // 쿼리 옵션 추가 및 실행 | ||
| List<DayMealListGetRes> result = | ||
| em.createQuery(query, DayMealListGetRes.class) | ||
| .setParameter("offeredAt", offeredAt.orElse(null)) | ||
| .setParameter("universityName", universityName.orElse(null)) | ||
| .setParameter("campusName", campusName.orElse(null)) | ||
| .getResultList(); | ||
| // 결과 반환용 변수 선언 | ||
| Map<String, List<DayMealListGetRes>> map = new HashMap<>(); | ||
| for (DayMealListGetRes meal : result) { | ||
| String restaurantName = meal.restaurantName(); | ||
|
|
||
| // 해당 레스토랑 이름으로 맵에서 리스트를 가져오거나 없으면 새 리스트 생성 | ||
| List<DayMealListGetRes> restaurantList = | ||
| map.computeIfAbsent(restaurantName, k -> new ArrayList<>()); | ||
|
|
||
| // 현재 Meal을 레스토랑 리스트에 추가 | ||
| restaurantList.add(meal); | ||
| } | ||
|
|
||
| return map; | ||
| } | ||
| } |
30 changes: 29 additions & 1 deletion
30
src/main/java/everymeal/server/meal/repository/MealRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,35 @@ | ||
| package everymeal.server.meal.repository; | ||
|
|
||
|
|
||
| import everymeal.server.meal.controller.dto.response.DayMealListGetRes; | ||
| import everymeal.server.meal.entity.Meal; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import org.springframework.data.jpa.repository.JpaRepository; | ||
| import org.springframework.data.jpa.repository.Query; | ||
| import org.springframework.data.repository.query.Param; | ||
|
|
||
| public interface MealRepository extends JpaRepository<Meal, String> {} | ||
| public interface MealRepository extends JpaRepository<Meal, Long> { | ||
| @Query( | ||
| value = | ||
| "SELECT new everymeal.server.meal.controller.dto.response.DayMealListGetRes(" | ||
| + " COALESCE(m.idx, 0) AS mealIdx," | ||
| + " COALESCE(m.offeredAt, :offeredAt) AS offeredAt," | ||
| + " COALESCE(m.mealStatus, 'OPEN') AS mealStatus," | ||
| + " meal_types.mealType," | ||
| + " COALESCE(m.menu, '등록된 식단이 없습니다.') AS menu," | ||
| + " COALESCE(m.price, 0) AS price," | ||
| + " COALESCE(m.category, 'DEFAULT') AS category," | ||
| + " r.name AS restaurantName," | ||
| + " CONCAT(u.name, ' ', u.campusName) AS universityName) " | ||
| + "FROM Restaurant r " | ||
| + "JOIN (SELECT DISTINCT mealType AS mealType FROM Meal) AS meal_types ON 1=1 " | ||
| + "LEFT JOIN Meal m ON m.restaurant = r AND m.offeredAt = DATE(:offeredAt) AND m.mealType = meal_types.mealType " | ||
| + "INNER JOIN University u ON r.university = u " | ||
| + "WHERE u.name = :universityName AND u.campusName = :campusName " | ||
| + "ORDER BY r.name ASC") | ||
| List<DayMealListGetRes> findDayListByOfferedAtAndUniversity( | ||
| @Param("offeredAt") Optional<String> offeredAt, | ||
| @Param("universityName") Optional<String> universityName, | ||
| @Param("campusName") Optional<String> campusName); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.