diff --git a/src/main/java/com/shallwe/domain/reservation/application/ReservationManipulationServiceImpl.java b/src/main/java/com/shallwe/domain/reservation/application/ReservationManipulationServiceImpl.java index 7f55e0e..9c1aea0 100644 --- a/src/main/java/com/shallwe/domain/reservation/application/ReservationManipulationServiceImpl.java +++ b/src/main/java/com/shallwe/domain/reservation/application/ReservationManipulationServiceImpl.java @@ -81,7 +81,7 @@ public ReservationResponse addUserReservation(UserReservationCreate reservationR if (reservation.getReservationStatus().equals(WAITING)) { reservation.updateStatus(BOOKED); reservation.updateUserReservationRequest(reservationRequest, sender, receiver); - naverSmsClient.sendApply(receiver, experienceGift, reservation); + naverSmsClient.sendApply(sender, receiver, experienceGift, reservation); experienceGift.addReservationCount(); } else { throw new InvalidReservationException(); diff --git a/src/main/java/com/shallwe/domain/reservation/domain/repository/ReservationRepository.java b/src/main/java/com/shallwe/domain/reservation/domain/repository/ReservationRepository.java index 3590b8a..e34b464 100644 --- a/src/main/java/com/shallwe/domain/reservation/domain/repository/ReservationRepository.java +++ b/src/main/java/com/shallwe/domain/reservation/domain/repository/ReservationRepository.java @@ -37,7 +37,6 @@ public interface ReservationRepository extends JpaRepository, Optional> findAllByExperienceGiftAndDate(ExperienceGift experienceGift, LocalDate date); - @Lock(LockModeType.PESSIMISTIC_WRITE) @Query("select r from Reservation r where r.date = :date and r.time = :time and r.experienceGift=:experienceGift") Optional findByDateAndTimeAndExperienceGiftWithPessimisticLock(@Param("date") LocalDate date, @Param("time") LocalTime time, @Param("experienceGift") ExperienceGift experienceGift); diff --git a/src/main/java/com/shallwe/global/infrastructure/sms/NaverSmsClient.java b/src/main/java/com/shallwe/global/infrastructure/sms/NaverSmsClient.java index 8035429..76f4b34 100644 --- a/src/main/java/com/shallwe/global/infrastructure/sms/NaverSmsClient.java +++ b/src/main/java/com/shallwe/global/infrastructure/sms/NaverSmsClient.java @@ -103,7 +103,7 @@ public SmsResponseDto send(String receivePhoneNumber) throws Exception { .body(SmsResponseDto.class); } - public void sendApply(User receiver, ExperienceGift experienceGift, Reservation reservation) throws Exception { + public void sendApply(User sender, User receiver, ExperienceGift experienceGift, Reservation reservation) throws Exception { String timestamp = String.valueOf(System.currentTimeMillis()); String url = "/alimtalk/v2/services/" + BIZTALK_SERVICE_ID + "/messages"; String signature = makeSignature(timestamp, url); @@ -130,7 +130,7 @@ public void sendApply(User receiver, ExperienceGift experienceGift, Reservation List messages = new ArrayList<>(); messages.add(MessageMapping.builder() - .to(receiver.getPhoneNumber()) + .to(sender.getPhoneNumber()) .content("[셸위]\n" + "예약이 접수되었습니다\n" + "아래 계좌로 입금이 확인되면 예약확정과 함께 초대장이 발송됩니다\n" +