diff --git a/src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java b/src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java index cb15f39..1e1a892 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java +++ b/src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java @@ -24,10 +24,10 @@ public class Menu extends BaseEntity { @Column(nullable = false) private String name; - @Column(nullable = false) + @Column(name = "cost_price", nullable = false) private int costPrice; - @Column(nullable = false) + @Column(name = "sale_price", nullable = false) private int salePrice; @Column(nullable = false) diff --git a/src/main/java/com/example/Centralthon/domain/menu/entity/enums/MenuCategory.java b/src/main/java/com/example/Centralthon/domain/menu/entity/enums/MenuCategory.java index 4700ef0..6da96c8 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/entity/enums/MenuCategory.java +++ b/src/main/java/com/example/Centralthon/domain/menu/entity/enums/MenuCategory.java @@ -9,5 +9,5 @@ public enum MenuCategory { BRAISED, SEASONED, STIR_FRY, - GRILLED; + STEAMED; } diff --git a/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java b/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java index 46b30a5..d1afa6e 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java +++ b/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java @@ -10,20 +10,21 @@ import java.time.LocalDateTime; @Repository public interface MenuRepository extends JpaRepository { - @Query(value = "SELECT m.* FROM menus m JOIN stores s ON m.store_id = s.store_id WHERE " + - "s.latitude BETWEEN :minLat AND :maxLat " + - "AND s.longitude BETWEEN :minLng AND :maxLng " + - "AND ST_Distance_Sphere(POINT(s.longitude, s.latitude), POINT(:lng, :lat)) <= 2000 " + - "AND m.quantity > 0 " + - "AND m.deadline > :now", nativeQuery = true) + @Query(value = """ + SELECT m.* FROM menus m + JOIN stores s ON m.store_id = s.store_id + WHERE s.latitude BETWEEN :minLat AND :maxLat AND s.longitude BETWEEN :minLng AND :maxLng + AND ST_Distance_Sphere(POINT(s.longitude, s.latitude), POINT(:lng, :lat)) <= 2000 + AND m.quantity > 0 AND m.deadline > :now + """, nativeQuery = true) List findNearbyMenus( - double lat, - double lng, - LocalDateTime now, - double minLat, - double maxLat, - double minLng, - double maxLng + @Param("lat") double lat, + @Param("lng") double lng, + @Param("now") LocalDateTime now, + @Param("minLat") double minLat, + @Param("maxLat") double maxLat, + @Param("minLng") double minLng, + @Param("maxLng") double maxLng );