From 83244c5ea3c4953b0dbdf855008c565302024805 Mon Sep 17 00:00:00 2001 From: Sejin Park <95167215+sejineer@users.noreply.github.com> Date: Sun, 10 Mar 2024 21:39:33 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=98=88=EC=95=BD=20=EB=93=B1=EB=A1=9D?= =?UTF-8?q?=20=EC=8B=9C=20Receiver=ED=95=9C=ED=85=8C=20=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=ED=86=A1=20=EA=B0=80=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(#293)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 알림톡 기능 구현 / 예약등록 알림톡 적용 * feat: 예약 확정 알림톡 적용 * feat: 예약 확정 + 초대장 알림톡 적용 * feat: 예약 취소 알림톡 구현 * feat: 예약 취소 알림톡 구현 * fix: 예약 확정 로직 수정 * feat: 예약 변경 알림톡 적용 * fix: 예약 등록 알림톡 오류 수정 * fix: 예약 등록 알림톡 수신자 sender로 설정 --- .../application/ReservationManipulationServiceImpl.java | 2 +- .../reservation/domain/repository/ReservationRepository.java | 1 - .../com/shallwe/global/infrastructure/sms/NaverSmsClient.java | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) 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 7f55e0ef..9c1aea0a 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 3590b8ad..e34b4640 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 80354293..76f4b344 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" +