Feature/상품조회

README.md

@@ -2,5 +2,11 @@
 ## 캐치테이블 사이드 프로젝트 
 
 
+API명| url | 
+--|--|
+상점 목록조회 |  https://github.com/f-lab-edu/ys-catchtable/issues/6|
+상점 단건 조회  | https://github.com/f-lab-edu/ys-catchtable/issues/4
+
+
 ## 간단한 도메인 구성도 
 ![img.png](etc/도메인구성도.png)

src/main/java/com/yscp/catchtable/application/amenity/AmenityReadService.java

@@ -0,0 +1,13 @@
+package com.yscp.catchtable.application.amenity;
+
+import com.yscp.catchtable.domain.amenity.repository.AmenityRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+@Service
+public class AmenityReadService {
+    private final AmenityRepository amenityRepository;
+}

src/main/java/com/yscp/catchtable/application/amenity/StoreAmenityReadService.java

@@ -0,0 +1,34 @@
+package com.yscp.catchtable.application.amenity;
+
+import com.yscp.catchtable.application.amenity.dto.StoreAmenityDto;
+import com.yscp.catchtable.domain.amenity.entity.StoreAmenity;
+import com.yscp.catchtable.domain.amenity.repository.StoreAmenityRepository;
+import com.yscp.catchtable.exception.BadRequestError;
+import com.yscp.catchtable.exception.CatchTableException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Service
+public class StoreAmenityReadService {
+    private final StoreAmenityRepository storeAmenityRepository;
+
+    public List<StoreAmenity> findByStoreIdx(Long idx) {
+        if (idx == null) {
+            throw new CatchTableException(BadRequestError.NULL_EXCEPTION, "상품이 존재하지 않습니다.");
+        }
+
+        return storeAmenityRepository.findByStoreIdx(idx);
+    }
+
+    public List<StoreAmenityDto> findAmenityDtoByStoreIdx(Long idx) {
+        return findByStoreIdx(idx)
+                .stream()
+                .map(StoreAmenityDto::from)
+                .toList();
+    }
+}

src/main/java/com/yscp/catchtable/application/amenity/dto/StoreAmenityDto.java

@@ -0,0 +1,16 @@
+package com.yscp.catchtable.application.amenity.dto;
+
+import com.yscp.catchtable.domain.amenity.entity.StoreAmenity;
+
+public record StoreAmenityDto(
+        String code,
+        String memo,
+        String image
+) {
+
+    public static StoreAmenityDto from(StoreAmenity amenity) {
+        return new StoreAmenityDto(amenity.getAmenity().getCode(),
+                amenity.getMemo(),
+                amenity.getAmenity().getImageUrl());
+    }
+}

src/main/java/com/yscp/catchtable/application/location/dto/LocationDto.java

@@ -0,0 +1,14 @@
+package com.yscp.catchtable.application.location.dto;
+
+import org.locationtech.jts.geom.Point;
+
+public record LocationDto(
+        String addressCode,
+        String name,
+        double xCoordinate,
+        double yCoordinate
+) {
+    public LocationDto(String addressCode, String name, Point point) {
+        this(addressCode, name, point.getX(), point.getY());
+    }
+}

src/main/java/com/yscp/catchtable/application/menu/MenuReadService.java

@@ -0,0 +1,33 @@
+package com.yscp.catchtable.application.menu;
+
+import com.yscp.catchtable.application.menu.dto.MenuDto;
+import com.yscp.catchtable.domain.menu.entity.Menu;
+import com.yscp.catchtable.domain.menu.entity.sort.MenuSort;
+import com.yscp.catchtable.domain.menu.repository.MenuRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Objects;
+
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Service
+public class MenuReadService {
+    private final MenuRepository menuRepository;
+
+    public List<Menu> findByStoreIdx(Long idx, MenuSort menuSort) {
+        Objects.requireNonNull(idx, "Store idx must not be null");
+        return menuRepository.findByStoreIdx(idx, menuSort.getSort());
+    }
+
+    public List<MenuDto> findMenuDtoByStoreIdx(Long idx, MenuSort menuSort) {
+
+        return findByStoreIdx(idx, menuSort)
+                .stream()
+                .map(MenuDto::from)
+                .toList();
+
+    }
+}

src/main/java/com/yscp/catchtable/application/menu/dto/MenuDto.java

@@ -0,0 +1,13 @@
+package com.yscp.catchtable.application.menu.dto;
+
+import com.yscp.catchtable.domain.menu.entity.Menu;
+
+public record MenuDto(
+        Long idx,
+        String name,
+        String menuImageUrl
+) {
+    public static MenuDto from(Menu menu) {
+        return new MenuDto(menu.getIdx(), menu.getName(), menu.getImageUrl());
+    }
+}

src/main/java/com/yscp/catchtable/application/reserve/ReserveService.java

@@ -1,5 +1,6 @@
 package com.yscp.catchtable.application.reserve;
 
+import com.yscp.catchtable.application.reserve.dto.ReserveDto;
 import com.yscp.catchtable.application.reserve.dto.StoreReserveDto;
 import com.yscp.catchtable.domain.reserve.repository.ReserveRepository;
 import lombok.RequiredArgsConstructor;
@@ -17,9 +18,16 @@
 public class ReserveService {
     private final ReserveRepository repository;
 
-    public Map<Long, List<StoreReserveDto>> reserveDtoMapByStoreList(List<Long> idxes, LocalDate maxDate) {
-        List<StoreReserveDto> storeReserveDtos = repository.storeReserveDtoBeforeMaxDate(idxes, maxDate);
+    public Map<Long, List<StoreReserveDto>> findReserveDtoMapByStores(List<Long> idxes, LocalDate maxDate) {
+        List<StoreReserveDto> storeReserveDtos = repository.findStoreReserveDtoListBeforeMaxDate(idxes, maxDate);
         return storeReserveDtos.stream()
                 .collect(Collectors.groupingBy(StoreReserveDto::getStoreIdx, Collectors.toList()));
     }
+
+    public List<ReserveDto> findReserveDtos(Long idx, LocalDate localDate) {
+        return repository.getStoreReserveDtoBeforeMaxDate(idx, localDate)
+                .stream()
+                .map(ReserveDto::from)
+                .toList();
+    }
 }

src/main/java/com/yscp/catchtable/application/store/StoreBusinessHourService.java

@@ -1,11 +1,13 @@
 package com.yscp.catchtable.application.store;
 
 import com.yscp.catchtable.application.store.dto.StoreBusinessDto;
+import com.yscp.catchtable.domain.store.entity.value.DayType;
 import com.yscp.catchtable.domain.store.repository.StoreBusinessHourRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -17,10 +19,15 @@
 public class StoreBusinessHourService {
     private final StoreBusinessHourRepository storeBusinessHourRepository;
 
-    public Map<Long, StoreBusinessDto> findBusinessMap(List<Long> idxes) {
-        return storeBusinessHourRepository.findByStoreIdxIn(idxes)
+    public Map<Long, StoreBusinessDto> findBusinessMap(List<Long> idxes, LocalDate localDate) {
+        DayType day = DayType.from(localDate);
+        return storeBusinessHourRepository.findByStoreIdxIn(idxes, day)
                 .stream()
                 .map(StoreBusinessDto::from)
                 .collect(Collectors.toMap(StoreBusinessDto::getStoreIdx, Function.identity()));
     }
+
+    public List<StoreBusinessDto> findByStoreIdx(Long storeIdx) {
+        return storeBusinessHourRepository.findByStoreIdx(storeIdx);
+    }
 }

src/main/java/com/yscp/catchtable/application/store/StoreReadService.java

@@ -4,6 +4,8 @@
 import com.yscp.catchtable.domain.store.entity.Store;
 import com.yscp.catchtable.domain.store.repository.StoreRepository;
 import com.yscp.catchtable.domain.store.repository.StoreSearchRepository;
+import com.yscp.catchtable.exception.CatchTableException;
+import com.yscp.catchtable.exception.NotFoundError;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,4 +22,9 @@ public class StoreReadService {
     public List<Store> findBySearchDto(StoreSearchDto searchDto) {
         return storeSearchRepository.findBySearchDto(searchDto);
     }
+
+    public Store findByIdx(Long idx) {
+        return storeRepository.findById(idx)
+                .orElseThrow(() -> new CatchTableException(NotFoundError.NOT_FOUND_STORE));
+    }
 }

src/main/java/com/yscp/catchtable/application/store/StoreReader.java

@@ -0,0 +1,77 @@
+package com.yscp.catchtable.application.store;
+
+import com.yscp.catchtable.application.amenity.StoreAmenityReadService;
+import com.yscp.catchtable.application.amenity.dto.StoreAmenityDto;
+import com.yscp.catchtable.application.location.dto.LocationDto;
+import com.yscp.catchtable.application.menu.MenuReadService;
+import com.yscp.catchtable.application.menu.dto.MenuDto;
+import com.yscp.catchtable.application.reserve.ReserveService;
+import com.yscp.catchtable.application.reserve.dto.ReserveDto;
+import com.yscp.catchtable.application.reserve.dto.StoreReserveDto;
+import com.yscp.catchtable.application.store.dto.StoreBusinessDto;
+import com.yscp.catchtable.application.store.dto.StoreDetailDto;
+import com.yscp.catchtable.application.store.dto.StoreDtos;
+import com.yscp.catchtable.domain.menu.entity.sort.MenuSort;
+import com.yscp.catchtable.domain.store.entity.Store;
+import com.yscp.catchtable.domain.store.entity.Stores;
+import com.yscp.catchtable.presentation.store.dto.request.StoreSearchRequestDto;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Service
+public class StoreReader {
+    private final StoreReadService storeReadService;
+    private final StoreBusinessHourService storeBusinessHourService;
+    private final ReserveService reserveService;
+    private final MenuReadService menuReadservice;
+    private final StoreAmenityReadService amenityReadService;
+
+    public StoreDtos getStoreListDto(StoreSearchRequestDto storeSearchRequestDto, LocalDate date) {
+        Stores stores = Stores.from(storeReadService.findBySearchDto(storeSearchRequestDto.toSearchDto()));
+
+        List<Long> idxes = stores.idxes();
+
+        Map<Long, List<StoreReserveDto>> reserveDtoMap = reserveService.findReserveDtoMapByStores(idxes,
+                date.plusDays(14));
+
+        Map<Long, StoreBusinessDto> businessHourMap = storeBusinessHourService.findBusinessMap(idxes, date);
+        return StoreDtos.of(stores,
+                reserveDtoMap,
+                businessHourMap);
+    }
+
+    public StoreDetailDto getStoreDetailDto(Long idx, LocalDate date) {
+        Store store = storeReadService.findByIdx(idx);
+        List<ReserveDto> reserveDtoList = reserveService.findReserveDtos(store.getIdx(), date.plusDays(14));
+        // 메뉴 조회
+        List<MenuDto> menuList = menuReadservice.findMenuDtoByStoreIdx(store.getIdx(), MenuSort.ORD_DESC);
+        // 편의시설 조회
+        List<StoreAmenityDto> storeAmenities = amenityReadService.findAmenityDtoByStoreIdx(store.getIdx());
+        // 영업시간 조회
+        List<StoreBusinessDto> businessDto = storeBusinessHourService.findByStoreIdx(store.getIdx());
+        // 위치정보 조회
+        LocationDto locationDto = new LocationDto(store.getAddressCode(),
+                store.getLocationName(),
+                store.getPoint());
+
+        return new StoreDetailDto(
+                store.getIdx(),
+                store.getCategory().getName(),
+                store.getTel(),
+                store.getIntroduce(),
+                store.getFeeInformation(),
+                locationDto,
+                reserveDtoList,
+                menuList,
+                storeAmenities,
+                businessDto
+        );
+    }
+}

src/main/java/com/yscp/catchtable/application/store/dto/StoreBusinessDto.java

@@ -1,42 +1,48 @@
 package com.yscp.catchtable.application.store.dto;
 
 import com.yscp.catchtable.domain.store.entity.StoreBusinessHour;
+import com.yscp.catchtable.domain.store.entity.value.DayType;
+import lombok.Builder;
 import lombok.Getter;
 
 @Getter
 public class StoreBusinessDto {
     private final Long idx;
     private final Long storeIdx;
-    private final Integer lunchStartTime;
-    private final Integer lunchEndTime;
-    private final Integer dinerStartTime;
-    private final Integer dinerEndTime;
+    private final DayType dayType;
+    private final String lunchStartTime;
+    private final String lunchEndTime;
+    private final String dinerStartTime;
+    private final String dinerEndTime;
 
     public static StoreBusinessDto from(StoreBusinessHour storeBusinessHour) {
         return new StoreBusinessDto(storeBusinessHour.getIdx(),
                 storeBusinessHour.getStore().getIdx(),
+                storeBusinessHour.getDay(),
                 storeBusinessHour.getLunchStartTime(),
                 storeBusinessHour.getLunchEndTime(),
                 storeBusinessHour.getDinerStartTime(),
                 storeBusinessHour.getDinerEndTime());
     }
 
-    public StoreBusinessDto(Long idx, Long storeIdx, Integer lunchStartTime, Integer lunchEndTime, Integer dinerStartTime, Integer dinerEndTime) {
+    @Builder
+    public StoreBusinessDto(Long idx, Long storeIdx, DayType dayType, String lunchStartTime, String lunchEndTime, String dinerStartTime, String dinerEndTime) {
         this.idx = idx;
         this.storeIdx = storeIdx;
+        this.dayType = dayType;
         this.lunchStartTime = lunchStartTime;
         this.lunchEndTime = lunchEndTime;
         this.dinerStartTime = dinerStartTime;
         this.dinerEndTime = dinerEndTime;
     }
 
-    public Integer startTime() {
+    public String startTime() {
         return lunchStartTime == null
                 ? dinerStartTime
                 : lunchStartTime;
     }
 
-    public Integer endTime() {
+    public String endTime() {
         return dinerEndTime == null
                 ? lunchEndTime
                 : dinerEndTime;