From 19b4e4a460878d4215e473d05e066f97156c6838 Mon Sep 17 00:00:00 2001 From: INKWON Date: Sat, 27 Jan 2024 03:04:10 +0900 Subject: [PATCH] =?UTF-8?q?[refactor]=20store=20Response=20Dto=20=EB=B6=88?= =?UTF-8?q?=ED=95=84=EC=9A=94=20=ED=95=84=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/response/CityStoreResponseDto.java | 24 ++------------ .../dto/response/PlaceStoreResponseDto.java | 31 ++----------------- .../response/TripRecordStoreResponseDto.java | 28 ++--------------- 3 files changed, 6 insertions(+), 77 deletions(-) diff --git a/src/main/java/com/haejwo/tripcometrue/domain/store/dto/response/CityStoreResponseDto.java b/src/main/java/com/haejwo/tripcometrue/domain/store/dto/response/CityStoreResponseDto.java index 03deaabe..8a609cfe 100644 --- a/src/main/java/com/haejwo/tripcometrue/domain/store/dto/response/CityStoreResponseDto.java +++ b/src/main/java/com/haejwo/tripcometrue/domain/store/dto/response/CityStoreResponseDto.java @@ -6,34 +6,14 @@ public record CityStoreResponseDto( Long id, - String name, - String language, - String timeDifference, - String voltage, - String visa, - CurrencyUnit currency, - String weatherRecommendation, - String weatherDescription, - Country country, - Integer storeCount, - String imageUrl + Integer storeCount ) { public static CityStoreResponseDto fromEntity(CityStore cityStore) { City city = cityStore.getCity(); return new CityStoreResponseDto( city.getId(), - city.getName(), - city.getLanguage(), - city.getTimeDifference(), - city.getVoltage(), - city.getVisa(), - city.getCurrency(), - city.getWeatherRecommendation(), - city.getWeatherDescription(), - city.getCountry(), - city.getStoreCount(), - city.getImageUrl() + city.getStoreCount() ); } } \ No newline at end of file diff --git a/src/main/java/com/haejwo/tripcometrue/domain/store/dto/response/PlaceStoreResponseDto.java b/src/main/java/com/haejwo/tripcometrue/domain/store/dto/response/PlaceStoreResponseDto.java index ba482e5c..d43fd1b1 100644 --- a/src/main/java/com/haejwo/tripcometrue/domain/store/dto/response/PlaceStoreResponseDto.java +++ b/src/main/java/com/haejwo/tripcometrue/domain/store/dto/response/PlaceStoreResponseDto.java @@ -7,43 +7,16 @@ public record PlaceStoreResponseDto( Long id, - String name, - String address, - String description, - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH-mm-ss") - LocalTime weekdayOpenTime, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH-mm-ss") - LocalTime weekdayCloseTime, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH-mm-ss") - LocalTime weekendOpenTime, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH-mm-ss") - LocalTime weekendCloseTime, Integer storedCount, - Double latitude, - Double longtitude, - Integer commentCount, - Long cityId, - String imageUrl + Long cityId ) { public static PlaceStoreResponseDto fromEntity(PlaceStore placeStore, String imageUrl) { Place place = placeStore.getPlace(); return new PlaceStoreResponseDto( place.getId(), - place.getName(), - place.getAddress(), - place.getDescription(), - place.getWeekdayOpenTime(), - place.getWeekdayCloseTime(), - place.getWeekendOpenTime(), - place.getWeekendCloseTime(), place.getStoredCount(), - place.getLatitude(), - place.getLongitude(), - place.getCommentCount(), - place.getCity().getId(), - imageUrl + place.getCity().getId() ); } } \ No newline at end of file diff --git a/src/main/java/com/haejwo/tripcometrue/domain/store/dto/response/TripRecordStoreResponseDto.java b/src/main/java/com/haejwo/tripcometrue/domain/store/dto/response/TripRecordStoreResponseDto.java index 0ff2a8e9..9c9f5fe3 100644 --- a/src/main/java/com/haejwo/tripcometrue/domain/store/dto/response/TripRecordStoreResponseDto.java +++ b/src/main/java/com/haejwo/tripcometrue/domain/store/dto/response/TripRecordStoreResponseDto.java @@ -7,38 +7,14 @@ public record TripRecordStoreResponseDto( Long id, - String title, - String content, - String expenseRangeType, - String countries, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") - LocalDate tripStartDay, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") - LocalDate tripEndDay, - Integer totalDays, - Double averageRating, - Integer viewCount, - Integer storeCount, - Integer commentCount, - String imageUrl + Integer storeCount ) { public static TripRecordStoreResponseDto fromEntity(TripRecordStore tripRecordStore, String imageUrl) { TripRecord tripRecord = tripRecordStore.getTripRecord(); return new TripRecordStoreResponseDto( tripRecord.getId(), - tripRecord.getTitle(), - tripRecord.getContent(), - tripRecord.getExpenseRangeType().name(), //todo - tripRecord.getCountries(), - tripRecord.getTripStartDay(), - tripRecord.getTripEndDay(), - tripRecord.getTotalDays(), - tripRecord.getAverageRating(), - tripRecord.getViewCount(), - tripRecord.getStoreCount(), - tripRecord.getCommentCount(), - imageUrl + tripRecord.getStoreCount() ); } } \ No newline at end of file