From b40d844c28bb24fd71c98ae64e7d1c8329426cd9 Mon Sep 17 00:00:00 2001 From: msk226 Date: Mon, 28 Apr 2025 19:02:01 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[FEATURE]=20=EC=97=AC=ED=96=89=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EB=82=B4=20?= =?UTF-8?q?=EC=84=A0=ED=98=B8=ED=95=98=EB=8A=94=20=EC=9D=8C=EC=8B=9D,=20?= =?UTF-8?q?=EB=AA=BB=EB=A8=B9=EB=8A=94=20=EC=9D=8C=EC=8B=9D=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/hyu/erica/capstone/domain/Style.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/hyu/erica/capstone/domain/Style.java b/src/main/java/hyu/erica/capstone/domain/Style.java index a1a1287..6bd4e9d 100644 --- a/src/main/java/hyu/erica/capstone/domain/Style.java +++ b/src/main/java/hyu/erica/capstone/domain/Style.java @@ -39,16 +39,22 @@ public class Style { private String preferActivity; + private String preferFood; + + private String dislikedFood; + private String requirement; @ManyToOne @JoinColumn(name = "user_id") private User user; - public void updateStyle(LocalDate startDate, LocalDate endDate, String preferActivity, String requirement) { + public void updateStyle(LocalDate startDate, LocalDate endDate, String preferActivity, String preferFood, String dislikedFood, String requirement) { this.startDate = startDate; this.endDate = endDate; this.preferActivity = preferActivity; + this.preferFood = preferFood; + this.dislikedFood = dislikedFood; this.requirement = requirement; } } From fc2814a1dbaddafc13e46f2b121ec43e8835d3a3 Mon Sep 17 00:00:00 2001 From: msk226 Date: Mon, 28 Apr 2025 19:02:22 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[FEATURE]=20=EC=97=AC=ED=96=89=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=9E=85=EB=A0=A5=20=EB=B0=8F=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=8B=9C,=20=EC=84=A0=ED=98=B8=ED=95=98=EB=8A=94?= =?UTF-8?q?=20=EC=9D=8C=EC=8B=9D=20=EB=B0=8F=20=EB=AA=BB=EB=A8=B9=EB=8A=94?= =?UTF-8?q?=20=EC=9D=8C=EC=8B=9D=20=ED=95=A8=EA=BB=98=20=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=20=EB=B0=9B=EB=8F=84=EB=A1=9D=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../capstone/service/style/impl/StyleCommandServiceImpl.java | 3 ++- .../hyu/erica/capstone/web/controller/StyleController.java | 2 ++ .../capstone/web/dto/style/request/UserStyleRequestDTO.java | 3 ++- .../capstone/web/dto/style/response/UserStyleResponseDTO.java | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/hyu/erica/capstone/service/style/impl/StyleCommandServiceImpl.java b/src/main/java/hyu/erica/capstone/service/style/impl/StyleCommandServiceImpl.java index 0d5053f..57d25f6 100644 --- a/src/main/java/hyu/erica/capstone/service/style/impl/StyleCommandServiceImpl.java +++ b/src/main/java/hyu/erica/capstone/service/style/impl/StyleCommandServiceImpl.java @@ -64,7 +64,8 @@ public UserStyleResponseDTO updateStyle(Long userId, Long styleId, UserStyleRequ if (!Objects.equals(style.getUser().getId(), userId)) throw new GeneralException(ErrorStatus._UNAUTHORIZED_USER); - style.updateStyle(request.startDate(), request.endDate(), request.preferActivity(), request.requirement()); + style.updateStyle(request.startDate(), request.endDate(), request.preferActivity(), + request.preferFood(), request.dislikedFood(), request.requirement()); Style save = styleRepository.save(style); diff --git a/src/main/java/hyu/erica/capstone/web/controller/StyleController.java b/src/main/java/hyu/erica/capstone/web/controller/StyleController.java index 5e0c56d..1fd8812 100644 --- a/src/main/java/hyu/erica/capstone/web/controller/StyleController.java +++ b/src/main/java/hyu/erica/capstone/web/controller/StyleController.java @@ -51,6 +51,8 @@ public ApiResponse getUserPlanStyle() { - startDate: 여행 시작 날짜 - endDate: 여행 종료 날짜 - preferActivity: 선호하는 활동 + - preferFood: 선호하는 음식 + - dislikedFood: 싫어하는 음식 - requirement: 요구사항 """) @PostMapping("/{styleId}") diff --git a/src/main/java/hyu/erica/capstone/web/dto/style/request/UserStyleRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/style/request/UserStyleRequestDTO.java index 3c3ac80..28311c6 100644 --- a/src/main/java/hyu/erica/capstone/web/dto/style/request/UserStyleRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/style/request/UserStyleRequestDTO.java @@ -4,5 +4,6 @@ import java.time.LocalDateTime; public record UserStyleRequestDTO(String city, LocalDate startDate, LocalDate endDate, - String preferActivity, String requirement) { + String preferActivity, String preferFood, + String dislikedFood,String requirement) { } diff --git a/src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleResponseDTO.java index 957c76c..2bb3eba 100644 --- a/src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/style/response/UserStyleResponseDTO.java @@ -5,11 +5,11 @@ import java.time.LocalDateTime; public record UserStyleResponseDTO(String city, LocalDate startDate, LocalDate endDate, - String preferActivity, String requirement) { + String preferActivity, String preferFood, String dislikedFood,String requirement) { public static UserStyleResponseDTO of(Style style) { return new UserStyleResponseDTO(style.getCity().name(), style.getStartDate(), style.getEndDate(), - style.getPreferActivity(), style.getRequirement()); + style.getPreferActivity(), style.getPreferFood(), style.getDislikedFood(), style.getRequirement()); } } From 12e63ea3210e8610e35b31442d12f61f3ced04b1 Mon Sep 17 00:00:00 2001 From: msk226 Date: Mon, 28 Apr 2025 19:06:47 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[FEATURE]=20=EC=B6=94=EC=B2=9C=20=EC=97=AC?= =?UTF-8?q?=ED=96=89=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=ED=94=84?= =?UTF-8?q?=EB=A1=A0=ED=8A=B8=20=ED=99=94=EB=A9=B4=20=EA=B5=AC=EC=84=B1?= =?UTF-8?q?=EC=9A=A9=20=EC=83=81=EC=84=B8=20=ED=95=84=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/attraction/AttractionListResponseDTO.java | 5 +++-- .../response/attraction/AttractionResponseDTO.java | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionListResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionListResponseDTO.java index c6da087..4163e3b 100644 --- a/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionListResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionListResponseDTO.java @@ -7,8 +7,9 @@ public record AttractionListResponseDTO(List attractions, public static AttractionListResponseDTO of(List attractions) { List responseDTOS = attractions.stream() - .map(attraction -> new AttractionResponseDTO(attraction.getContentId(), attraction.getContentName(), attraction.getImageUrl(), - attraction.getAddress())) + .map(attraction -> new AttractionResponseDTO(attraction.getContentId(), attraction.getContentName(), + attraction.getImageUrl(), attraction.getAddress(), attraction.getOperatingHours(), + attraction.getTitle(), attraction.getLatitude(), attraction.getLongitude())) .toList(); return new AttractionListResponseDTO(responseDTOS, attractions.size()); } diff --git a/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionResponseDTO.java index eaf4eae..ea4a8ed 100644 --- a/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionResponseDTO.java @@ -1,8 +1,11 @@ package hyu.erica.capstone.web.dto.tripPlan.response.attraction; -public record AttractionResponseDTO(Long attractionId, String name, String imageUrl, String address) { +public record AttractionResponseDTO(Long attractionId, String name, String imageUrl, String address, + String operatingHours, String title, Double latitude, Double longitude) { - public static AttractionResponseDTO of(Long attractionId, String name, String imageUrl, String address) { - return new AttractionResponseDTO(attractionId, name, imageUrl, address); + public static AttractionResponseDTO of(Long attractionId, String name, String imageUrl, String address, + String operatingHours, String title, Double latitude, Double longitude) { + return new AttractionResponseDTO(attractionId, name, imageUrl, address, + operatingHours, title, latitude, longitude); } } From d857bcb6f3c0a95b5cd26b8068068e79ad9c9dfb Mon Sep 17 00:00:00 2001 From: msk226 Date: Mon, 28 Apr 2025 19:11:34 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[FEATURE]=20=EC=B6=94=EC=B2=9C=20=EC=8B=9D?= =?UTF-8?q?=EB=8B=B9=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=ED=94=84=EB=A1=A0?= =?UTF-8?q?=ED=8A=B8=20=ED=99=94=EB=A9=B4=20=EA=B5=AC=EC=84=B1=EC=9A=A9=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dto/style/request/UserStyleRequestDTO.java | 2 +- .../response/restaurant/RestaurantResponseDTO.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/hyu/erica/capstone/web/dto/style/request/UserStyleRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/style/request/UserStyleRequestDTO.java index 28311c6..33610d2 100644 --- a/src/main/java/hyu/erica/capstone/web/dto/style/request/UserStyleRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/style/request/UserStyleRequestDTO.java @@ -5,5 +5,5 @@ public record UserStyleRequestDTO(String city, LocalDate startDate, LocalDate endDate, String preferActivity, String preferFood, - String dislikedFood,String requirement) { + String dislikedFood, String requirement) { } diff --git a/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantResponseDTO.java index b752316..dca5619 100644 --- a/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantResponseDTO.java @@ -2,9 +2,12 @@ import hyu.erica.capstone.domain.Restaurant; -public record RestaurantResponseDTO(Long restaurantId, String name, String imageUrl, String address) { +public record RestaurantResponseDTO(Long restaurantId, String name, String imageUrl, String address, + String operatingHours, String title, Double latitude, Double longitude) { public static RestaurantResponseDTO of(Restaurant restaurant) { - return new RestaurantResponseDTO(restaurant.getId(), restaurant.getRestaurantName(), "추후 작업 예정", restaurant.getRoadAddress()); + return new RestaurantResponseDTO(restaurant.getId(), restaurant.getRestaurantName(), "추후 작업 예정", + restaurant.getRoadAddress(), restaurant.getBusinessHours(), restaurant.getDescription(), + restaurant.getLatitude(), restaurant.getLongitude()); } } From e1e912df0981fccaa75e30015079120da227432b Mon Sep 17 00:00:00 2001 From: msk226 Date: Mon, 28 Apr 2025 19:13:30 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[FEATURE]=20=EC=8B=9D=EB=8B=B9=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=ED=94=84=EB=A1=A0?= =?UTF-8?q?=ED=8A=B8=20=ED=99=94=EB=A9=B4=20=EA=B5=AC=EC=84=B1=EC=9A=A9=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/restaurant/RestaurantDetailResponseDTO.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantDetailResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantDetailResponseDTO.java index 952dfa5..5a59453 100644 --- a/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantDetailResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/restaurant/RestaurantDetailResponseDTO.java @@ -3,11 +3,13 @@ import hyu.erica.capstone.domain.Restaurant; public record RestaurantDetailResponseDTO ( - Long restaurantId, String name, String imageUrl, String address, String phone, String description, String usageDay){ + Long restaurantId, String name, String imageUrl, String address, String phone, String description, String usageDay, + Double latitude, Double longitude) { public static RestaurantDetailResponseDTO of(Restaurant restaurant) { return new RestaurantDetailResponseDTO(restaurant.getId(), restaurant.getRestaurantName(), "추후 작업 예정", restaurant.getRoadAddress(), - restaurant.getPhoneNumber(), restaurant.getDescription(), restaurant.getBusinessHours()); + restaurant.getPhoneNumber(), restaurant.getDescription(), restaurant.getBusinessHours(), + restaurant.getLatitude(), restaurant.getLongitude()); } } From 35c34055a134372e63b6b21d10faf4fc4dbfaa9b Mon Sep 17 00:00:00 2001 From: msk226 Date: Mon, 28 Apr 2025 19:14:08 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[FEATURE]=20=EC=97=AC=ED=96=89=EC=A7=80=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=ED=94=84?= =?UTF-8?q?=EB=A1=A0=ED=8A=B8=20=ED=99=94=EB=A9=B4=20=EA=B5=AC=EC=84=B1?= =?UTF-8?q?=EC=9A=A9=20=EC=83=81=EC=84=B8=20=ED=95=84=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/attraction/AttractionDetailResponseDTO.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionDetailResponseDTO.java b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionDetailResponseDTO.java index 20bf3aa..28f5810 100644 --- a/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionDetailResponseDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/tripPlan/response/attraction/AttractionDetailResponseDTO.java @@ -2,11 +2,14 @@ import hyu.erica.capstone.domain.Attraction; -public record AttractionDetailResponseDTO (Long attractionId, String name, String imageUrl, String address, String phone, String description, String usageDay) { +public record AttractionDetailResponseDTO (Long attractionId, String name, String imageUrl, String address, + String phone, String description, String usageDay, + Double latitude, Double longitude) { public static AttractionDetailResponseDTO of(Attraction attraction) { return new AttractionDetailResponseDTO(attraction.getContentId(), attraction.getContentName(), attraction.getImageUrl(), attraction.getAddress(), - attraction.getContact(), attraction.getSubtitle(), attraction.getClosedDays()); + attraction.getContact(), attraction.getSubtitle(), attraction.getOperatingHours(), + attraction.getLatitude(), attraction.getLongitude()); } } From 6dce5db61f2148ec7384b61abe67dfff3fe695b6 Mon Sep 17 00:00:00 2001 From: msk226 Date: Mon, 28 Apr 2025 19:19:07 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[FEATURE]=20=EC=97=AC=ED=96=89=EC=A7=80=20?= =?UTF-8?q?=EC=B6=94=EC=B2=9C=20API=20=ED=98=B8=EC=B6=9C=20=EC=8B=9C,=20?= =?UTF-8?q?=EC=84=A0=ED=98=B8=20=EC=9D=8C=EC=8B=9D=20=EB=B0=8F=20=EB=AA=BB?= =?UTF-8?q?=EB=A8=B9=EB=8A=94=20=EC=9D=8C=EC=8B=9D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/async/StyleBackgroundTaskService.java | 3 ++- .../erica/capstone/web/dto/client/StyleRequestDTO.java | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/hyu/erica/capstone/service/async/StyleBackgroundTaskService.java b/src/main/java/hyu/erica/capstone/service/async/StyleBackgroundTaskService.java index b7e0c29..8f5f871 100644 --- a/src/main/java/hyu/erica/capstone/service/async/StyleBackgroundTaskService.java +++ b/src/main/java/hyu/erica/capstone/service/async/StyleBackgroundTaskService.java @@ -56,7 +56,8 @@ public void handleTripPlanDetails(Long tripPlanId, Style style, User user) { try { StyleRequestDTO prompt = StyleRequestDTO.of(style.getCity().name(), style.getStartDate(), - style.getEndDate(), style.getPreferActivity(), style.getRequirement()); + style.getEndDate(), style.getPreferActivity(), style.getPreferFood(), + style.getDislikedFood(),style.getRequirement()); // 외부 API 병렬 호출 CompletableFuture attractionFuture = diff --git a/src/main/java/hyu/erica/capstone/web/dto/client/StyleRequestDTO.java b/src/main/java/hyu/erica/capstone/web/dto/client/StyleRequestDTO.java index 2695847..4a73ef4 100644 --- a/src/main/java/hyu/erica/capstone/web/dto/client/StyleRequestDTO.java +++ b/src/main/java/hyu/erica/capstone/web/dto/client/StyleRequestDTO.java @@ -3,9 +3,11 @@ import java.time.LocalDate; public record StyleRequestDTO (String city, LocalDate startDate, LocalDate endDate, - String preferActivity, String requirement){ + String preferActivity, String preferFood, String dislikedFood, String requirement){ - public static StyleRequestDTO of(String city, LocalDate startDate, LocalDate endDate, String preferActivity, String requirement){ - return new StyleRequestDTO(city, startDate, endDate, preferActivity, requirement); + public static StyleRequestDTO of(String city, LocalDate startDate, LocalDate endDate, + String preferActivity, String requirement, String preferFood, String dislikedFood) { + return new StyleRequestDTO(city, startDate, endDate, preferActivity, + preferFood, dislikedFood, requirement); } -} +} \ No newline at end of file From 1cd9e145a116bd027aa490b9e19676aaf970b1f7 Mon Sep 17 00:00:00 2001 From: msk226 Date: Mon, 28 Apr 2025 19:24:56 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[FEATURE]=20=EC=88=99=EC=86=8C=20=EB=B6=84?= =?UTF-8?q?=EB=A5=98=20=EC=9C=84=ED=95=9C=20Enum=20=ED=83=80=EC=9E=85=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/hyu/erica/capstone/domain/enums/PlaceType.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/hyu/erica/capstone/domain/enums/PlaceType.java b/src/main/java/hyu/erica/capstone/domain/enums/PlaceType.java index 2d16be3..b02877b 100644 --- a/src/main/java/hyu/erica/capstone/domain/enums/PlaceType.java +++ b/src/main/java/hyu/erica/capstone/domain/enums/PlaceType.java @@ -1,5 +1,5 @@ package hyu.erica.capstone.domain.enums; public enum PlaceType { - ATTRACTION, RESTAURANT -} + ATTRACTION, RESTAURANT, HOTEL +} \ No newline at end of file