diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/converter/StoreConverter.java b/src/main/java/com/eatsfine/eatsfine/domain/store/converter/StoreConverter.java index fb9421d2..9ab93534 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/converter/StoreConverter.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/store/converter/StoreConverter.java @@ -4,7 +4,6 @@ import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; import com.eatsfine.eatsfine.domain.store.dto.StoreResDto; import com.eatsfine.eatsfine.domain.store.entity.Store; -import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -25,6 +24,8 @@ public static StoreResDto.StoreSearchDto toSearchDto(Store store, Double distanc .rating(store.getRating()) .reviewCount(null) // 리뷰 도메인 구현 이후 추가 예정 .distance(distance) + .latitude(store.getLatitude()) + .longitude(store.getLongitude()) .mainImageUrl(store.getMainImageKey()) .isOpenNow(isOpenNow) .build(); diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/dto/StoreResDto.java b/src/main/java/com/eatsfine/eatsfine/domain/store/dto/StoreResDto.java index f9eb62be..7a83b358 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/dto/StoreResDto.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/store/dto/StoreResDto.java @@ -28,6 +28,8 @@ public record StoreSearchDto( BigDecimal rating, Integer reviewCount, // 리뷰 도메인이 존재하지 않아 null 허용 double distance, + double latitude, + double longitude, String mainImageUrl, boolean isOpenNow ){} diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/converter/TableImageConverter.java b/src/main/java/com/eatsfine/eatsfine/domain/tableimage/converter/TableImageConverter.java index 9daf0ae3..c2428480 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/converter/TableImageConverter.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/tableimage/converter/TableImageConverter.java @@ -13,14 +13,16 @@ public static TableImageResDto.UploadTableImageDto toUploadTableImageDto(Long st .build(); } - public static TableImageResDto.GetTableImageDto toGetTableImageDto(Long storeId, List tableImages) { + public static TableImageResDto.GetTableImageDto toGetTableImageDto(Long storeId, + List tableImages) { return TableImageResDto.GetTableImageDto.builder() .storeId(storeId) - .tableImageUrls(tableImages) + .tableImages(tableImages) .build(); } - public static TableImageResDto.DeleteTableImageDto toDeleteTableImageDto(Long storeId, List removedTableImages) { + public static TableImageResDto.DeleteTableImageDto toDeleteTableImageDto(Long storeId, + List removedTableImages) { return TableImageResDto.DeleteTableImageDto.builder() .storeId(storeId) .deletedTableImageIds(removedTableImages) diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/dto/TableImageResDto.java b/src/main/java/com/eatsfine/eatsfine/domain/tableimage/dto/TableImageResDto.java index baea00db..fb012542 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/dto/TableImageResDto.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/tableimage/dto/TableImageResDto.java @@ -6,21 +6,27 @@ public class TableImageResDto { - @Builder - public record UploadTableImageDto( - Long storeId, - List tableImageUrls - ){} + @Builder + public record UploadTableImageDto( + Long storeId, + List tableImageUrls) { + } - @Builder - public record GetTableImageDto( - Long storeId, - List tableImageUrls - ){} + @Builder + public record GetTableImageDto( + Long storeId, + List tableImages) { + } - @Builder - public record DeleteTableImageDto( - Long storeId, - List deletedTableImageIds - ){} + @Builder + public record TableImageItem( + Long tableImageId, + String tableImageUrl) { + } + + @Builder + public record DeleteTableImageDto( + Long storeId, + List deletedTableImageIds) { + } } diff --git a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageQueryServiceImpl.java b/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageQueryServiceImpl.java index a2c19d9b..8e9fe7e4 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageQueryServiceImpl.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/tableimage/service/TableImageQueryServiceImpl.java @@ -29,13 +29,16 @@ public TableImageResDto.GetTableImageDto getTableImage(Long storeId) { Store store = storeRepository.findById(storeId) .orElseThrow(() -> new StoreException(StoreErrorStatus._STORE_NOT_FOUND)); - List tableImages = tableImageRepository.findAllByStoreOrderByImageOrder(store); + List tableImageEntities = tableImageRepository.findAllByStoreOrderByImageOrder(store); - List tableImageUrls = tableImages.stream() - .map(ti-> s3Service.toUrl(ti.getTableImageKey())) + List tableItems = tableImageEntities.stream() + .map(ti -> TableImageResDto.TableImageItem.builder() + .tableImageId(ti.getId()) + .tableImageUrl(s3Service.toUrl(ti.getTableImageKey())) + .build()) .toList(); - return TableImageConverter.toGetTableImageDto(storeId, tableImageUrls); + return TableImageConverter.toGetTableImageDto(storeId, tableItems); } }