feet : 준비되지 않은 업체 조회 방지

Author: 이주승

src/main/java/com/drinkhere/drinklystore/domain/dto/request/UpdateStoreRequest.java

@@ -42,6 +42,8 @@ public record UpdateStoreRequest(
 
         @Schema(description = "이용 가능한 가능한 요일", example = "[\"월\", \"화\", \"수\", \"목\", \"금\"]", required = false)
         @Size(max = 50, message = "이용 가능한 가능한 요일은 50자 이하로 입력해야 합니다.")
-        String availableDays
+        String availableDays,
+
+        Boolean isReady
 ) {
 }

src/main/java/com/drinkhere/drinklystore/domain/dto/response/GetStoresByLocationResponse.java

@@ -8,9 +8,11 @@
 import com.drinkhere.drinklystore.util.JsonUtil;
 
 import java.time.DayOfWeek;
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.StringTokenizer;
 import java.util.stream.Collectors;
 
 public record GetStoresByLocationResponse(
@@ -20,6 +22,7 @@ public record GetStoresByLocationResponse(
         String latitude,
         String longitude,
         String isOpen,
+        boolean isAvailable,
         String openingInfo,
         String storeTel,
         String storeAddress,
@@ -93,13 +96,36 @@ public static GetStoresByLocationResponse toDto(Store store, PresignedUrlService
             }
         }
 
+
+        DayOfWeek dayOfWeek = LocalDate.now().getDayOfWeek();
+        String koreanDay = switch (dayOfWeek) {
+            case MONDAY -> "월";
+            case TUESDAY -> "화";
+            case WEDNESDAY -> "수";
+            case THURSDAY -> "목";
+            case FRIDAY -> "금";
+            case SATURDAY -> "토";
+            case SUNDAY -> "일";
+        };
+
+        boolean isAvailable = false;
+        StringTokenizer st = new StringTokenizer(store.getAvailableDays(), " ");
+        while (st.hasMoreTokens()) {
+            String token = st.nextToken();
+            if (token.equals(koreanDay) && isOpen.equals("영업중")) {
+                isAvailable = true;
+                break;
+            }
+        }
+
         return new GetStoresByLocationResponse(
                 store.getId(),
                 store.getStoreName(),
                 presignedUrl,
                 store.getLatitude(),
                 store.getLongitude(),
                 isOpen,
+                isAvailable,
                 openingInfo,
                 store.getStoreTel(),
                 store.getStoreAddress(),

src/main/java/com/drinkhere/drinklystore/domain/entity/Store.java

@@ -63,6 +63,9 @@ public class Store extends BaseTimeEntity {
     @Column(name = "business_registration_number", nullable = false)
     private String businessRegistrationNumber;
 
+    @Column(name = "is_ready" , nullable = false)
+    private Boolean isReady;
+
     @Builder
     public Store(Long ownerId, String storeName, String storeTel, String storeAddress, String storeDetailAddress, String businessRegistrationNumber, String latitude, String longitude) {
         this.ownerId = ownerId;
@@ -73,6 +76,7 @@ public Store(Long ownerId, String storeName, String storeTel, String storeAddres
         this.businessRegistrationNumber = businessRegistrationNumber;
         this.latitude = latitude;
         this.longitude = longitude;
+        this.isReady = false;
     }
     public void setId(Long id) {this.id = id;}
     public void setStoreName(String storeName) {
@@ -106,5 +110,7 @@ public void setInstagramUrl(String instagramUrl) {
     public void setAvailableDays(String availableDays) {
         this.availableDays = availableDays;
     }
+
+    public void setIsReady(boolean isReady) {this.isReady = isReady; }
 }
 

src/main/java/com/drinkhere/drinklystore/domain/repository/StoreRepository.java

@@ -36,6 +36,7 @@ default Store findByIdOrThrow(Long id) {
                     + sin(radians(:latitude)) * sin(radians(CAST(s.latitude AS DOUBLE)))
                 )
             ) < :radius
+            AND s.is_ready = true
             AND (:searchKeyword IS NULL OR s.store_name LIKE %:searchKeyword%)
             ORDER BY distance ASC
     """, nativeQuery = true)
@@ -46,7 +47,7 @@ List<Store> findStoresByLocation(@Param("latitude") double latitude,
 
 
 
-    @Query("SELECT s FROM Store s LEFT JOIN FETCH s.storeImages WHERE s.id = :storeId")
+    @Query("SELECT s FROM Store s LEFT JOIN FETCH s.storeImages WHERE s.id = :storeId AND s.isReady = true")
     Optional<Store> findByIdWithImages(@Param("storeId") Long storeId);
 
     default Store findByIdWithImagesOrThrow(Long storeId) {

src/main/java/com/drinkhere/drinklystore/domain/service/store/StoreCommandService.java

@@ -39,6 +39,7 @@ public Store updateStore(Store store, UpdateStoreRequest updateStoreRequest) {
         if (updateStoreRequest.storeAddress() != null) store.setStoreAddress(updateStoreRequest.storeAddress());
         if (updateStoreRequest.instagramUrl() != null) store.setInstagramUrl(updateStoreRequest.instagramUrl());
         if (updateStoreRequest.availableDays() != null) store.setAvailableDays(updateStoreRequest.availableDays());
+        if (updateStoreRequest.isReady() != null) store.setIsReady(updateStoreRequest.isReady());
 
         // DirtyChecking
         return store;