Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package com.example.triptalk.domain.tripPlan.controller;

import com.example.triptalk.domain.tripPlan.dto.AccommodationResponse;
import com.example.triptalk.domain.tripPlan.service.AccommodationService;
import com.example.triptalk.global.apiPayload.ApiResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("/api/accommodations")
@RequiredArgsConstructor
@Tag(name = "숙소 API", description = "추천 숙소 조회 (매주 업데이트)")
public class AccommodationController {

private final AccommodationService accommodationService;

@GetMapping
@Operation(
summary = "추천 숙소 조회",
description = """
**추천 숙소를 조회합니다.**

### 📊 응답 데이터
- `accommodationList`: 숙소 목록 (최대 10개씩 페이징)
- `hotelName`: 호텔 이름 (예: 서울 신라호텔)
- `cityName`: 도시 한국어명 (예: 서울)
- `pricePerNight`: 1박 가격 (원화, 예: 150000)
- `checkInDate`: 체크인 날짜
- `checkOutDate`: 체크아웃 날짜
- `imageUrl`: 호텔 이미지 URL

### 🔄 무한스크롤 사용법
1. **첫 요청**: `cursorId` 없이 호출
2. **다음 요청**: 응답의 `nextCursorId` 값을 `cursorId`에 전달
3. **마지막**: `hasNext`가 `false`일 때 종료
"""
)
public ApiResponse<AccommodationResponse.AccommodationListResultDTO> getAccommodations(
@Parameter(description = "커서 ID (다음 페이지 ID, 처음 요청 시 null)", example = "null")
@RequestParam(required = false) Long cursorId
) {
AccommodationResponse.AccommodationListResultDTO response = accommodationService.getAccommodations(cursorId);
return ApiResponse.onSuccess(response);
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package com.example.triptalk.domain.tripPlan.converter;

import com.example.triptalk.domain.tripPlan.dto.AccommodationResponse;
import com.example.triptalk.domain.tripPlan.entity.Accommodation;
import org.springframework.data.domain.Slice;

import java.util.List;

public class AccommodationConverter {

/**
* Accommodation 엔티티를 AccommodationDTO로 변환
*/
public static AccommodationResponse.AccommodationDTO toAccommodationDTO(Accommodation accommodation) {
return AccommodationResponse.AccommodationDTO.builder()
.id(accommodation.getId())
.hotelName(accommodation.getHotelName())
.cityName(accommodation.getCityName())
.pricePerNight(accommodation.getPricePerNight())
.checkInDate(accommodation.getCheckInDate())
.checkOutDate(accommodation.getCheckOutDate())
.imageUrl(accommodation.getImageUrl())
.build();
}

/**
* Slice<Accommodation>를 AccommodationListResultDTO로 변환
*/
public static AccommodationResponse.AccommodationListResultDTO toAccommodationListResultDTO(Slice<Accommodation> slice) {
List<AccommodationResponse.AccommodationDTO> accommodationList = slice.getContent().stream()
.map(AccommodationConverter::toAccommodationDTO)
.toList();

// 다음 커서 ID는 마지막 항목의 ID
Long nextCursorId = accommodationList.isEmpty() ?
null :
accommodationList.getLast().getId();

return AccommodationResponse.AccommodationListResultDTO.builder()
.accommodationList(accommodationList)
.accommodationListSize(accommodationList.size())
.isFirst(slice.isFirst())
.hasNext(slice.hasNext())
.nextCursorId(nextCursorId)
.build();
}
Comment on lines +29 to +46
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

hasNext가 false일 때 nextCursorId를 null로 설정하세요.

현재 구현은 다음 페이지가 없어도 마지막 항목의 ID를 nextCursorId로 반환합니다. 클라이언트는 hasNext를 확인해야 하지만, API를 더 방어적으로 만들기 위해 다음 페이지가 없을 때는 nextCursorId를 null로 설정하는 것이 좋습니다.

다음과 같이 수정하세요:

     // 다음 커서 ID는 마지막 항목의 ID
-    Long nextCursorId = accommodationList.isEmpty() ?
-            null :
-            accommodationList.getLast().getId();
+    Long nextCursorId = accommodationList.isEmpty() || !slice.hasNext() ?
+            null :
+            accommodationList.getLast().getId();
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
public static AccommodationResponse.AccommodationListResultDTO toAccommodationListResultDTO(Slice<Accommodation> slice) {
List<AccommodationResponse.AccommodationDTO> accommodationList = slice.getContent().stream()
.map(AccommodationConverter::toAccommodationDTO)
.toList();
// 다음 커서 ID는 마지막 항목의 ID
Long nextCursorId = accommodationList.isEmpty() ?
null :
accommodationList.getLast().getId();
return AccommodationResponse.AccommodationListResultDTO.builder()
.accommodationList(accommodationList)
.accommodationListSize(accommodationList.size())
.isFirst(slice.isFirst())
.hasNext(slice.hasNext())
.nextCursorId(nextCursorId)
.build();
}
public static AccommodationResponse.AccommodationListResultDTO toAccommodationListResultDTO(Slice<Accommodation> slice) {
List<AccommodationResponse.AccommodationDTO> accommodationList = slice.getContent().stream()
.map(AccommodationConverter::toAccommodationDTO)
.toList();
// 다음 커서 ID는 마지막 항목의 ID
Long nextCursorId = accommodationList.isEmpty() || !slice.hasNext() ?
null :
accommodationList.getLast().getId();
return AccommodationResponse.AccommodationListResultDTO.builder()
.accommodationList(accommodationList)
.accommodationListSize(accommodationList.size())
.isFirst(slice.isFirst())
.hasNext(slice.hasNext())
.nextCursorId(nextCursorId)
.build();
}
🤖 Prompt for AI Agents
In
src/main/java/com/example/triptalk/domain/tripPlan/converter/AccommodationConverter.java
around lines 29 to 46, the method currently sets nextCursorId to the last item's
ID even when slice.hasNext() is false; change the logic so nextCursorId is null
when there is no next page by checking slice.hasNext() and only assigning the
last item's ID if slice.hasNext() is true (otherwise set null), then return the
DTO with that adjusted value.

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package com.example.triptalk.domain.tripPlan.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.time.LocalDate;
import java.util.List;

public class AccommodationResponse {

@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "숙소 정보")
public static class AccommodationDTO {

@Schema(description = "숙소 ID", example = "1")
private Long id;

@Schema(description = "호텔 이름", example = "서울 롯데호텔")
private String hotelName;

@Schema(description = "도시 한국어명", example = "서울")
private String cityName;

@Schema(description = "1박 가격 (원화)", example = "150000")
private Integer pricePerNight;

@Schema(description = "체크인 날짜", example = "2025-12-17")
private LocalDate checkInDate;

@Schema(description = "체크아웃 날짜", example = "2025-12-19")
private LocalDate checkOutDate;

@Schema(description = "도시 대표 이미지 URL", example = "https://images.unsplash.com/...")
private String imageUrl;

}

@Getter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "숙소 목록 응답 (커서 기반)")
public static class AccommodationListResultDTO {

@Schema(description = "숙소 목록")
private List<AccommodationDTO> accommodationList;

@Schema(description = "현재 페이지의 숙소 개수", example = "10")
private Integer accommodationListSize;

@Schema(description = "페이지 처음 여부", example = "true")
private Boolean isFirst;

@Schema(description = "다음 페이지가 있는지 여부", example = "true")
private Boolean hasNext;

@Schema(description = "다음 커서 ID (무한스크롤용)", example = "150")
private Long nextCursorId;
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.example.triptalk.domain.tripPlan.entity;

import com.example.triptalk.global.apiPayload.code.BaseEntity;
import jakarta.persistence.*;
import lombok.*;

import java.time.LocalDate;

@Builder
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Entity
public class Accommodation extends BaseEntity {

@Column(length = 200, nullable = false)
private String hotelName; // 호텔 이름

@Column(length = 50, nullable = false)
private String cityName; // 도시 한국어명 (예: 서울, 도쿄)

@Column(nullable = false)
private Integer pricePerNight; // 1박 가격 (원화)

@Column(nullable = false)
private LocalDate checkInDate; // 체크인 날짜

@Column(nullable = false)
private LocalDate checkOutDate; // 체크아웃 날짜

@Column(length = 255, nullable = false)
private String imageUrl; // 도시 대표 이미지 URL

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.example.triptalk.domain.tripPlan.repository;

import com.example.triptalk.domain.tripPlan.entity.Accommodation;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

public interface AccommodationRepository extends JpaRepository<Accommodation, Long> {

/**
* 커서 기반 숙소 목록 조회 (ID 내림차순)
* @param cursorId 커서 ID (null이면 처음부터 조회)
* @param pageable 페이징 정보
* @return Slice<Accommodation>
*/
@Query("SELECT a FROM Accommodation a " +
"WHERE (:cursorId IS NULL OR a.id < :cursorId) " +
"ORDER BY a.id DESC")
Slice<Accommodation> findAllByCursor(
@Param("cursorId") Long cursorId,
Pageable pageable
);
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.example.triptalk.domain.tripPlan.service;

import com.example.triptalk.domain.tripPlan.dto.AccommodationResponse;

public interface AccommodationService {
/**
* DB에 저장된 숙소 조회 (커서 기반 무한스크롤)
* @param cursorId 커서 ID (null이면 처음부터)
* @return 숙소 목록 응답
*/
AccommodationResponse.AccommodationListResultDTO getAccommodations(Long cursorId);
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.example.triptalk.domain.tripPlan.service;

import com.example.triptalk.domain.tripPlan.converter.AccommodationConverter;
import com.example.triptalk.domain.tripPlan.dto.AccommodationResponse;
import com.example.triptalk.domain.tripPlan.entity.Accommodation;
import com.example.triptalk.domain.tripPlan.repository.AccommodationRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Slf4j
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class AccommodationServiceImpl implements AccommodationService {

private final AccommodationRepository accommodationRepository;

private static final int PAGE_SIZE = 10; // 페이지당 숙소 개수

@Override
public AccommodationResponse.AccommodationListResultDTO getAccommodations(Long cursorId) {
Pageable pageable = PageRequest.of(0, PAGE_SIZE);

// 커서 기반 조회
Slice<Accommodation> slice = accommodationRepository.findAllByCursor(cursorId, pageable);

// DTO 변환
return AccommodationConverter.toAccommodationListResultDTO(slice);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
.requestMatchers("/api/auth/**").permitAll()
// 여행지 조회는 비회원도 가능
.requestMatchers("/api/trip-places/**").permitAll()
// 항공권 검색은 비회원도 가능
// 항공권 조회는 비회원도 가능
.requestMatchers("/api/flights/**").permitAll()
// 호텔 조회는 비회원도 가능
.requestMatchers("/api/accommodations/**").permitAll()
// Swagger UI 접근 허용
.requestMatchers(
"/swagger-ui/**",
Expand Down
Loading