Skip to content

Commit

Permalink
Merge pull request #24 from 9oormthon-univ/feature/review/#23
Browse files Browse the repository at this point in the history
배포를 위한 merge
  • Loading branch information
BinarySstar authored Nov 23, 2024
2 parents e38c39c + bf3616c commit 3de8694
Showing 1 changed file with 1 addition and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public class ReservationService {
private final ParkingRepository parkingRepository;
private final VehicleRepository vehicleRepository;
private final MemberRepository memberRepository;
private final KakaoPayService kakaoPayService;

@Transactional
public ReservationResponse reserve(String memberId, ReservationRequest request) {
Expand All @@ -54,22 +53,11 @@ public ReservationResponse reserve(String memberId, ReservationRequest request)
.reservationDate(request.reservationDate())
.startTime(request.startTime())
.endTime(request.endTime())
.reservationStatus(ReservationStatus.WAITING)
.reservationStatus(ReservationStatus.ACCEPTED)
.build();

reservationRepository.save(reservation);

// 카카오페이 결제 성공 시 예약 상태 변경
PayReadyResponse response = kakaoPayService.ready(reservation, totalFee);
if(response != null) {
reservation.setReservationStatus(ReservationStatus.ACCEPTED);
}
else {
reservation.setReservationStatus(ReservationStatus.CANCELED);
}

reservationRepository.save(reservation);

return ReservationResponse.builder()
.id(reservation.getId())
.parkingId(reservation.getParkingId())
Expand Down

0 comments on commit 3de8694

Please sign in to comment.