fix(be): ES search 오류 원인 수정

yeongbin1999 · yeongbin1999 · commit 093b0acb69cd · 2025-10-12T17:03:50.000+09:00
diff --git a/backend/src/main/java/com/deliveranything/domain/delivery/service/DeliveryService.java b/backend/src/main/java/com/deliveranything/domain/delivery/service/DeliveryService.java
@@ -202,7 +202,7 @@ private CursorPageResponse<DeliveredDetailsDto> getDeliveredDetailsCursor(
     Long lastOrderId = null;
 
     if (nextPageToken != null) {
-      String[] decoded = CursorUtil.decode(nextPageToken);
+      String[] decoded = (String[]) CursorUtil.decode(nextPageToken);
 
       if (decoded != null && decoded.length == 2) {
         try {
diff --git a/backend/src/main/java/com/deliveranything/domain/order/service/StoreOrderService.java b/backend/src/main/java/com/deliveranything/domain/order/service/StoreOrderService.java
@@ -37,7 +37,7 @@ public CursorPageResponse<OrderResponse> getStoreOrdersByCursor(
   ) {
     LocalDateTime lastCreatedAt = null;
     Long lastOrderId = null;
-    String[] decodedParts = CursorUtil.decode(nextPageToken);
+    String[] decodedParts = (String[]) CursorUtil.decode(nextPageToken);
 
     if (decodedParts != null && decodedParts.length == 2) {
       try {
diff --git a/backend/src/main/java/com/deliveranything/domain/review/service/ReviewService.java b/backend/src/main/java/com/deliveranything/domain/review/service/ReviewService.java
@@ -39,7 +39,6 @@
 import org.springframework.data.redis.connection.ReturnType;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.data.redis.core.ZSetOperations.TypedTuple;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -179,7 +178,7 @@ public ReviewRatingAndListResponseDto getMyReviews(Long userId, Profile profile,
     ProfileType profileType = profile.getType();
     Long profileId = profile.getId();
 
-    String[] decodedCursor = CursorUtil.decode(cursor);
+    String[] decodedCursor = (String[]) CursorUtil.decode(cursor);
 
     //실제 조회
     List<ReviewResponse> reviewList = getReviewsByProfile(profileType, profileId, sort,
@@ -227,7 +226,7 @@ public ReviewRatingAndListResponseDto getStoreReviews(Long storeId, StoreReviewS
     log.info("상점 리뷰 리스트 조회 요청 - storeId: {}, sort: {}, cursor: {}, size: {}", storeId, sort, cursor,
         size);
 
-    String[] decodedCursor = CursorUtil.decode(cursor);
+    String[] decodedCursor = (String[]) CursorUtil.decode(cursor);
 
     //실제 조회
     List<Review> reviews = reviewRepository.getStoreReviews(storeId, sort,
diff --git a/backend/src/main/java/com/deliveranything/domain/search/store/document/StoreDocument.java b/backend/src/main/java/com/deliveranything/domain/search/store/document/StoreDocument.java
@@ -2,15 +2,19 @@
 
 import com.deliveranything.domain.store.store.entity.Store;
 import com.deliveranything.domain.store.store.enums.StoreStatus;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.data.elasticsearch.annotations.GeoPointField;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 
 @Getter
@@ -40,12 +44,15 @@ public class StoreDocument {
   @Field(type = FieldType.Text, name = "road_address")
   private String roadAddress;
 
-  @Field(type = FieldType.Object, name = "location")
+  @GeoPointField
   private GeoPoint location;
 
   @Field(type = FieldType.Keyword, name = "status")
   private StoreStatus status;
 
+  @Field(type = FieldType.Date, name = "created_at", format = DateFormat.date_time)
+  private OffsetDateTime createdAt;
+
   @Setter
   @Builder.Default
   @Field(type = FieldType.Text, name = "keywords")
@@ -62,6 +69,7 @@ public static StoreDocument from(Store store) {
         .categoryId(store.getStoreCategory().getId())
         .roadAddress(store.getRoadAddr())
         .imageUrl(store.getImageUrl())
+        .createdAt(store.getCreatedAt().atOffset(ZoneOffset.ofHours(9)))
         .build();
   }
 }
diff --git a/backend/src/main/java/com/deliveranything/domain/search/store/repository/StoreSearchRepositoryImpl.java b/backend/src/main/java/com/deliveranything/domain/search/store/repository/StoreSearchRepositoryImpl.java
@@ -1,12 +1,15 @@
 package com.deliveranything.domain.search.store.repository;
 
+import co.elastic.clients.elasticsearch._types.DistanceUnit;
+import co.elastic.clients.elasticsearch._types.GeoDistanceType;
 import co.elastic.clients.elasticsearch._types.SortOrder;
 import co.elastic.clients.elasticsearch._types.query_dsl.BoolQuery;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
 import com.deliveranything.domain.search.store.document.StoreDocument;
 import com.deliveranything.domain.search.store.dto.StoreSearchRequest;
 import com.deliveranything.global.common.CursorPageResponse;
 import com.deliveranything.global.util.CursorUtil;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
@@ -25,78 +28,119 @@ public class StoreSearchRepositoryImpl implements StoreSearchRepositoryCustom {
 
   private final ElasticsearchOperations elasticsearchOperations;
 
-  // 검색에 사용할 필드명은 상수로 관리
   private static final String FIELD_NAME = "name";
   private static final String FIELD_DESCRIPTION = "description";
   private static final String FIELD_KEYWORDS = "keywords";
   private static final String FIELD_CATEGORY_ID = "category_id";
   private static final String FIELD_LOCATION = "location";
-  private static final String SORT_SCORE = "_score";
-  private static final String SORT_ID = "_id";
+  private static final String SORT_ID = "id";
 
   @Override
   public CursorPageResponse<StoreDocument> search(StoreSearchRequest request) {
     int querySize = request.limit() + 1;
 
+    // 검색 조건 구성
     BoolQuery.Builder boolQueryBuilder = new BoolQuery.Builder();
-
-    if(StringUtils.hasText(request.searchText())) {
-      boolQueryBuilder.must(m -> m
-          .multiMatch(mm -> mm
-              .query(request.searchText())
-              .fields(FIELD_NAME, FIELD_DESCRIPTION, FIELD_KEYWORDS)
-          ));
-    }
-
-    if(request.categoryId() != null) {
-      boolQueryBuilder.filter(f -> f
-          .term(t -> t
-              .field(FIELD_CATEGORY_ID)
-              .value(request.categoryId())
-          ));
-    }
-
-    boolQueryBuilder.filter(f -> f
-        .geoDistance(g -> g
-            .field(FIELD_LOCATION)
-            .location(l -> l.latlon(ll -> ll.lat(request.lat()).lon(request.lng())))
-            .distance(request.distanceKm() + "km")
-        ));
+    applyFilters(boolQueryBuilder, request);
 
     NativeQueryBuilder queryBuilder = new NativeQueryBuilder()
         .withQuery(Query.of(q -> q.bool(boolQueryBuilder.build())))
-        .withPageable(PageRequest.of(0, querySize))
-        .withSort(s -> s.field(f -> f.field(SORT_SCORE).order(SortOrder.Desc)))
-        .withSort(s -> s.field(f -> f.field(SORT_ID).order(SortOrder.Asc)));
-
-    if(StringUtils.hasText(request.nextPageToken())) {
-      try {
-        String[] decodedCursor = CursorUtil.decode(request.nextPageToken());
-        if (decodedCursor != null) {
-          queryBuilder.withSearchAfter(List.of(decodedCursor));
-        }
-      } catch (IllegalArgumentException e) {
-        // 유효하지 않은 토큰일 경우 로그를 남기고 첫 페이지를 반환
-        System.err.println("Invalid next page token: " + e.getMessage());
+        .withPageable(PageRequest.of(0, querySize));
+
+    // 정렬 조건
+    if (request.lat() != null && request.lng() != null) {
+      queryBuilder
+          .withSort(s -> s.geoDistance(g -> g
+              .field(FIELD_LOCATION)
+              .location(l -> l.latlon(ll -> ll.lat(request.lat()).lon(request.lng())))
+              .unit(DistanceUnit.Kilometers)
+              .distanceType(GeoDistanceType.Arc)
+              .order(SortOrder.Asc)));
+    }
+
+    // _id 정렬 또한 알 수 없는 이유로 실패하여, 가장 안정적인 _doc 순서로 정렬;;
+    queryBuilder.withSort(s -> s.field(f -> f.field("_doc").order(SortOrder.Asc)));
+
+    // 커서(search_after) 처리
+    if (StringUtils.hasText(request.nextPageToken())) {
+      Object[] decodedCursor = CursorUtil.decode(request.nextPageToken());
+      if (decodedCursor != null) {
+        Object[] safeCursor = Arrays.stream(decodedCursor)
+            .map(value -> {
+              if (value instanceof Number) return value;
+              if (value instanceof String s) return s;
+              return value;
+            })
+            .toArray();
+        queryBuilder.withSearchAfter(Arrays.asList(safeCursor));
       }
     }
 
     NativeQuery searchQuery = queryBuilder.build();
-    SearchHits<StoreDocument> searchHits = elasticsearchOperations.search(searchQuery, StoreDocument.class);
 
-    List<StoreDocument> documents = searchHits.getSearchHits().stream()
-        .map(SearchHit::getContent).collect(Collectors.toList());
+    // 검색 실행
+    SearchHits<StoreDocument> searchHits;
+    try {
+      searchHits = elasticsearchOperations.search(searchQuery, StoreDocument.class);
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to search store documents. Check logs for mapping or query errors.", e);
+    }
+
+    List<SearchHit<StoreDocument>> hits = searchHits.getSearchHits();
+    List<StoreDocument> documents = hits.stream()
+        .map(SearchHit::getContent)
+        .collect(Collectors.toList());
 
+    // 다음 페이지 여부 확인
     boolean hasNext = documents.size() > request.limit();
-    List<StoreDocument> responseDocuments = hasNext ? documents.subList(0, request.limit()) : documents;
+    List<StoreDocument> responseDocuments = hasNext
+        ? documents.subList(0, request.limit())
+        : documents;
 
+    // 다음 페이지 토큰 생성
     String nextToken = null;
-    if(hasNext) {
-      SearchHit<StoreDocument> lastHit = searchHits.getSearchHits().get(responseDocuments.size() - 1);
-      // _score, _id 순서에 맞게 정렬 값을 배열로 전달
-      nextToken = CursorUtil.encode(lastHit.getSortValues().toArray());
+    if (hasNext) {
+      SearchHit<StoreDocument> lastHit = hits.get(request.limit() - 1);
+      Object[] lastSortValues = lastHit.getSortValues().stream()
+          .map(value -> {
+            if (value instanceof Number) return value;
+            if (value instanceof String s) return s;
+            return value;
+          })
+          .toArray();
+      nextToken = CursorUtil.encode(lastSortValues);
     }
 
     return new CursorPageResponse<>(responseDocuments, nextToken, hasNext);
   }
+
+  // 검색 필터 구성
+  private void applyFilters(BoolQuery.Builder boolQueryBuilder, StoreSearchRequest request) {
+    if (StringUtils.hasText(request.searchText())) {
+      boolQueryBuilder.must(m -> m.multiMatch(mm -> mm
+          .query(request.searchText())
+          .fields(FIELD_NAME, FIELD_DESCRIPTION, FIELD_KEYWORDS)
+      ));
+    }
+
+    if (request.categoryId() != null) {
+      boolQueryBuilder.filter(f -> f.term(t -> t
+          .field(FIELD_CATEGORY_ID)
+          .value(request.categoryId())));
+    }
+
+    if (request.lat() != null && request.lng() != null) {
+      if (request.distanceKm() != null) {
+        boolQueryBuilder.filter(f -> f.geoDistance(g -> g
+            .field(FIELD_LOCATION)
+            .location(l -> l.latlon(ll -> ll.lat(request.lat()).lon(request.lng())))
+            .distance(request.distanceKm() + "km")
+            .distanceType(GeoDistanceType.Arc)
+        ));
+      } else {
+        // 거리순 정렬 시 location 필드가 없는 도큐먼트는 오류를 유발할 수 있으므로, 필드가 존재하는 도큐먼트만 필터링
+        boolQueryBuilder.filter(f -> f.exists(e -> e.field(FIELD_LOCATION)));
+      }
+    }
+  }
 }
diff --git a/backend/src/main/java/com/deliveranything/global/util/CursorUtil.java b/backend/src/main/java/com/deliveranything/global/util/CursorUtil.java
@@ -1,38 +1,31 @@
 package com.deliveranything.global.util;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.Base64;
-import java.util.stream.Collectors;
 import org.springframework.util.StringUtils;
 
 public final class CursorUtil {
 
-  private static final String DELIMITER = "_";
+  private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
-  private CursorUtil() {
-    // Prevent instantiation
-  }
+  private CursorUtil() {}
 
   public static String encode(Object... keys) {
-    if (keys == null || keys.length == 0) {
-      return null;
+    if (keys == null || keys.length == 0) return null;
+    try {
+      byte[] jsonBytes = OBJECT_MAPPER.writeValueAsBytes(keys);
+      return Base64.getEncoder().encodeToString(jsonBytes);
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to encode cursor", e);
     }
-    String rawCursor = Arrays.stream(keys)
-        .map(String::valueOf)
-        .collect(Collectors.joining(DELIMITER));
-    return Base64.getEncoder().encodeToString(rawCursor.getBytes(StandardCharsets.UTF_8));
   }
 
-  public static String[] decode(String cursor) {
-    if (!StringUtils.hasText(cursor)) {
-      return null;
-    }
+  public static Object[] decode(String cursor) {
+    if (!StringUtils.hasText(cursor)) return null;
     try {
-      String decoded = new String(Base64.getDecoder().decode(cursor), StandardCharsets.UTF_8);
-      return decoded.split(DELIMITER);
-    } catch (IllegalArgumentException e) {
-      // Handle invalid Base64 format
+      byte[] decodedBytes = Base64.getDecoder().decode(cursor);
+      return OBJECT_MAPPER.readValue(decodedBytes, Object[].class);
+    } catch (Exception e) {
       return null;
     }
   }
