[feat] 웨이블존 추천, 검색 응답 필드에 장애 시설 정보 추가

build.gradle

@@ -35,6 +35,8 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
 	implementation 'jakarta.servlet:jakarta.servlet-api:6.0.0'
+	implementation 'com.amazonaws:aws-java-sdk-core:1.12.698'
+	implementation 'com.amazonaws:aws-java-sdk-s3:1.12.698'
 	runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
 	runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 

src/main/java/com/wayble/server/common/entity/BaseEntity.java

@@ -23,4 +23,8 @@ public class BaseEntity {
 
     @Column(name = "deleted_at")
     private LocalDateTime deletedAt;
+
+    public void restore() {
+        this.deletedAt = null;
+    }
 }

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

@@ -21,7 +21,7 @@ public class WaybleZoneSearchController {
 
     private final WaybleZoneSearchService waybleZoneSearchService;
 
-    @GetMapping("")
+    @GetMapping("/maps")
     public CommonResponse<SearchSliceDto<WaybleZoneSearchResponseDto>> findByCondition(
             @Valid @ModelAttribute WaybleZoneSearchConditionDto conditionDto,
             @RequestParam(name = "page", defaultValue = "0") int page,

src/main/java/com/wayble/server/explore/dto/FacilityResponseDto.java

@@ -0,0 +1,29 @@
+package com.wayble.server.explore.dto;
+
+import com.wayble.server.explore.entity.EsWaybleZoneFacility;
+import lombok.Builder;
+
+@Builder
+public record FacilityResponseDto(
+        Boolean hasSlope,
+        Boolean hasNoDoorStep,
+        Boolean hasElevator,
+        Boolean hasTableSeat,
+        Boolean hasDisabledToilet,
+        String floorInfo
+) {
+    public static FacilityResponseDto from(EsWaybleZoneFacility facility) {
+        if (facility == null) {
+            return null;
+        }
+
+        return FacilityResponseDto.builder()
+                .hasSlope(facility.isHasSlope())
+                .hasNoDoorStep(facility.isHasNoDoorStep())
+                .hasElevator(facility.isHasElevator())
+                .hasTableSeat(facility.isHasTableSeat())
+                .hasDisabledToilet(facility.isHasDisabledToilet())
+                .floorInfo(facility.getFloorInfo())
+                .build();
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.wayble.server.explore.dto.recommend;
 
+import com.wayble.server.explore.dto.FacilityResponseDto;
 import com.wayble.server.explore.entity.WaybleZoneDocument;
 import com.wayble.server.wayblezone.entity.WaybleZoneType;
 import lombok.Builder;
@@ -23,6 +24,8 @@ public record WaybleZoneRecommendResponseDto(
 
         Long reviewCount,
 
+        FacilityResponseDto facility,
+
         Double distanceScore,
 
         Double similarityScore,
@@ -42,6 +45,7 @@ public static WaybleZoneRecommendResponseDto from(WaybleZoneDocument waybleZoneD
                 .reviewCount(waybleZoneDocument.getReviewCount())
                 .latitude(waybleZoneDocument.getAddress().getLocation().getLat())
                 .longitude(waybleZoneDocument.getAddress().getLocation().getLon())
+                .facility(FacilityResponseDto.from(waybleZoneDocument.getFacility()))
                 .distanceScore(0.0)
                 .similarityScore(0.0)
                 .recencyScore(0.0)

src/main/java/com/wayble/server/explore/dto/search/WaybleZoneDocumentRegisterDto.java

@@ -1,6 +1,7 @@
 package com.wayble.server.explore.dto.search;
 
 import com.wayble.server.common.entity.Address;
+import com.wayble.server.wayblezone.entity.WaybleZoneFacility;
 import com.wayble.server.wayblezone.entity.WaybleZoneType;
 import lombok.Builder;
 
@@ -11,6 +12,7 @@ public record WaybleZoneDocumentRegisterDto(
         WaybleZoneType waybleZoneType,
         String thumbnailImageUrl,
         Address address,
+        WaybleZoneFacility facility,
         Double averageRating,
         Long reviewCount
 ) {

src/main/java/com/wayble/server/explore/dto/search/WaybleZoneSearchResponseDto.java

@@ -1,5 +1,6 @@
 package com.wayble.server.explore.dto.search;
 
+import com.wayble.server.explore.dto.FacilityResponseDto;
 import com.wayble.server.explore.entity.WaybleZoneDocument;
 import com.wayble.server.wayblezone.entity.WaybleZoneType;
 import lombok.AccessLevel;
@@ -24,7 +25,9 @@ public record WaybleZoneSearchResponseDto(
 
         Double averageRating,
 
-        Long reviewCount
+        Long reviewCount,
+
+        FacilityResponseDto facility
 ) {
     public static WaybleZoneSearchResponseDto from(WaybleZoneDocument waybleZoneDocument, Double distance) {
         return WaybleZoneSearchResponseDto.builder()
@@ -37,6 +40,7 @@ public static WaybleZoneSearchResponseDto from(WaybleZoneDocument waybleZoneDocu
                 .distance(distance)
                 .latitude(waybleZoneDocument.getAddress().getLocation().getLat())
                 .longitude(waybleZoneDocument.getAddress().getLocation().getLon())
+                .facility(FacilityResponseDto.from(waybleZoneDocument.getFacility()))
                 .build();
     }
 }

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

@@ -0,0 +1,34 @@
+package com.wayble.server.explore.entity;
+
+import com.wayble.server.wayblezone.entity.WaybleZoneFacility;
+import lombok.*;
+
+@ToString
+@Builder(access = AccessLevel.PRIVATE)
+@Getter
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class EsWaybleZoneFacility {
+
+    private boolean hasSlope;
+    private boolean hasNoDoorStep;
+    private boolean hasElevator;
+    private boolean hasTableSeat;
+    private boolean hasDisabledToilet;
+    private String floorInfo;
+
+    public static EsWaybleZoneFacility from(WaybleZoneFacility facility) {
+        if (facility == null) {
+            return null;
+        }
+
+        return EsWaybleZoneFacility.builder()
+                .hasSlope(facility.isHasSlope())
+                .hasNoDoorStep(facility.isHasNoDoorStep())
+                .hasElevator(facility.isHasElevator())
+                .hasTableSeat(facility.isHasTableSeat())
+                .hasDisabledToilet(facility.isHasDisabledToilet())
+                .floorInfo(facility.getFloorInfo())
+                .build();
+    }
+}

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

@@ -33,6 +33,9 @@ public class WaybleZoneDocument {
     @Field(type = FieldType.Object)
     private EsAddress address;
 
+    @Field(type = FieldType.Object)
+    private EsWaybleZoneFacility facility;
+
     private double averageRating;
 
     private long reviewCount;
@@ -42,8 +45,9 @@ public static WaybleZoneDocument fromEntity(WaybleZone waybleZone) {
                 .zoneId(waybleZone.getId())
                 .zoneName(waybleZone.getZoneName())
                 .zoneType(waybleZone.getZoneType())
-                .thumbnailImageUrl("thumbnail image url")   // TODO: 이미지 경로 추가
+                .thumbnailImageUrl(waybleZone.getMainImageUrl() != null ? waybleZone.getMainImageUrl() : null)   // TODO: 이미지 경로 추가
                 .address(EsAddress.from(waybleZone.getAddress()))
+                .facility(EsWaybleZoneFacility.from(waybleZone.getFacility()))
                 .averageRating(0.0)
                 .reviewCount(0L)
                 .build();
@@ -56,6 +60,7 @@ public static WaybleZoneDocument fromDto(WaybleZoneDocumentRegisterDto dto) {
                 .zoneType(dto.waybleZoneType())
                 .thumbnailImageUrl(dto.thumbnailImageUrl())
                 .address(EsAddress.from(dto.address()))
+                .facility(EsWaybleZoneFacility.from(dto.facility()))
                 .averageRating(dto.averageRating() != null ? dto.averageRating() : 0.0)
                 .reviewCount(dto.reviewCount() != null ? dto.reviewCount() : 0L)
                 .build();

src/main/java/com/wayble/server/explore/repository/recommend/WaybleZoneQueryRecommendRepository.java

@@ -139,6 +139,7 @@ public List<WaybleZoneRecommendResponseDto> searchPersonalWaybleZones(User user,
                             .longitude(zone.getAddress().getLocation().getLon())
                             .averageRating(zone.getAverageRating())
                             .reviewCount(zone.getReviewCount())
+                            .facility(com.wayble.server.explore.dto.FacilityResponseDto.from(zone.getFacility()))
                             .distanceScore(distanceScore)
                             .similarityScore(similarityScore)
                             .recencyScore(recencyScore)

src/main/java/com/wayble/server/explore/service/WaybleZoneRecommendService.java

@@ -57,7 +57,7 @@ public List<WaybleZoneRecommendResponseDto> getWaybleZonePersonalRecommend(Long
         return recommendResponseDtoList;
     }
 
-    public Optional<WaybleZoneRecommendResponseDto> getTodayRecommendZone(Long userId) {
+    private Optional<WaybleZoneRecommendResponseDto> getTodayRecommendZone(Long userId) {
         LocalDate today = LocalDate.now();
         Optional<RecommendLogDocument> recommendLogDocument = recommendLogDocumentRepository.findByUserIdAndRecommendationDate(userId, today);
 
@@ -72,7 +72,7 @@ public Optional<WaybleZoneRecommendResponseDto> getTodayRecommendZone(Long userI
         }
     }
 
-    public void saveRecommendLog(Long userId, Long zoneId) {
+    private void saveRecommendLog(Long userId, Long zoneId) {
         String logId = UUID.randomUUID().toString();
         LocalDate dateNow = LocalDate.now();
 
@@ -88,7 +88,7 @@ public void saveRecommendLog(Long userId, Long zoneId) {
         recommendLogDocumentRepository.save(recommendLogDocument);
     }
 
-    public void updateRecommendLog(Long userId, Long zoneId) {
+    private void updateRecommendLog(Long userId, Long zoneId) {
         RecommendLogDocument recommendLogDocument = recommendLogDocumentRepository.findByUserIdAndZoneId(userId, zoneId)
                 .orElseThrow(() -> new ApplicationException(RecommendErrorCase.RECOMMEND_LOG_NOT_EXIST));
 

src/main/java/com/wayble/server/user/repository/UserRepository.java

@@ -3,6 +3,8 @@
 import com.wayble.server.user.entity.LoginType;
 import com.wayble.server.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.Optional;
 

src/main/java/com/wayble/server/wayblezone/controller/WaybleZoneController.java

@@ -13,6 +13,7 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -57,7 +58,8 @@ public CommonResponse<WaybleZoneDetailResponseDto> getWaybleZoneDetail(
     ) {
 
         // TODO: JWT에서 userId 추출해서 상세 조회 기록 남기기
-        // waybleZoneVisitLogService.saveVisitLog(null, waybleZoneId);
+        Long userId = (Long) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        waybleZoneVisitLogService.saveVisitLog(userId, waybleZoneId);
         return CommonResponse.success(waybleZoneService.getWaybleZoneDetail(waybleZoneId));
     }
 }

src/main/resources/elasticsearch/settings/wayble_zone_mappings.json

@@ -7,6 +7,29 @@
     },
     "address.location": {
       "type": "geo_point"
+    },
+    "facility": {
+      "type": "object",
+      "properties": {
+        "hasSlope": {
+          "type": "boolean"
+        },
+        "hasNoDoorStep": {
+          "type": "boolean"
+        },
+        "hasElevator": {
+          "type": "boolean"
+        },
+        "hasTableSeat": {
+          "type": "boolean"
+        },
+        "hasDisabledToilet": {
+          "type": "boolean"
+        },
+        "floorInfo": {
+          "type": "keyword"
+        }
+      }
     }
   }
 }