Feature: 화면 구현에 필요한 API를 추가 구현한다. (#128)

src/docs/asciidoc/index.adoc

@@ -51,6 +51,16 @@ operation::user-performance-controller-test/get-performances[snippets='http-requ
 
 operation::user-performance-controller-test/get-performances[snippets='http-response,response-fields']
 
+== 공연 상세 조회
+
+=== request
+
+operation::user-performance-controller-test/get-performance[snippets='http-request']
+
+=== response
+
+operation::user-performance-controller-test/get-performance[snippets='http-response,response-fields']
+
 = 좌석(Seat)
 
 == 관리자 좌석 등급 생성 API
@@ -124,6 +134,12 @@ operation::ticket-controller-test/select-my-tickets[snippets='http-request,reque
 === response
 operation::ticket-controller-test/select-my-tickets[snippets='http-response,response-fields']
 
+== 좌석 점유 해제
+operation::ticket-controller-test/release-seat[snippets='http-request,request-headers']
+
+=== response
+operation::ticket-controller-test/release-seat[snippets='http-response']
+
 = 대기열(WaitingSystem)
 
 == 남은 순번 조회

src/main/java/com/thirdparty/ticketing/domain/common/ErrorCode.java

@@ -46,8 +46,8 @@ public enum ErrorCode {
        Seat Error
     */
     NOT_FOUND_SEAT(HttpStatus.NOT_FOUND, "S404-1", "존재하지 않는 좌석입니다."),
-    NOT_SELECTABLE_SEAT(HttpStatus.FORBIDDEN, "S403-1", "이미 선택된 좌석입니다."),
-    INVALID_SEAT_STATUS(HttpStatus.FORBIDDEN, "S403-2", "해당 좌석에는 접근할 수 없습니다."),
+    NOT_SELECTABLE_SEAT(HttpStatus.CONFLICT, "S409-1", "이미 선택된 좌석입니다."),
+    INVALID_SEAT_STATUS(HttpStatus.CONFLICT, "S409-2", "해당 좌석에는 접근할 수 없습니다."),
 
     /*
        Payment Error

src/main/java/com/thirdparty/ticketing/domain/performance/controller/UserPerformanceController.java

@@ -2,6 +2,7 @@
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -22,4 +23,10 @@ public class UserPerformanceController {
     public ResponseEntity<ItemResult<PerformanceElement>> getPerformances() {
         return ResponseEntity.ok(userPerformanceService.getPerformances());
     }
+
+    @GetMapping("/{performanceId}")
+    public ResponseEntity<PerformanceElement> getPerformance(
+            @PathVariable("performanceId") long performanceId) {
+        return ResponseEntity.ok(userPerformanceService.getPerformance(performanceId));
+    }
 }

src/main/java/com/thirdparty/ticketing/domain/performance/service/UserPerformanceService.java

@@ -1,8 +1,11 @@
 package com.thirdparty.ticketing.domain.performance.service;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.thirdparty.ticketing.domain.ItemResult;
+import com.thirdparty.ticketing.domain.common.ErrorCode;
+import com.thirdparty.ticketing.domain.common.TicketingException;
 import com.thirdparty.ticketing.domain.performance.dto.PerformanceElement;
 import com.thirdparty.ticketing.domain.performance.repository.PerformanceRepository;
 
@@ -14,8 +17,18 @@ public class UserPerformanceService {
 
     private final PerformanceRepository performanceRepository;
 
+    @Transactional(readOnly = true)
     public ItemResult<PerformanceElement> getPerformances() {
         return ItemResult.of(
                 performanceRepository.findAll().stream().map(PerformanceElement::of).toList());
     }
+
+    @Transactional(readOnly = true)
+    public PerformanceElement getPerformance(long performanceId) {
+
+        return performanceRepository
+                .findById(performanceId)
+                .map(PerformanceElement::of)
+                .orElseThrow(() -> new TicketingException(ErrorCode.NOT_FOUND_PERFORMANCE));
+    }
 }

src/main/java/com/thirdparty/ticketing/domain/seat/Seat.java

@@ -82,6 +82,13 @@ public void markAsPaid() {
     }
 
     public boolean isAssignedByMember(Member loginMember) {
-        return loginMember.equals(member);
+        return loginMember.getMemberId().equals(member.getMemberId());
+    }
+
+    public void releaseSeat(Member loginMember) {
+        if (!seatStatus.isSelected() || !isAssignedByMember(loginMember)) {
+            return;
+        }
+        this.seatStatus = SeatStatus.SELECTABLE;
     }
 }

src/main/java/com/thirdparty/ticketing/domain/seat/repository/SeatRepository.java

@@ -19,15 +19,15 @@
 public interface SeatRepository extends JpaRepository<Seat, Long> {
     List<Seat> findByZone(Zone zone);
 
-    @Query("SELECT s FROM Seat as s WHERE s.id = :seatId")
+    @Query("SELECT s FROM Seat as s WHERE s.seatId = :seatId")
     @Lock(LockModeType.NONE)
     Optional<Seat> findById(@Param("seatId") Long seatId);
 
-    @Query("SELECT s FROM Seat as s WHERE s.id = :seatId")
+    @Query("SELECT s FROM Seat as s WHERE s.seatId = :seatId")
     @Lock(LockModeType.OPTIMISTIC)
     Optional<Seat> findByIdWithOptimistic(@Param("seatId") Long seatId);
 
-    @Query("SELECT s FROM Seat as s WHERE s.id = :seatId")
+    @Query("SELECT s FROM Seat as s WHERE s.seatId = :seatId")
     @Lock(LockModeType.PESSIMISTIC_WRITE)
     Optional<Seat> findByIdWithPessimistic(@Param("seatId") Long seatId);
 

src/main/java/com/thirdparty/ticketing/domain/ticket/Ticket.java

@@ -8,13 +8,11 @@
 import com.thirdparty.ticketing.domain.member.Member;
 import com.thirdparty.ticketing.domain.seat.Seat;
 
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 @Getter
 @Entity
+@Builder
 @AllArgsConstructor
 @Table(name = "ticket")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

src/main/java/com/thirdparty/ticketing/domain/ticket/controller/TicketController.java

@@ -33,6 +33,14 @@ public ResponseEntity<ItemResult<TicketElement>> selectMyTickets(
         return ResponseEntity.ok().body(tickets);
     }
 
+    @PostMapping("/seats/release")
+    public ResponseEntity<Void> releaseSeat(
+            @LoginMember String memberEmail,
+            @RequestBody @Valid SeatSelectionRequest seatSelectionRequest) {
+        reservationService.releaseSeat(memberEmail, seatSelectionRequest);
+        return ResponseEntity.ok().build();
+    }
+
     @PostMapping("/seats/select")
     public ResponseEntity<Void> selectSeat(
             @LoginMember String memberEmail,

src/main/java/com/thirdparty/ticketing/domain/ticket/dto/response/TicketElement.java

@@ -2,15 +2,26 @@
 
 import java.util.UUID;
 
+import com.thirdparty.ticketing.domain.performance.Performance;
+import com.thirdparty.ticketing.domain.performance.dto.PerformanceElement;
+import com.thirdparty.ticketing.domain.seat.Seat;
 import com.thirdparty.ticketing.domain.ticket.Ticket;
 
 import lombok.Data;
 
 @Data
 public class TicketElement {
     private final UUID serialNumber;
+    private final PerformanceElement performance;
+    private final TicketSeatDetail seat;
 
     public static TicketElement of(Ticket ticket) {
-        return new TicketElement(ticket.getTicketSerialNumber());
+        Seat seat = ticket.getSeat();
+        Performance performance = seat.getZone().getPerformance();
+
+        return new TicketElement(
+                ticket.getTicketSerialNumber(),
+                PerformanceElement.of(performance),
+                TicketSeatDetail.of(seat));
     }
 }

src/main/java/com/thirdparty/ticketing/domain/ticket/dto/response/TicketSeatDetail.java

@@ -0,0 +1,18 @@
+package com.thirdparty.ticketing.domain.ticket.dto.response;
+
+import com.thirdparty.ticketing.domain.seat.Seat;
+import com.thirdparty.ticketing.domain.seat.dto.response.SeatGradeElement;
+
+import lombok.Data;
+
+@Data
+public class TicketSeatDetail {
+    private final long seatId;
+    private final String seatCode;
+    private final SeatGradeElement grade;
+
+    public static TicketSeatDetail of(Seat seat) {
+        return new TicketSeatDetail(
+                seat.getSeatId(), seat.getSeatCode(), SeatGradeElement.of(seat.getSeatGrade()));
+    }
+}

src/main/java/com/thirdparty/ticketing/domain/ticket/repository/TicketRepository.java

@@ -3,10 +3,23 @@
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import com.thirdparty.ticketing.domain.member.Member;
 import com.thirdparty.ticketing.domain.ticket.Ticket;
 
+import io.lettuce.core.dynamic.annotation.Param;
+
 public interface TicketRepository extends JpaRepository<Ticket, Integer> {
-    List<Ticket> findAllByMember(Member member);
+    @Query(
+            """
+            SELECT t FROM Ticket t
+                        JOIN FETCH t.member m
+                        JOIN FETCH t.seat s
+                        JOIN FETCH s.seatGrade sg
+                        JOIN FETCH s.zone z
+                        JOIN FETCH z.performance p
+                        WHERE t.member = :member
+            """)
+    List<Ticket> findAllByMember(@Param("member") Member member);
 }

src/main/java/com/thirdparty/ticketing/domain/ticket/service/ReservationManager.java

@@ -0,0 +1,27 @@
+package com.thirdparty.ticketing.domain.ticket.service;
+
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.thirdparty.ticketing.domain.common.ErrorCode;
+import com.thirdparty.ticketing.domain.common.TicketingException;
+import com.thirdparty.ticketing.domain.member.Member;
+import com.thirdparty.ticketing.domain.seat.Seat;
+import com.thirdparty.ticketing.domain.seat.repository.SeatRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class ReservationManager {
+    private final SeatRepository seatRepository;
+
+    @Transactional
+    public void releaseSeat(Member loginMember, long seatId) {
+        Seat seat =
+                seatRepository
+                        .findById(seatId)
+                        .orElseThrow(() -> new TicketingException(ErrorCode.NOT_FOUND_SEAT));
+        seat.releaseSeat(loginMember);
+    }
+}

src/main/java/com/thirdparty/ticketing/domain/ticket/service/ReservationService.java

@@ -7,4 +7,6 @@ public interface ReservationService {
     void selectSeat(String memberEmail, SeatSelectionRequest seatSelectionRequest);
 
     void reservationTicket(String memberEmail, TicketPaymentRequest ticketPaymentRequest);
+
+    void releaseSeat(String memberEmail, SeatSelectionRequest seatSelectionRequest);
 }

src/main/java/com/thirdparty/ticketing/domain/ticket/service/ReservationTransactionService.java

@@ -1,5 +1,11 @@
 package com.thirdparty.ticketing.domain.ticket.service;
 
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.thirdparty.ticketing.domain.common.ErrorCode;
@@ -10,9 +16,11 @@
 import com.thirdparty.ticketing.domain.payment.PaymentProcessor;
 import com.thirdparty.ticketing.domain.payment.dto.PaymentRequest;
 import com.thirdparty.ticketing.domain.seat.Seat;
+import com.thirdparty.ticketing.domain.ticket.Ticket;
 import com.thirdparty.ticketing.domain.ticket.dto.event.PaymentEvent;
 import com.thirdparty.ticketing.domain.ticket.dto.request.SeatSelectionRequest;
 import com.thirdparty.ticketing.domain.ticket.dto.request.TicketPaymentRequest;
+import com.thirdparty.ticketing.domain.ticket.repository.TicketRepository;
 import com.thirdparty.ticketing.domain.ticket.service.strategy.LockSeatStrategy;
 
 import lombok.RequiredArgsConstructor;
@@ -21,11 +29,18 @@
 @Slf4j
 @RequiredArgsConstructor
 public class ReservationTransactionService implements ReservationService {
+    private final TicketRepository ticketRepository;
     private final MemberRepository memberRepository;
     private final PaymentProcessor paymentProcessor;
     private final LockSeatStrategy lockSeatStrategy;
     private final EventPublisher eventPublisher;
 
+    private final ReservationManager reservationManager;
+    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(5);
+
+    @Value("${ticketing.reservation.release-delay-seconds}")
+    private int reservationReleaseDelay;
+
     @Override
     @Transactional
     public void selectSeat(String memberEmail, SeatSelectionRequest seatSelectionRequest) {
@@ -42,6 +57,21 @@ public void selectSeat(String memberEmail, SeatSelectionRequest seatSelectionReq
                         .orElseThrow(() -> new TicketingException(ErrorCode.NOT_FOUND_MEMBER));
 
         seat.assignByMember(member);
+        scheduler.schedule(
+                () -> reservationManager.releaseSeat(member, seatId),
+                reservationReleaseDelay,
+                TimeUnit.SECONDS);
+    }
+
+    @Override
+    @Transactional
+    public void releaseSeat(String memberEmail, SeatSelectionRequest seatSelectionRequest) {
+        Member member =
+                memberRepository
+                        .findByEmail(memberEmail)
+                        .orElseThrow(() -> new TicketingException(ErrorCode.NOT_FOUND_MEMBER));
+
+        reservationManager.releaseSeat(member, seatSelectionRequest.getSeatId());
     }
 
     @Override
@@ -60,12 +90,21 @@ public void reservationTicket(String memberEmail, TicketPaymentRequest ticketPay
 
         processPayment(seat, loginMember);
 
-        if (seat.isAssignedByMember(loginMember)) {
-            throw new TicketingException(ErrorCode.NOT_SELECTABLE_SEAT);
-        }
+        Ticket ticket =
+                Ticket.builder()
+                        .ticketSerialNumber(UUID.randomUUID())
+                        .seat(seat)
+                        .member(loginMember)
+                        .build();
+
+        ticketRepository.save(ticket);
     }
 
     private void processPayment(Seat seat, Member loginMember) {
+        if (!seat.isAssignedByMember(loginMember)) {
+            throw new TicketingException(ErrorCode.NOT_SELECTABLE_SEAT);
+        }
+
         seat.markAsPendingPayment();
         paymentProcessor.processPayment(new PaymentRequest());
         seat.markAsPaid();

src/main/java/com/thirdparty/ticketing/domain/ticket/service/proxy/LettuceReservationServiceProxy.java

@@ -52,4 +52,9 @@ public void reservationTicket(String memberEmail, TicketPaymentRequest ticketPay
                         reservationTransactionService.reservationTicket(
                                 memberEmail, ticketPaymentRequest));
     }
+
+    @Override
+    public void releaseSeat(String memberEmail, SeatSelectionRequest seatSelectionRequest) {
+        reservationTransactionService.releaseSeat(memberEmail, seatSelectionRequest);
+    }
 }

src/main/java/com/thirdparty/ticketing/domain/ticket/service/proxy/OptimisticReservationServiceProxy.java

@@ -23,7 +23,7 @@ public void selectSeat(String memberEmail, SeatSelectionRequest seatSelectionReq
             reservationTransactionService.selectSeat(memberEmail, seatSelectionRequest);
         } catch (OptimisticLockingFailureException | StaleObjectStateException e) {
             log.error(e.getMessage(), e);
-            throw new TicketingException(ErrorCode.INTERNAL_SERVER_ERROR);
+            throw new TicketingException(ErrorCode.NOT_SELECTABLE_SEAT);
         }
     }
 
@@ -33,7 +33,12 @@ public void reservationTicket(String memberEmail, TicketPaymentRequest ticketPay
             reservationTransactionService.reservationTicket(memberEmail, ticketPaymentRequest);
         } catch (OptimisticLockingFailureException | StaleObjectStateException e) {
             log.error(e.getMessage(), e);
-            throw new TicketingException(ErrorCode.INTERNAL_SERVER_ERROR);
+            throw new TicketingException(ErrorCode.NOT_SELECTABLE_SEAT);
         }
     }
+
+    @Override
+    public void releaseSeat(String memberEmail, SeatSelectionRequest seatSelectionRequest) {
+        reservationTransactionService.releaseSeat(memberEmail, seatSelectionRequest);
+    }
 }