Merge pull request #167 from GTable/fix#166-fix-NonUniqueResultException

fix(Reservation): NonUniqueResultException 문제 해결

Author: Jjiggu

nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/reservation/service/ReservationService.java

@@ -94,6 +94,7 @@ public List<WaitingUserResponse> getAllWaitingUserDetails(Long storeId) {
 		List<ZSetOperations.TypedTuple<String>> waitingList = waitingRedisRepository.getAllWaitingWithScore(storeId);
 		System.out.println(waitingList);
 
+		// TODO N + 1 발생 -> 개선 필요
 		return waitingList.stream()
 			.map(tuple -> {
 				String userId = tuple.getValue();
@@ -109,7 +110,7 @@ public List<WaitingUserResponse> getAllWaitingUserDetails(Long storeId) {
 				String reservationId = String.valueOf(
 					ThreadLocalRandom.current().nextInt(1, 100));
 
-				Optional<Reservation> reservationOpt = reservationRepository.findByStore_StoreIdAndUserIdAndRequestedAtBetween(
+				Optional<Reservation> reservationOpt = reservationRepository.findFirstByStore_StoreIdAndUserIdAndRequestedAtBetweenOrderByRequestedAtDesc(
 					storeId, Long.valueOf(userId), LocalDate.now().atStartOfDay(), LocalDate.now().atTime(LocalTime.MAX));
 				if (reservationOpt.isPresent()) {
 					Reservation reservation = reservationOpt.get();

nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/reservation/repository/ReservationRepository.java

@@ -22,6 +22,9 @@ public interface ReservationRepository extends JpaRepository<Reservation, Long>
 	Optional<Reservation> findByStore_StoreIdAndUserIdAndRequestedAtBetween(
 		Long storeId, Long userId, LocalDateTime start, LocalDateTime end);
 
+	Optional<Reservation> findFirstByStore_StoreIdAndUserIdAndRequestedAtBetweenOrderByRequestedAtDesc(
+		Long storeId, Long userId, LocalDateTime start, LocalDateTime end);
+
 	List<Reservation> findAllByStore_StoreIdAndStatusInAndRequestedAtBetween(
 		Long storeId, List<ReservationStatus> statuses, LocalDateTime start, LocalDateTime end);
 	Optional<Reservation> findByStore_StoreIdAndUserIdAndStatusInAndRequestedAtBetween(