diff --git a/src/main/java/com/eatsfine/eatsfine/domain/booking/repository/BookingRepository.java b/src/main/java/com/eatsfine/eatsfine/domain/booking/repository/BookingRepository.java index ce500e71..524d31e0 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/booking/repository/BookingRepository.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/booking/repository/BookingRepository.java @@ -2,6 +2,7 @@ import com.eatsfine.eatsfine.domain.booking.entity.Booking; import com.eatsfine.eatsfine.domain.booking.enums.BookingStatus; +import com.eatsfine.eatsfine.domain.store.entity.Store; import com.eatsfine.eatsfine.domain.user.entity.User; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -114,4 +115,18 @@ List findTableIdsWithFutureBookings( @Param("currentDate") LocalDate currentDate, @Param("currentTime") LocalTime currentTime ); + @Query("select count(b) from Booking b " + + "where b.store = :store " + + "and b.status in (com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.CONFIRMED, " + + "com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.PENDING, " + + "com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.COMPLETED)") + Long countActiveBookings(@Param("store") Store store); + + @Query("select b.store.id, count(b) from Booking b " + + "where b.store in :stores " + + "and b.status in (com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.CONFIRMED, " + + "com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.PENDING, " + + "com.eatsfine.eatsfine.domain.booking.enums.BookingStatus.COMPLETED) " + + "group by b.store.id") + List countActiveBookingsByStores(@Param("stores") List stores); } diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/controller/StoreController.java b/src/main/java/com/eatsfine/eatsfine/domain/store/controller/StoreController.java index dbbcc4a6..36d90d0f 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/controller/StoreController.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/store/controller/StoreController.java @@ -108,4 +108,16 @@ public ApiResponse getMainImage( return ApiResponse.of(StoreSuccessStatus._STORE_MAIN_IMAGE_GET_SUCCESS, storeQueryService.getMainImage(storeId)); } + @Operation( + summary = "내 가게 리스트 조회", + description = "사장님이 등록한 모든 가게 리스트를 조회합니다." + ) + @GetMapping("/stores/my") + @PreAuthorize("hasRole('OWNER')") + public ApiResponse getMyStores( + @CurrentUser User user + ) { + return ApiResponse.of(StoreSuccessStatus._MY_STORE_LIST_FOUND, storeQueryService.getMyStores(user.getUsername())); + } + } 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 402e4c69..ea61beea 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 @@ -79,5 +79,24 @@ public static StoreResDto.GetMainImageDto toGetMainImageDto(Long storeId, String .mainImageUrl(key) .build(); } -} + public static StoreResDto.MyStoreDto toMyStoreDto(Store store, boolean isOpenNow, String mainImageUrl, Long totalBookingCount) { + return StoreResDto.MyStoreDto.builder() + .storeId(store.getId()) + .storeName(store.getStoreName()) + .address(store.getAddress()) + .category(store.getCategory()) + .rating(store.getRating()) + .totalBookingCount(totalBookingCount) + .reviewCount(null) // 리뷰 도메인 구현 이후 추가 예정 + .mainImageUrl(mainImageUrl) + .isOpenNow(isOpenNow) + .build(); + } + + public static StoreResDto.MyStoreListDto toMyStoreListDto(List stores) { + return StoreResDto.MyStoreListDto.builder() + .stores(stores) + .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 0489d542..f9eb62be 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 @@ -4,6 +4,7 @@ import com.eatsfine.eatsfine.domain.store.enums.Category; import com.eatsfine.eatsfine.domain.store.enums.DepositRate; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import java.math.BigDecimal; @@ -91,4 +92,35 @@ public record GetMainImageDto( String mainImageUrl ) {} + // 내 가게 관리 리스트 응답 + @Builder + @Schema(description = "사장님용 내 가게 관리 단건 DTO") + public record MyStoreDto( + @Schema(description = "가게 ID", example = "1") + Long storeId, + @Schema(description = "가게명", example = "더 플레이스 강남점") + String storeName, + @Schema(description = "가게 주소", example = "서울 강남구 테헤란로 123") + String address, + @Schema(description = "카테고리", example = "ITALIAN") + Category category, + @Schema(description = "평점", example = "4.8") + BigDecimal rating, + @Schema(description = "누적 총 예약 수", example = "1234") + Long totalBookingCount, // 총 예약 수 + @Schema(description = "리뷰 개수", example = "256") + Long reviewCount, + @Schema(description = "대표 이미지 URL", example = "https://s3.amazonaws.com/thumb.jpg") + String mainImageUrl, + @Schema(description = "현재 영업 여부", example = "true") + boolean isOpenNow + ){} + + @Builder + @Schema(description = "사장님용 내 가게 관리 목록 응답") + public record MyStoreListDto( + @Schema(description = "소유한 가게 목록") + List stores + ){} + } diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/enums/Category.java b/src/main/java/com/eatsfine/eatsfine/domain/store/enums/Category.java index 57e59a69..04a1b943 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/enums/Category.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/store/enums/Category.java @@ -1,5 +1,5 @@ package com.eatsfine.eatsfine.domain.store.enums; public enum Category { - KOREAN, CHINESE, JAPANESE, WESTERN, CAFE + KOREAN, CHINESE, JAPANESE, WESTERN, ITALIAN, CAFE } diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepository.java b/src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepository.java index 6cd3f595..193429d9 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepository.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/store/repository/StoreRepository.java @@ -1,10 +1,12 @@ package com.eatsfine.eatsfine.domain.store.repository; import com.eatsfine.eatsfine.domain.store.entity.Store; +import com.eatsfine.eatsfine.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import java.util.List; import java.util.Optional; @@ -19,4 +21,7 @@ public interface StoreRepository extends JpaRepository, StoreReposi """) Optional findByIdWithMenus(@Param("id") Long id); + @Query("select s from Store s left join fetch s.businessHours where s.owner = :owner") + List findAllByOwner(User owner); + } \ No newline at end of file diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryService.java b/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryService.java index 513f7cf2..264db283 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryService.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryService.java @@ -21,4 +21,6 @@ StoreResDto.StoreSearchResDto search( boolean isOpenNow(Store store, LocalDateTime now); + StoreResDto.MyStoreListDto getMyStores(String username); + } diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryServiceImpl.java b/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryServiceImpl.java index 438946d5..a8e475cb 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryServiceImpl.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/store/service/StoreQueryServiceImpl.java @@ -1,6 +1,7 @@ package com.eatsfine.eatsfine.domain.store.service; import com.eatsfine.eatsfine.domain.businesshours.entity.BusinessHours; +import com.eatsfine.eatsfine.domain.booking.repository.BookingRepository; import com.eatsfine.eatsfine.domain.store.condition.StoreSearchCondition; import com.eatsfine.eatsfine.domain.store.converter.StoreConverter; import com.eatsfine.eatsfine.domain.store.dto.StoreResDto; @@ -9,6 +10,10 @@ import com.eatsfine.eatsfine.domain.store.exception.StoreException; import com.eatsfine.eatsfine.domain.store.repository.StoreRepository; import com.eatsfine.eatsfine.domain.store.status.StoreErrorStatus; +import com.eatsfine.eatsfine.domain.user.entity.User; +import com.eatsfine.eatsfine.domain.user.exception.UserException; +import com.eatsfine.eatsfine.domain.user.repository.UserRepository; +import com.eatsfine.eatsfine.domain.user.status.UserErrorStatus; import com.eatsfine.eatsfine.global.s3.S3Service; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; @@ -21,6 +26,8 @@ import java.time.LocalDateTime; import java.time.LocalTime; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -28,6 +35,8 @@ public class StoreQueryServiceImpl implements StoreQueryService { private final StoreRepository storeRepository; + private final BookingRepository bookingRepository; + private final UserRepository userRepository; private final S3Service s3Service; // 식당 검색 @@ -142,4 +151,37 @@ private boolean isEffectiveOpen(BusinessHours bh, LocalTime time, boolean isToda return false; // 영업 시간 자체가 아님 } + + // 내 가게 리스트 조회 + @Override + public StoreResDto.MyStoreListDto getMyStores(String email) { + User user = userRepository.findByEmail(email) + .orElseThrow(() -> new UserException(UserErrorStatus.MEMBER_NOT_FOUND)); + + List myStores = storeRepository.findAllByOwner(user); + + if(myStores.isEmpty()) { + return StoreConverter.toMyStoreListDto(List.of()); + } + // N+1 문제 해결을 위한 Bulk Query 실행 + List bookingCounts = bookingRepository.countActiveBookingsByStores(myStores); + Map bookingCountMap = bookingCounts.stream() + .collect(Collectors.toMap( + row -> (Long) row[0], + row -> (Long) row[1] + )); + + LocalDateTime now = LocalDateTime.now(); + + List storeDtos = myStores.stream() + .map(store -> { + boolean isOpen = isOpenNow(store, now); + Long totalBookingCount = bookingCountMap.getOrDefault(store.getId(), 0L); + String mainImageUrl = s3Service.toUrl(store.getMainImageKey()); + return StoreConverter.toMyStoreDto(store, isOpen, mainImageUrl, totalBookingCount); + }) + .toList(); + + return StoreConverter.toMyStoreListDto(storeDtos); + } } diff --git a/src/main/java/com/eatsfine/eatsfine/domain/store/status/StoreSuccessStatus.java b/src/main/java/com/eatsfine/eatsfine/domain/store/status/StoreSuccessStatus.java index b581c921..95431628 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/store/status/StoreSuccessStatus.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/store/status/StoreSuccessStatus.java @@ -22,7 +22,9 @@ public enum StoreSuccessStatus implements BaseCode { _STORE_MAIN_IMAGE_UPLOAD_SUCCESS(HttpStatus.OK, "STORE2005", "성공적으로 가게 대표 이미지를 업로드했습니다."), - _STORE_MAIN_IMAGE_GET_SUCCESS(HttpStatus.OK, "STORE2005", "성공적으로 가게 대표 이미지를 조회했습니다.") + _STORE_MAIN_IMAGE_GET_SUCCESS(HttpStatus.OK, "STORE2006", "성공적으로 가게 대표 이미지를 조회했습니다."), + + _MY_STORE_LIST_FOUND(HttpStatus.OK, "STORE2007", "성공적으로 내 가게 리스트를 조회했습니다.") ;