Skip to content

Commit

Permalink
fix: 예약 등록 시 Receiver한테 알림톡 가는 현상 수정 (#293)
Browse files Browse the repository at this point in the history
* feat: 알림톡 기능 구현 / 예약등록 알림톡 적용

* feat: 예약 확정 알림톡 적용

* feat: 예약 확정 + 초대장 알림톡 적용

* feat: 예약 취소 알림톡 구현

* feat: 예약 취소 알림톡 구현

* fix: 예약 확정 로직 수정

* feat: 예약 변경 알림톡 적용

* fix: 예약 등록 알림톡 오류 수정

* fix: 예약 등록 알림톡 수신자 sender로 설정
  • Loading branch information
sejineer authored Mar 10, 2024
1 parent f32deed commit 83244c5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public interface ReservationRepository extends JpaRepository<Reservation, Long>,

Optional<List<Reservation>> 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<Reservation> findByDateAndTimeAndExperienceGiftWithPessimisticLock(@Param("date") LocalDate date, @Param("time") LocalTime time, @Param("experienceGift") ExperienceGift experienceGift);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -130,7 +130,7 @@ public void sendApply(User receiver, ExperienceGift experienceGift, Reservation

List<MessageMapping> messages = new ArrayList<>();
messages.add(MessageMapping.builder()
.to(receiver.getPhoneNumber())
.to(sender.getPhoneNumber())
.content("[셸위]\n" +
"예약이 접수되었습니다\n" +
"아래 계좌로 입금이 확인되면 예약확정과 함께 초대장이 발송됩니다\n" +
Expand Down

0 comments on commit 83244c5

Please sign in to comment.