From 9b1de23a018439aec5d7b54604d46b6657406a1c Mon Sep 17 00:00:00 2001
From: mmihye <smilehye910@naver.com>
Date: Mon, 19 Aug 2024 01:24:01 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC?=
 =?UTF-8?q?=20nullable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../place/controller/PlaceController.java     |  4 +--
 .../place/repository/PlaceRepositoryImpl.java |  3 ++
 .../global/config/ElasticsearchClient.java    | 33 +++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/Journey/Together/global/config/ElasticsearchClient.java

diff --git a/src/main/java/Journey/Together/domain/place/controller/PlaceController.java b/src/main/java/Journey/Together/domain/place/controller/PlaceController.java
index 87a4074..208f4b6 100644
--- a/src/main/java/Journey/Together/domain/place/controller/PlaceController.java
+++ b/src/main/java/Journey/Together/domain/place/controller/PlaceController.java
@@ -100,7 +100,7 @@ public ApiResponse<?> updatePlaceMyReview(
     }
     @GetMapping("/search")
     public ApiResponse<SearchPlaceRes> searchPlaceList(
-                                                       @RequestParam @NotNull String category,
+                                                       @RequestParam(required = false) String category,
                                                        @RequestParam(required = false) String query,
                                                        @RequestParam(required = false) List<Long> disabilityType,
                                                        @RequestParam(required = false) List<Long> detailFilter,
@@ -113,7 +113,7 @@ public ApiResponse<SearchPlaceRes> searchPlaceList(
 
     @GetMapping("/search/map")
     public ApiResponse<List<PlaceRes>> searchPlaceList(
-            @RequestParam @NotNull String category,
+            @RequestParam(required = false) String category,
             @RequestParam @NotNull Double minX,
             @RequestParam @NotNull Double maxX,
             @RequestParam @NotNull Double minY,
diff --git a/src/main/java/Journey/Together/domain/place/repository/PlaceRepositoryImpl.java b/src/main/java/Journey/Together/domain/place/repository/PlaceRepositoryImpl.java
index 9c4ca90..c1ced3f 100644
--- a/src/main/java/Journey/Together/domain/place/repository/PlaceRepositoryImpl.java
+++ b/src/main/java/Journey/Together/domain/place/repository/PlaceRepositoryImpl.java
@@ -100,6 +100,9 @@ public List<Place> searchMap(String category,List<Long> disabilityType, List<Lon
     }
 
     private BooleanExpression categoryEq(String category) {
+        if(category == null || category.isEmpty())
+            return null;
+
         List<String> categoryList = new ArrayList<>(Arrays.asList("A01", "A02", "A03", "A04", "B01", "C01"));
 
         if(category.equals("ROOM"))
diff --git a/src/main/java/Journey/Together/global/config/ElasticsearchClient.java b/src/main/java/Journey/Together/global/config/ElasticsearchClient.java
new file mode 100644
index 0000000..5ce6c79
--- /dev/null
+++ b/src/main/java/Journey/Together/global/config/ElasticsearchClient.java
@@ -0,0 +1,33 @@
+package Journey.Together.global.config;
+
+import org.apache.http.client.CredentialsProvider;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.client.RestClientBuilder;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+
+public class ElasticsearchClient {
+
+    public static RestHighLevelClient createClient() {
+        // Elasticsearch 클러스터 호스트와 포트 설정
+        HttpHost host = new HttpHost("localhost", 9200, "http");
+        
+        // 인증 정보를 설정
+        CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("username", "password"));
+
+        // RestClientBuilder 생성
+        RestClientBuilder builder = RestClient.builder(host)
+            .setHttpClientConfigCallback(httpClientBuilder -> {
+                return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+            });
+
+        // RestHighLevelClient 생성
+        return new RestHighLevelClient(builder);
+    }
+}