Skip to content

[feat] 선호 관광지 조회 필드 추가 #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
7ijin01 merged 3 commits into from
Sep 15, 2025
Merged

[feat] 선호 관광지 조회 필드 추가 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0fdee5
feat: tourspotId, imageUrl 필드 추가
7ijin01 Sep 15, 2025
0d3c232
fix: 배포 브랜치 복구
7ijin01 Sep 15, 2025
8011744
fix: 스케줄 활성화
7ijin01 Sep 15, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI / CD

on:
push:
branches: [feat/#85-logout]
branches: [main]

jobs:
CI:
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/opendata/domain/tourspot/dto/response/TourSpotDetailResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
@NoArgsConstructor
@AllArgsConstructor
public class TourSpotDetailResponse {
private Long tourspotId;
private String tourspotNm;
private AddressDto address;
private String congestionLabel;
private String imageUrl;
private List<TourSpotEventDto> tourSpotEvents;
private List<TourSpotTagDto> tourSpotTags;
private List<TourSpotMonthlyCongestionDto> tourSpotMonthlyCongestionDtos;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/opendata/domain/tourspot/mapper/TourSpotDetailMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@
public interface TourSpotDetailMapper {

@Mapping(target = "tourspotNm", source = "tourSpot.tourspotNm")
@Mapping(target = "imageUrl", source = "imageUrl")
@Mapping(target = "address", source = "address")
@Mapping(target = "congestionLabel", source = "congestion")
@Mapping(target = "tourSpotEvents", source = "events")
@Mapping(target = "tourSpotTags", source = "tags")
@Mapping(target = "tourSpotMonthlyCongestionDtos", source = "monthlyCongestions")
TourSpotDetailResponse toResponse(
TourSpot tourSpot,
String imageUrl,
AddressDto address,
String congestion,
List<TourSpotEventDto> events,
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/opendata/domain/tourspot/service/TourSpotService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public class TourSpotService
private final CustomTourSpotCombineRepository combineRepository;
private final CurrentCongestionRepository currentCongestionRepository;
private final FutureCongestionRepository futureCongestionRepository;
private final TourSpotImageRepository tourSpotImageRepository;


private final AddressCache addressCache;
Expand All @@ -75,7 +76,9 @@ public TourSpotDetailResponse combineTourSpotDetail(Long tourspotId) throws Json
List<TourSpotEvent> tourSpotEvents = tourSpotEventRepository.findAllByTourSpot(tourSpot);
List<TourSpotTag> tourSpotTags = tourSpotTagRepository.findAllByTourSpot(tourSpot);
List<TourSpotMonthlyCongestion> monthlyCongestions = monthlyCongestionRepository.findAllByTourspot(tourSpot);

String imageUrl = tourSpotImageRepository.findByTourSpot(tourSpot)
.orElseThrow(() -> new GlobalException(ErrorStatus.TOURSPOT_NOT_FOUND))
.getTourspotImgUrl();
String congestionLabel = null;
if (tourSpotCurrentCongestion != null) {
congestionLabel = tourSpotCurrentCongestion.getCongestionLvl().getCongestionLabel();
Expand All @@ -84,6 +87,7 @@ public TourSpotDetailResponse combineTourSpotDetail(Long tourspotId) throws Json

return tourSpotDetailMapper.toResponse(
tourSpot,
imageUrl,
tourSpotDetailMapper.toAddressDto(address),
congestionLabel,
tourSpotDetailMapper.toEventDtos(tourSpotEvents),
Expand Down