Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Feature] 비관적 락을 이용하여 동시성 제어 #101

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[Feature] 비관적 락을 이용하여 동시성 제어 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf38263
비관적 락 구현
yeGenieee Oct 30, 2023
00ee059
API 버그 수정 (LocalDateTime field에 대한 버그 수정)
yeGenieee Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/src/main/java/com/picketing/www/business/domain/reservation/ReservationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.springframework.stereotype.Component;

import com.picketing.www.business.domain.User;
import com.picketing.www.business.domain.show.seat.SeatGrade;
import com.picketing.www.presentation.dto.response.reservation.MakeReservationResponse;

@Component
Expand Down Expand Up @@ -35,4 +36,8 @@ public Reservation convertSeatToReservation(User user, ScheduledShowSeat showSea
.showSeat(showSeat)
.build();
}

public SeatGrade convertShowSeatGradeByReservation(Reservation reservation) {
return reservation.getShowSeat().getSeatGrade();
}
}
62 changes: 43 additions & 19 deletions app/src/main/java/com/picketing/www/business/service/reservation/ReservationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@

import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.IntStream;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.picketing.www.application.exception.CustomException;
import com.picketing.www.application.exception.ErrorCode;
Expand All @@ -21,9 +26,10 @@
import com.picketing.www.persistence.repository.reservation.ReservationRepository;
import com.picketing.www.presentation.dto.request.reservation.ReservationRequest;

import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
@RequiredArgsConstructor
public class ReservationService {
Expand All @@ -36,41 +42,59 @@ public class ReservationService {

private final ReservationFactory reservationFactory;

private final Logger logger = LoggerFactory.getLogger(ReservationService.class);

@Transactional
public List<Reservation> makeReservations(Show show, ReservationRequest request) {

User user = userService.get(request.userId());

LocalDateTime showTime = request.showTime();

List<ReservationSeatRequest> seats = request.seatGradeList();
List<ReservationSeatRequest> seats = request.reservationSeatRequests();

return makeReservations(user, show, showTime, seats);
return makeReservations(user, show, showTime, seats);
}

@Transactional
public List<Reservation> makeReservations(User user, Show show, LocalDateTime showTime, List<ReservationSeatRequest> seats ) {

if (!isBookable(show, showTime, seats)) {
throw new CustomException(ErrorCode.ALREADY_RESERVED);
}

List<Reservation> reservations = seats
.stream()
.flatMap(seatRequest -> makeReservationPerCount(user, show, showTime, seatRequest).stream())
.collect(Collectors.toList());
public List<Reservation> makeReservations(User user, Show show, LocalDateTime showTime,
List<ReservationSeatRequest> seats) {

// 예약 정보를 가지고 오고 -> 추가하는 과정에서 동시성 문제가 발생
List<List<Reservation>> reservationList = seats.stream()
.map(
seat -> reservationRepository.findByShowSeatWithPessimisticLock(
scheduledShowSeatService.getScheduledShowSeat(show, showTime, seat.seatGrade()))
).toList();

Map<SeatGrade, Integer> reservedSeatCountMap = new ConcurrentHashMap<>();
reservationList.forEach((reservation -> {
Reservation current = reservation.get(0);
SeatGrade currentSeat = reservationFactory.convertShowSeatGradeByReservation(current);
int reservedCount = reservation.size();
reservedSeatCountMap.put(currentSeat, reservedCount);
}));

if (!isBookable(reservedSeatCountMap, seats)) {
throw new CustomException(ErrorCode.ALREADY_RESERVED);
}

List<Reservation> reservations = seats
.stream()
.flatMap(seatRequest -> makeReservationPerCount(user, show, showTime, seatRequest).stream())
.collect(Collectors.toList());

return reservationRepository.saveAll(reservations);
return reservationRepository.saveAll(reservations);
}

private boolean isBookable(Show show, LocalDateTime showTime, List<ReservationSeatRequest> seatRequestList) {
private boolean isBookable(Map<SeatGrade, Integer> map, List<ReservationSeatRequest> seatRequestList) {
return seatRequestList.stream()
.allMatch(seatRequest -> {
SeatGrade currentSeatGrade = seatRequest.seatGrade();
long reservedCount = countReservationsByShowSeat(
scheduledShowSeatService.getScheduledShowSeat(show, showTime,
currentSeatGrade));
Integer purchaseCount = seatRequest.count();
Integer reservedCount = map.get(currentSeatGrade);

return ((currentSeatGrade.getCount() - reservedCount) - seatRequest.count()) >= 0;
return ((currentSeatGrade.getCount() - reservedCount) - purchaseCount >= 0);
});
}

Expand Down
16 changes: 16 additions & 0 deletions ...main/java/com/picketing/www/persistence/repository/reservation/ReservationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,31 @@
import java.util.List;

import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Lock;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.jpa.repository.QueryHints;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import com.picketing.www.business.domain.reservation.Reservation;
import com.picketing.www.business.domain.reservation.ScheduledShowSeat;

import jakarta.persistence.LockModeType;
import jakarta.persistence.QueryHint;

@Repository
public interface ReservationRepository extends JpaRepository<Reservation, Long> {

Long countReservationsByShowSeat(ScheduledShowSeat scheduledShowSeat);

List<Reservation> findAllByShowSeat(ScheduledShowSeat scheduledShowSeat);

// 예약 정보 조회 시 베타락을 건다
@Query(value = "select r from Reservation r where r.showSeat = :scheduledShowSeat")
@Lock(LockModeType.PESSIMISTIC_WRITE)
@QueryHints({
@QueryHint(name = "jakarta.persistence.lock.timeout", value = "1000")
})
List<Reservation> findByShowSeatWithPessimisticLock(
@Param("scheduledShowSeat") ScheduledShowSeat scheduledShowSeat);
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/picketing/www/presentation/controller/show/ShowController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public Page<ShowMainResponse> getShowListWithPagination(
public RemainingSeatsResponse getRemainingSeatCountsByShowAndTime(
@PathVariable Long showId,
@RequestParam(value = "showTime", required = true)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") LocalDateTime showTime
@DateTimeFormat(pattern = "yyyy-MM-ddTHH:mm") LocalDateTime showTime
) {
return seatGradeFactory.convertRemainingSeats(
showService.getRemainingSeats(showId, showTime)
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/com/picketing/www/presentation/dto/request/reservation/ReservationRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ public record ReservationRequest(
@Positive
Long userId,

@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern = "yyyy-MM-ddTHH:mm")
LocalDateTime showTime,
List<ReservationSeatRequest> seatGradeList
List<ReservationSeatRequest> reservationSeatRequests
) {

@Builder
Expand Down
Loading