diff --git a/src/main/java/cc/backend/admin/amateurShow/dto/AdminApprovalListResponseDTO.java b/src/main/java/cc/backend/admin/amateurShow/dto/AdminApprovalListResponseDTO.java index a76104a..0297e09 100644 --- a/src/main/java/cc/backend/admin/amateurShow/dto/AdminApprovalListResponseDTO.java +++ b/src/main/java/cc/backend/admin/amateurShow/dto/AdminApprovalListResponseDTO.java @@ -16,5 +16,5 @@ public class AdminApprovalListResponseDTO { private String email; private String phone; private String showName; - private String amateurShowStatus; + private String approvalStatus; } diff --git a/src/main/java/cc/backend/admin/amateurShow/service/AdminApprovalService.java b/src/main/java/cc/backend/admin/amateurShow/service/AdminApprovalService.java index eb3d436..be3dfe4 100644 --- a/src/main/java/cc/backend/admin/amateurShow/service/AdminApprovalService.java +++ b/src/main/java/cc/backend/admin/amateurShow/service/AdminApprovalService.java @@ -77,7 +77,7 @@ private AdminApprovalListResponseDTO toApprovalDto(AmateurShow show) { .email(registrant.getEmail()) .phone(registrant.getPhone()) .showName(show.getName()) - .amateurShowStatus(show.getStatus().name()) + .approvalStatus(show.getApprovalStatus().name()) .build(); } diff --git a/src/main/java/cc/backend/amateurShow/dto/AmateurShowResponseDTO.java b/src/main/java/cc/backend/amateurShow/dto/AmateurShowResponseDTO.java index 9a4fc22..f737fd2 100644 --- a/src/main/java/cc/backend/amateurShow/dto/AmateurShowResponseDTO.java +++ b/src/main/java/cc/backend/amateurShow/dto/AmateurShowResponseDTO.java @@ -118,5 +118,6 @@ public static class MyShowAmateurShowList { // 극장 공연 리스트 조회 private String schedule; private String posterImageUrl; private AmateurShowStatus status; + private String rejectReason; } } diff --git a/src/main/java/cc/backend/amateurShow/entity/AmateurShow.java b/src/main/java/cc/backend/amateurShow/entity/AmateurShow.java index a1d9f89..27736a7 100644 --- a/src/main/java/cc/backend/amateurShow/entity/AmateurShow.java +++ b/src/main/java/cc/backend/amateurShow/entity/AmateurShow.java @@ -159,9 +159,11 @@ public void reviseShowInfo(String hashtag, String summary, String account, Strin public void approve(){ this.approvalStatus = ApprovalStatus.APPROVED; + this.status = AmateurShowStatus.YET; } public void reject(String rejectReason){ this.approvalStatus = ApprovalStatus.REJECTED; + this.status = AmateurShowStatus.REJECT; this.rejectReason = rejectReason; } diff --git a/src/main/java/cc/backend/amateurShow/entity/AmateurShowStatus.java b/src/main/java/cc/backend/amateurShow/entity/AmateurShowStatus.java index eaa1197..cb144ba 100644 --- a/src/main/java/cc/backend/amateurShow/entity/AmateurShowStatus.java +++ b/src/main/java/cc/backend/amateurShow/entity/AmateurShowStatus.java @@ -3,5 +3,6 @@ public enum AmateurShowStatus { YET, // 지금 날짜가 공연 날짜 안에 없을 때 (아직 공연 예정) ONGOING, // 지금 날짜가 공연 날짜 안에 있을 때 (예매 진행 중) - ENDED; // 지금 날짜가 공연 날짜보다 지났을 때 (공연 종료됨) + ENDED, // 지금 날짜가 공연 날짜보다 지났을 때 (공연 종료됨) + REJECT; } diff --git a/src/main/java/cc/backend/amateurShow/service/amateurShowService/AmateurServiceImpl.java b/src/main/java/cc/backend/amateurShow/service/amateurShowService/AmateurServiceImpl.java index cbe0df8..f8e42f3 100644 --- a/src/main/java/cc/backend/amateurShow/service/amateurShowService/AmateurServiceImpl.java +++ b/src/main/java/cc/backend/amateurShow/service/amateurShowService/AmateurServiceImpl.java @@ -601,6 +601,7 @@ public Slice getMyAmateurShow(Long .schedule(schedule) .posterImageUrl(show.getPosterImageUrl()) .status(show.getStatus()) + .rejectReason(show.getRejectReason()) .build(); }); } diff --git a/src/main/java/cc/backend/ticket/controller/MemberTicketController.java b/src/main/java/cc/backend/ticket/controller/MemberTicketController.java index d6184f9..1fc0acc 100644 --- a/src/main/java/cc/backend/ticket/controller/MemberTicketController.java +++ b/src/main/java/cc/backend/ticket/controller/MemberTicketController.java @@ -28,7 +28,7 @@ public class MemberTicketController { private final MemberTicketService memberTicketService; - @GetMapping("{amateurShowId}/showSimple") + @GetMapping("/{amateurShowId}/showSimple") @Operation( summary = "소극장 공연 티켓 예매 - 공연 정보 간략 보기 API", description = "소극장 공연 티켓 예매 동안 보이는 모든 (화면 공연 사진, 공연 제목, 공연 장소)에 대해 나옵니다.", @@ -42,7 +42,7 @@ public ApiResponse getSimpleAmateurShow(@Parameter(name = return ApiResponse.onSuccess(memberTicketService.getSimpleAmateurShow(amateurShowId)); } - @GetMapping("{amateurShowId}/selectRound") + @GetMapping("/{amateurShowId}/selectRound") @Operation( summary = "소극장 공연 티켓 예매 첫화면 - 회차(날짜) 선택 API", description = "소극장 공연 티켓 예매 첫화면에서 공연 회차를 선택하기전 조회하는 기능입니다. 등록된 공연의 모든 회차가 조회 됩니다.", @@ -73,7 +73,7 @@ public ApiResponse> getAmateurRounds(@PathVariable Long amat return ApiResponse.onSuccess(memberTicketService.getRoundsList(member.getId(), amateurShowId)); } - @GetMapping("{amateurShowId}/selectTicket") + @GetMapping("/{amateurShowId}/selectTicket") @Operation( summary = "소극장 공연 티켓 예매 두번째 화면 - 티켓 종류 선택 API", description = "소극장 공연 티켓 예매 두번째화면에서 티켓 종류를 선택하기 전 조회하는 기능입니다. 등록된 공연의 모든 티켓이 조회됩니다.", @@ -102,7 +102,7 @@ public ApiResponse> getAmateurTicketList(@PathVariabl } - @PostMapping("{amateurShowId}/reserve") + @PostMapping("/{amateurShowId}/reserve") @Operation(summary = "소극장 공연 티켓 생성 API", description = "소극장 공연 티켓을 생성하는 기능입니다. 공연 회차, 인원, 티켓 종류를 선택해 생성합니다.", parameters = {