From ad83102e1606bcbedfdccd9cf0f4c4e1b84ef121 Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Fri, 15 Aug 2025 10:13:56 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refactor=20:=20menu?= =?UTF-8?q?=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=BB=AC=EB=9F=BC=EB=AA=85=20?= =?UTF-8?q?=EB=AA=85=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/Centralthon/domain/menu/entity/Menu.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) From 3b573625aa677aad872784100044e0d529ad2497 Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Fri, 15 Aug 2025 10:20:47 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refactor=20:=20?= =?UTF-8?q?=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EC=96=B4=EB=85=B8?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menu/repository/MenuRepository.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) 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 ); From e33ecf661cf757e3f10f8914a538b7de2ff74b62 Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Fri, 15 Aug 2025 10:59:53 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refactor=20:=20?= =?UTF-8?q?=EB=B0=98=EC=B0=AC=20=EB=A9=94=EB=89=B4=20=EC=B9=B4=ED=85=8C?= =?UTF-8?q?=EA=B3=A0=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Centralthon/domain/menu/entity/enums/MenuCategory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; }