예약하기 기능을 구현했습니다.

build.gradle

@@ -35,6 +35,10 @@ dependencies {
     // REDIS CACHE
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
     implementation 'org.springframework.boot:spring-boot-starter-cache'
+
+// https://mvnrepository.com/artifact/org.redisson/redisson-spring-boot-starter
+    implementation 'org.redisson:redisson-spring-boot-starter:3.46.0'
+
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     compileOnly 'org.projectlombok:lombok'

src/main/java/com/yscp/catchtable/application/queue/StoreQueueService.java

@@ -13,4 +13,14 @@ public class StoreQueueService {
     public void registerWaiting(StoreQueueDto storeQueueDto) {
         redisTemplate.opsForZSet().add(storeQueueDto.key(), storeQueueDto.value(), storeQueueDto.score());
     }
+
+    public boolean isValidWaitingUser(StoreQueueDto storeQueueDto) {
+        Double score = redisTemplate.opsForZSet().score(storeQueueDto.key(), storeQueueDto.value());
+        long now = System.currentTimeMillis();
+        return now - score <= 7 * 60 * 1000;
+    }
+
+    public void delete(StoreQueueDto storeQueueDto) {
+        redisTemplate.opsForZSet().remove(storeQueueDto.key(), storeQueueDto.value());
+    }
 }

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.queue.StoreQueueService;
 import com.yscp.catchtable.application.reserve.dto.ReserveDto;
 import com.yscp.catchtable.application.reserve.dto.StoreReserveDto;
 import com.yscp.catchtable.domain.reserve.entity.ReserveData;
@@ -11,13 +12,15 @@
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Transactional
 @RequiredArgsConstructor
 @Service
 public class ReserveService {
     private final ReserveRepository repository;
+    private final StoreQueueService storeQueueService;
 
     public Map<Long, List<StoreReserveDto>> findReserveDtoMapByStores(List<Long> idxes, LocalDate maxDate) {
         List<StoreReserveDto> storeReserveDtos = repository.findStoreReserveDtoListBeforeMaxDate(idxes, maxDate);
@@ -36,4 +39,8 @@ public ReservesInDayDto getReservesInDay(Long storeIdx, LocalDate date) {
         List<ReserveData> reserveDates = repository.findByStore_IdxAndReserveDate(storeIdx, date);
         return ReservesInDayDto.from(reserveDates);
     }
+
+    public Optional<ReserveData> findWithStoreByIdx(Long storeReserveIdx) {
+        return repository.findWithStoreByIdx(storeReserveIdx);
+    }
 }

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

@@ -0,0 +1,67 @@
+package com.yscp.catchtable.application.reserve;
+
+import com.yscp.catchtable.application.queue.StoreQueueService;
+import com.yscp.catchtable.application.queue.dto.StoreQueueDto;
+import com.yscp.catchtable.application.reserve.dto.StoreReserveRegisterDto;
+import com.yscp.catchtable.application.reserve.mapper.UserReserveDataMapper;
+import com.yscp.catchtable.domain.reserve.entity.ReserveData;
+import com.yscp.catchtable.domain.reserve.entity.UserReserveData;
+import com.yscp.catchtable.domain.reserve.repository.UserReserveDataRepository;
+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.Optional;
+
+@Transactional
+@RequiredArgsConstructor
+@Service
+public class UserReserveService {
+    private final StoreQueueService storeQueueService;
+    private final ReserveService reserveService;
+    private final UserReserveDataRepository userReserveDataRepository;
+
+    public void reserve(StoreReserveRegisterDto storeReserveRegisterDto) {
+
+        StoreQueueDto storeQueueDto = new StoreQueueDto(storeReserveRegisterDto.storeReserveIdx().toString(), storeReserveRegisterDto.userIdx().toString());
+
+        if (!isValidWaitingUser(storeQueueDto)) {
+            throw new CatchTableException(BadRequestError.EXPIRED_TICKET);
+        }
+
+        Optional<ReserveData> reserveDataOptional = reserveService.findWithStoreByIdx(storeReserveRegisterDto.storeReserveIdx());
+
+        reserveDataOptional.ifPresentOrElse(
+                reserveData -> {
+                    saveUserReserveData(
+                            storeReserveRegisterDto,
+                            reserveData,
+                            storeQueueDto);
+                },
+                () -> {
+                    throw new CatchTableException(BadRequestError.NULL_EXCEPTION);
+                }
+        );
+    }
+
+    private void saveUserReserveData(StoreReserveRegisterDto dto,
+                                     ReserveData reserveData,
+                                     StoreQueueDto storeQueueDto) {
+
+        reserveData.userReserve(dto.requestDatetime(), dto.userIdx());
+
+        UserReserveData userReserveData = UserReserveDataMapper.toEntity(reserveData, dto);
+
+        if (userReserveData != null) {
+            userReserveDataRepository.save(userReserveData);
+        }
+
+        storeQueueService.delete(storeQueueDto);
+    }
+
+    private boolean isValidWaitingUser(StoreQueueDto queueDto) {
+        return storeQueueService.isValidWaitingUser(queueDto);
+    }
+}

src/main/java/com/yscp/catchtable/application/reserve/dto/StoreReserveRegisterDto.java

@@ -0,0 +1,14 @@
+package com.yscp.catchtable.application.reserve.dto;
+
+import java.time.LocalDateTime;
+
+public record StoreReserveRegisterDto(
+        Long userIdx,
+        Long storeReserveIdx,
+        String reservePayType,
+        String transactionNo,
+        String purpose,
+        Integer reservationNumberOfPeople,
+        LocalDateTime requestDatetime
+) {
+}

src/main/java/com/yscp/catchtable/application/reserve/mapper/StoreReserveMapper.java

@@ -0,0 +1,23 @@
+package com.yscp.catchtable.application.reserve.mapper;
+
+import com.yscp.catchtable.application.reserve.dto.StoreReserveRegisterDto;
+import com.yscp.catchtable.presentation.reserve.dto.StoreReserveRequestDto;
+import lombok.experimental.UtilityClass;
+
+import java.time.LocalDateTime;
+
+@UtilityClass
+public class StoreReserveMapper {
+    public static StoreReserveRegisterDto toDto(StoreReserveRequestDto storeReserveRequestDto,
+                                                LocalDateTime reserveDatetime) {
+        return new StoreReserveRegisterDto(
+                storeReserveRequestDto.userIdx(),
+                storeReserveRequestDto.storeReserveIdx(),
+                storeReserveRequestDto.reserveType(),
+                storeReserveRequestDto.transactionNo(),
+                storeReserveRequestDto.purpose(),
+                storeReserveRequestDto.reservationNumberOfPeople(),
+                reserveDatetime
+        );
+    }
+}

src/main/java/com/yscp/catchtable/application/reserve/mapper/UserReserveDataMapper.java

@@ -0,0 +1,25 @@
+package com.yscp.catchtable.application.reserve.mapper;
+
+import com.yscp.catchtable.application.reserve.dto.StoreReserveRegisterDto;
+import com.yscp.catchtable.domain.reserve.entity.ReserveData;
+import com.yscp.catchtable.domain.reserve.entity.UserReserveData;
+import com.yscp.catchtable.domain.reserve.entity.value.ReservePayType;
+import com.yscp.catchtable.domain.reserve.entity.value.ReserveStatus;
+import com.yscp.catchtable.domain.user.entity.User;
+
+public class UserReserveDataMapper {
+    public static UserReserveData toEntity(ReserveData reserveData, StoreReserveRegisterDto dto) {
+        User requestUser = User.builder()
+                .idx(dto.userIdx())
+                .build();
+
+        return UserReserveData.builder()
+                .user(requestUser)
+                .reserveData(reserveData)
+                .reserveStatus(ReserveStatus.RESERVE)
+                .reservePayType(ReservePayType.from(dto.reservePayType()))
+                .regIdx(dto.userIdx())
+                .regDatetime(dto.requestDatetime())
+                .build();
+    }
+}

src/main/java/com/yscp/catchtable/domain/reserve/entity/ReserveData.java

@@ -2,8 +2,11 @@
 
 import com.yscp.catchtable.domain.reserve.entity.value.StoreReserveDataStatus;
 import com.yscp.catchtable.domain.store.entity.Store;
+import com.yscp.catchtable.exception.BadRequestError;
+import com.yscp.catchtable.exception.CatchTableException;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Comment;
@@ -44,4 +47,31 @@ public class ReserveData {
     private Long regIdx;
     private LocalDateTime modDatetime;
     private Long modIdx;
+
+    @Builder
+    public ReserveData(Long idx, Store store, LocalDate reserveDate, String reserveTime, Integer minUserCount, Integer maxUserCount, Integer canReserveCount, Integer reservedCount, StoreReserveDataStatus reserveStatus, LocalDateTime regDatetime, Long regIdx, LocalDateTime modDatetime, Long modIdx) {
+        this.idx = idx;
+        this.store = store;
+        this.reserveDate = reserveDate;
+        this.reserveTime = reserveTime;
+        this.minUserCount = minUserCount;
+        this.maxUserCount = maxUserCount;
+        this.canReserveCount = canReserveCount;
+        this.reservedCount = reservedCount;
+        this.reserveStatus = reserveStatus;
+        this.regDatetime = regDatetime;
+        this.regIdx = regIdx;
+        this.modDatetime = modDatetime;
+        this.modIdx = modIdx;
+    }
+
+    public void userReserve(LocalDateTime userReserveDatetime, Long userIdx) {
+        if (reservedCount >= canReserveCount) {
+            throw new CatchTableException(BadRequestError.STORE_RESERVATION_MAX);
+        }
+
+        reservedCount += 1;
+        modDatetime = userReserveDatetime;
+        modIdx = userIdx;
+    }
 }

src/main/java/com/yscp/catchtable/domain/reserve/entity/UserReserveData.java

@@ -1,9 +1,11 @@
 package com.yscp.catchtable.domain.reserve.entity;
 
+import com.yscp.catchtable.domain.reserve.entity.value.ReservePayType;
 import com.yscp.catchtable.domain.reserve.entity.value.ReserveStatus;
 import com.yscp.catchtable.domain.user.entity.User;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -28,9 +30,23 @@ public class UserReserveData {
 
     @Enumerated(EnumType.STRING)
     private ReserveStatus reserveStatus;
+    @Enumerated(EnumType.STRING)
+    private ReservePayType reservePayType;
     private LocalDateTime regDatetime;
     private Long regIdx;
     private LocalDateTime modDatetime;
     private Long modIdx;
 
+    @Builder
+    public UserReserveData(Long idx, User user, ReserveData reserveData, ReserveStatus reserveStatus, ReservePayType reservePayType, LocalDateTime regDatetime, Long regIdx, LocalDateTime modDatetime, Long modIdx) {
+        this.idx = idx;
+        this.user = user;
+        this.reserveData = reserveData;
+        this.reserveStatus = reserveStatus;
+        this.reservePayType = reservePayType;
+        this.regDatetime = regDatetime;
+        this.regIdx = regIdx;
+        this.modDatetime = modDatetime;
+        this.modIdx = modIdx;
+    }
 }

src/main/java/com/yscp/catchtable/domain/reserve/entity/value/ReservePayType.java

@@ -0,0 +1,27 @@
+package com.yscp.catchtable.domain.reserve.entity.value;
+
+import com.yscp.catchtable.exception.BadRequestError;
+import com.yscp.catchtable.exception.CatchTableException;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public enum ReservePayType {
+    CARD,
+    CATCH_PAY;
+
+    private static final Map<String, ReservePayType> MAPPING;
+
+    static {
+        MAPPING = Arrays.stream(ReservePayType.values())
+                .collect(Collectors.toMap(Enum::name, e -> e));
+    }
+
+    public static ReservePayType from(String reserveTypeString) {
+        if (reserveTypeString == null || reserveTypeString.isEmpty()) {
+            throw new CatchTableException(BadRequestError.INVALID_RESERVE_PAY_TYPE);
+        }
+        return MAPPING.get(reserveTypeString.toUpperCase());
+    }
+}

src/main/java/com/yscp/catchtable/domain/reserve/entity/value/ReserveStatus.java

@@ -1,4 +1,8 @@
 package com.yscp.catchtable.domain.reserve.entity.value;
 
 public enum ReserveStatus {
+    RESERVE,
+    SUCCESS,
+    DELETE,
+    CANCEL
 }

src/main/java/com/yscp/catchtable/domain/reserve/repository/ReserveRepository.java

@@ -8,6 +8,7 @@
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
 
 public interface ReserveRepository extends JpaRepository<ReserveData, Long> {
 
@@ -40,4 +41,12 @@ public interface ReserveRepository extends JpaRepository<ReserveData, Long> {
     List<StoreReserveDto> getStoreReserveDtoBeforeMaxDate(@Param("idx") Long idx, @Param("date") LocalDate date);
 
     List<ReserveData> findByStore_IdxAndReserveDate(Long idx, LocalDate reserveDate);
+
+    @Query(value = """
+            SELECT rd
+            FROM ReserveData rd
+            JOIN FETCH rd.store s
+            WHERE rd.idx = :idx
+            """)
+    Optional<ReserveData> findWithStoreByIdx(Long idx);
 }

src/main/java/com/yscp/catchtable/domain/reserve/repository/UserReserveDataRepository.java

@@ -0,0 +1,7 @@
+package com.yscp.catchtable.domain.reserve.repository;
+
+import com.yscp.catchtable.domain.reserve.entity.UserReserveData;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface UserReserveDataRepository extends JpaRepository<UserReserveData, Long> {
+}

src/main/java/com/yscp/catchtable/domain/user/entity/User.java

@@ -5,6 +5,7 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -31,6 +32,7 @@ public class User {
 
     private LocalDateTime modDatetime;
 
+    @Builder
     public User(Long idx, String email, String password, String phone, String nickname, LocalDateTime regDatetime, LocalDateTime modDatetime) {
         this.idx = idx;
         this.email = email;

src/main/java/com/yscp/catchtable/exception/BadRequestError.java

@@ -11,7 +11,16 @@ public enum BadRequestError implements CustomError {
     /**
      * 0 ~ 100 Common
      */
-    NULL_EXCEPTION("%s", "1", true);
+    NULL_EXCEPTION("%s", "1", true),
+    INVALID_RESERVE_PAY_TYPE("지불 방식이 잘못됐습니다.", "2", false),
+
+    /**
+     * 101 ~ 200 예약
+     */
+    EXPIRED_TICKET("예약 가능 시간을 초과하였습니다. \n 다시 예약 요청을 진행 해주세요.", "101", false),
+    STORE_RESERVATION_MAX("모든 예약이 완료된 상태입니다. \n 다음에 이용해주세요.", "102", false),
+    ALREADY_RESERVE("현재 예약 요청을 진행할 수 없습니다. \n 다시 요청해주세요.", "103", false),
+    ;
 
     private final HttpStatus httpStatus = HttpStatus.BAD_REQUEST;
     private final String message;