[feat] 웨이블존 추천 시스템 구현 완료

src/main/java/com/wayble/server/common/config/ElasticsearchConfig.java

@@ -4,7 +4,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration;
-import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 
 @Configuration
 public class ElasticsearchConfig extends ElasticsearchConfiguration {

src/main/java/com/wayble/server/explore/controller/WaybleZoneRecommendController.java

@@ -1,14 +1,15 @@
 package com.wayble.server.explore.controller;
 
 import com.wayble.server.common.response.CommonResponse;
+import com.wayble.server.explore.dto.recommend.WaybleZoneRecommendConditionDto;
 import com.wayble.server.explore.dto.recommend.WaybleZoneRecommendResponseDto;
 import com.wayble.server.explore.service.WaybleZoneRecommendService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @RestController
 @RequiredArgsConstructor
@@ -18,10 +19,17 @@ public class WaybleZoneRecommendController {
 
     private final WaybleZoneRecommendService waybleZoneRecommendService;
 
-    @GetMapping("/{userId}")
-    public CommonResponse<WaybleZoneRecommendResponseDto> getWaybleZonePersonalRecommend(
-            @PathVariable("userId") Long userId) {
-        WaybleZoneRecommendResponseDto dto = waybleZoneRecommendService.getWaybleZonePersonalRecommend(userId);
-        return CommonResponse.success(dto);
+    @GetMapping()
+    public CommonResponse<List<WaybleZoneRecommendResponseDto>> getWaybleZonePersonalRecommend(
+            @Valid @ModelAttribute WaybleZoneRecommendConditionDto conditionDto,
+            @RequestParam(name = "size", defaultValue = "1") int size) {
+
+        List<WaybleZoneRecommendResponseDto> result = waybleZoneRecommendService.getWaybleZonePersonalRecommend(
+                conditionDto.userId(),
+                conditionDto.latitude(),
+                conditionDto.longitude(),
+                size
+        );
+        return CommonResponse.success(result);
     }
 }

src/main/java/com/wayble/server/explore/dto/recommend/WaybleZoneRecommendConditionDto.java

@@ -0,0 +1,23 @@
+package com.wayble.server.explore.dto.recommend;
+
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+
+@Builder
+public record WaybleZoneRecommendConditionDto(
+        @DecimalMin(value = "-90.0", message = "위도는 -90.0 이상이어야 합니다.")
+        @DecimalMax(value = "90.0", message = "위도는 90.0 이하여야 합니다.")
+        @NotNull(message = "위도 입력은 필수입니다.")
+        Double latitude,
+
+        @DecimalMin(value = "-180.0", message = "경도는 -180.0 이상이어야 합니다.")
+        @DecimalMax(value = "180.0", message = "경도는 180.0 이하여야 합니다.")
+        @NotNull(message = "경도 입력은 필수입니다.")
+        Double longitude,
+
+        @NotNull(message = "유저 ID는 필수입니다.")
+        Long userId
+) {
+}

src/main/java/com/wayble/server/explore/dto/recommend/WaybleZoneRecommendResponseDto.java

@@ -1,8 +1,51 @@
 package com.wayble.server.explore.dto.recommend;
 
+import com.wayble.server.explore.entity.WaybleZoneDocument;
+import com.wayble.server.wayblezone.entity.WaybleZoneType;
+import lombok.Builder;
+
+@Builder
 public record WaybleZoneRecommendResponseDto(
 
-        String username
+        Long zoneId,
+
+        String zoneName,
+
+        WaybleZoneType zoneType,
+
+        String thumbnailImageUrl,
+
+        Double latitude,
+
+        Double longitude,
+
+        Double averageRating,
+
+        Long reviewCount,
+
+        Double distanceScore,
+
+        Double similarityScore,
+
+        Double recencyScore,
+
+        Double totalScore
 
 ) {
+    public static WaybleZoneRecommendResponseDto from(WaybleZoneDocument waybleZoneDocument) {
+        return WaybleZoneRecommendResponseDto.builder()
+                .zoneId(waybleZoneDocument.getZoneId())
+                .zoneName(waybleZoneDocument.getZoneName())
+                .zoneType(waybleZoneDocument.getZoneType())
+                .thumbnailImageUrl(waybleZoneDocument.getThumbnailImageUrl())
+                .averageRating(waybleZoneDocument.getAverageRating())
+                .reviewCount(waybleZoneDocument.getReviewCount())
+                .latitude(waybleZoneDocument.getAddress().getLocation().getLat())
+                .longitude(waybleZoneDocument.getAddress().getLocation().getLon())
+                .distanceScore(0.0)
+                .similarityScore(0.0)
+                .recencyScore(0.0)
+                .totalScore(0.0)
+                .build();
+    }
 }

src/main/java/com/wayble/server/explore/entity/RecommendLogDocument.java

@@ -0,0 +1,40 @@
+package com.wayble.server.explore.entity;
+import org.springframework.data.annotation.Id;
+import lombok.*;
+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 java.time.LocalDate;
+
+@ToString
+@Builder
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@Document(indexName = "recommend_log")
+public class RecommendLogDocument {
+
+    @Id
+    @Field(name = "id")
+    private String id;
+
+    private Long userId;
+
+    private Long zoneId;
+
+    @Field(type = FieldType.Date, format = DateFormat.date)
+    private LocalDate recommendationDate;
+
+    private Long recommendCount;
+
+    public void updateRecommendLog(LocalDate recommendationDate, Long recommendCount) {
+        if(recommendationDate != null) {
+            this.recommendationDate = recommendationDate;
+        }
+        if(recommendCount != null) {
+            this.recommendCount = recommendCount;
+        }
+    }
+}

src/main/java/com/wayble/server/explore/entity/WaybleZoneVisitLogDocument.java

@@ -19,7 +19,7 @@ public class WaybleZoneVisitLogDocument {
 
     @Id
     @Field(name = "id")
-    private Long logId;
+    private String logId;
 
     private Long userId;
 
@@ -31,7 +31,7 @@ public class WaybleZoneVisitLogDocument {
 
     public static WaybleZoneVisitLogDocument fromEntity(User user, Long zoneId) {
         return WaybleZoneVisitLogDocument.builder()
-                .logId(UUID.randomUUID().getMostSignificantBits() & Long.MAX_VALUE)
+                .logId(UUID.randomUUID().toString())
                 .userId(user.getId())
                 .zoneId(zoneId)
                 .gender(user.getGender())

src/main/java/com/wayble/server/explore/exception/RecommendErrorCase.java

@@ -8,7 +8,11 @@
 @RequiredArgsConstructor
 public enum RecommendErrorCase implements ErrorCase {
 
-    INVALID_USER(400, 6001, "잘못된 유저 정보입니다.");
+    INVALID_USER(400, 6001, "잘못된 유저 정보입니다."),
+
+    RECOMMEND_LOG_NOT_EXIST(400, 6002, "해당하는 추천 기록이 존재하지 않습니다."),
+
+    WAYBLE_ZONE_NOT_EXIST(400, 6003, "추천 기록에 해당하는 웨이블존이 존재하지 않습니다.");
 
     private final Integer httpStatusCode;
     private final Integer errorCode;

src/main/java/com/wayble/server/explore/exception/VisitLogErrorCase.java

@@ -0,0 +1,17 @@
+package com.wayble.server.explore.exception;
+
+import com.wayble.server.common.exception.ErrorCase;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum VisitLogErrorCase implements ErrorCase {
+
+    USER_NOT_EXIST(400, 7001, "해당하는 유저가 존재하지 않습니다."),
+    ZONE_NOT_EXIST(400, 7002, "해당하는 웨이블존이 존재하지 않습니다.");
+
+    private final Integer httpStatusCode;
+    private final Integer errorCode;
+    private final String message;
+}

src/main/java/com/wayble/server/explore/repository/RecommendLogDocumentRepository.java

@@ -0,0 +1,15 @@
+package com.wayble.server.explore.repository;
+
+import com.wayble.server.explore.entity.RecommendLogDocument;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+
+import java.time.LocalDate;
+import java.util.Optional;
+
+public interface RecommendLogDocumentRepository extends ElasticsearchRepository<RecommendLogDocument, String> {
+    Optional<RecommendLogDocument> findByUserIdAndZoneId(Long userId, Long zoneId);
+
+    boolean existsByUserIdAndZoneId(Long userId, Long zoneId);
+
+    Optional<RecommendLogDocument> findByUserIdAndRecommendationDate(Long userId, LocalDate recommendationDate);
+}

src/main/java/com/wayble/server/explore/repository/WaybleZoneVisitLogDocumentRepository.java

@@ -3,7 +3,10 @@
 import com.wayble.server.explore.entity.WaybleZoneVisitLogDocument;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
+import java.util.List;
 
-public interface WaybleZoneVisitLogDocumentRepository extends ElasticsearchRepository<WaybleZoneVisitLogDocument, Long>{
+
+public interface WaybleZoneVisitLogDocumentRepository extends ElasticsearchRepository<WaybleZoneVisitLogDocument, String>{
+    List<WaybleZoneVisitLogDocument> findAll();
 }