From d4fabf75bef387e3d8c81f7bd33c6912fd51a060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EC=A4=80=ED=99=98?= <musoyou1085@gmail.com>
Date: Fri, 15 Aug 2025 10:40:18 +0900
Subject: [PATCH] =?UTF-8?q?:bug:=20fix:=20=EB=8D=B0=EC=9D=B4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=BD=94=EC=8A=A4=20=EC=9E=85=EB=A0=A5=EA=B0=92=20=EC=88=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/date/repository/DatePlaceRepository.java         | 6 ++++--
 .../domain/date/service/command/DateCommandServiceImpl.java | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/withtime/be/withtimebe/domain/date/repository/DatePlaceRepository.java b/src/main/java/org/withtime/be/withtimebe/domain/date/repository/DatePlaceRepository.java
index b9b642e..00eecd0 100644
--- a/src/main/java/org/withtime/be/withtimebe/domain/date/repository/DatePlaceRepository.java
+++ b/src/main/java/org/withtime/be/withtimebe/domain/date/repository/DatePlaceRepository.java
@@ -12,9 +12,11 @@ public interface DatePlaceRepository extends JpaRepository<DatePlace, Long> {
 
     @Query("select d from DatePlace d" +
             " where d.lotNumberAddress like %:keyword1%" +
-            " and d.lotNumberAddress like %:keyword2%")
+            " and d.lotNumberAddress like %:keyword2%" +
+            " and d.lotNumberAddress like %:keyword3%")
     List<DatePlace> findByAddressContainingAll(
             @Param("keyword1") String keyword1,
-            @Param("keyword2") String keyword2
+            @Param("keyword2") String keyword2,
+            @Param("keyword3") String keyword3
     );
 }
diff --git a/src/main/java/org/withtime/be/withtimebe/domain/date/service/command/DateCommandServiceImpl.java b/src/main/java/org/withtime/be/withtimebe/domain/date/service/command/DateCommandServiceImpl.java
index b1e1ff7..fc2812b 100644
--- a/src/main/java/org/withtime/be/withtimebe/domain/date/service/command/DateCommandServiceImpl.java
+++ b/src/main/java/org/withtime/be/withtimebe/domain/date/service/command/DateCommandServiceImpl.java
@@ -131,7 +131,10 @@ private List<DatePlace> collectCandidatesByAddressTokens(List<String> tokens) {
             String[] parts = token.trim().split("\\s+");
             String k1 = parts.length >= 1 ? parts[0] : "";
             String k2 = parts.length >= 2 ? parts[1] : "";
-            List<DatePlace> found = datePlaceRepository.findByAddressContainingAll(k1, k2);
+            String k3 = (parts.length >= 3)
+                    ? (parts[2].length() >= 2 ? parts[2].substring(0, 2) : parts[2])
+                    : "";
+            List<DatePlace> found = datePlaceRepository.findByAddressContainingAll(k1, k2, k3);
             for (DatePlace p : found) {
                 Long id = p.getId();
                 if (id != null) {