From 67f84defda9279a242d67b7e9152b341b7ff2dd2 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Fri, 23 Aug 2024 14:56:59 +0900 Subject: [PATCH 1/4] =?UTF-8?q?chore=20:=20redirectUri=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../umc/ShowHoo/web/login/controller/LoginController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/umc/ShowHoo/web/login/controller/LoginController.java b/src/main/java/umc/ShowHoo/web/login/controller/LoginController.java index c83c039..09d34ff 100644 --- a/src/main/java/umc/ShowHoo/web/login/controller/LoginController.java +++ b/src/main/java/umc/ShowHoo/web/login/controller/LoginController.java @@ -37,10 +37,10 @@ public String logout(){ return "로그아웃"; } - @Value("https://66c81c7bad01400008a289e2--showhoo.netlify.app/login/oauth2/code/kakao") + @Value("https://66c82156b6d67800084f0db9--showhoo.netlify.app/login/oauth2/code/kakao") private String redirectUri; - @Value("https://66c81c7bad01400008a289e2--showhoo.netlify.app") + @Value("https://66c82156b6d67800084f0db9--showhoo.netlify.app") private String logout_redirectUri; @Value("${kakao.client.id}") From e7016a93b781477ec84088ae9a0f0fa0f2b57431 Mon Sep 17 00:00:00 2001 From: dldusgh318 <125371704+dldusgh318@users.noreply.github.com> Date: Fri, 23 Aug 2024 15:14:02 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[FEAT]=20=EC=A0=84=EC=B2=B4=20=EC=98=88?= =?UTF-8?q?=EB=A7=A4=EC=9E=90=20=EC=A1=B0=ED=9A=8C=20=20(#160)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [REFECTOR] 스웨거 설명 추가 * [FEAT] spaceApply, shows 일대일 연관관계 추가 * [FEAT] shows에 공연날짜, 디데이 관련 dto,converter 구현 (#124) * [FEAT]공연 준비 시, 공연날짜 공연디데이 관련 로직 (#124) * [FEAT]공연장 대여가 승인되지않은 경우 에러핸들링(#124) * [FIX] 코드 정리 (#124) * [FIX] 공연자 공연 준비 -공연 등록: rentalFile등록 시에 공연 id가 생성되므로, 공연 정보 set하는 방식으로 구현 (#124) * [FIX] 공연장 공연 준비 - rentalFile 등록 시, 공연id 생성 * [FIX] rentalFile 연관관계 수정 * [FIX] 공연 포스터 오류 수정 (#124) * [FIX] rentalFile spaceApply연관관계 삭제(이미 shows-spaceApply연관관계 있음) (#124) * [FEAT] 공연자 공연준비 - 예매자 예매 상태 넘기기 (#124) * [FIX] 공연장 공연준비 - 큐시트 작성API 엔드포인트 수정 (#124) * REFACTOR] 공연자 공연준비 - 큐시트 작성: spaceApplyId로 shows 큐시트파일 저장 (#124) * [REFACTOR] performerProfileId 수정(#124) * [REFACTOR] 공연자 공연준비 시 큐시트 폼 다운 엔드포인트 변경(#124) * 전체 예매자 조회 (#124) --- .../web/book/controller/BookAdminController.java | 11 +++++++++++ .../umc/ShowHoo/web/book/dto/BookResponseDTO.java | 1 - .../ShowHoo/web/book/service/BookAdminService.java | 10 ++++++++++ src/main/java/umc/ShowHoo/web/shows/entity/Shows.java | 1 + src/main/java/umc/ShowHoo/web/space/entity/Space.java | 2 -- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/main/java/umc/ShowHoo/web/book/controller/BookAdminController.java b/src/main/java/umc/ShowHoo/web/book/controller/BookAdminController.java index 32ad345..dad5d2e 100644 --- a/src/main/java/umc/ShowHoo/web/book/controller/BookAdminController.java +++ b/src/main/java/umc/ShowHoo/web/book/controller/BookAdminController.java @@ -20,6 +20,17 @@ public class BookAdminController { private final BookAdminService bookAdminService; @GetMapping("/{showId}/prepare/book-admin") + @Operation(summary = "공연자 - 공연 준비 시 전체 예매자 조회 API",description = "공연자가 공연 준비 시에 전체 예매자를 조회하기 위한 API") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "OK, 성공"), + }) + @Parameter(name = "showId",description = "공연 id") + public ApiResponse> getAllBookList(@PathVariable(name = "showId") Long showsId){ + List bookInfoList= bookAdminService.getAllBookList(showsId); + return ApiResponse.onSuccess(bookInfoList); + } + + @GetMapping("/{showId}/prepare/book-admin/detail") @Operation(summary = "공연자 - 공연 준비 시 예매자 관리 API",description = "공연자가 공연 준비 시에 예매자를 조회하기 위한 API") @ApiResponses({ @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "OK, 성공"), diff --git a/src/main/java/umc/ShowHoo/web/book/dto/BookResponseDTO.java b/src/main/java/umc/ShowHoo/web/book/dto/BookResponseDTO.java index d63f35a..84f75f4 100644 --- a/src/main/java/umc/ShowHoo/web/book/dto/BookResponseDTO.java +++ b/src/main/java/umc/ShowHoo/web/book/dto/BookResponseDTO.java @@ -36,7 +36,6 @@ public static class bookInfoDTO{ Integer ticketNum; String payment; BookDetail detail; - //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss", timezone = "Asia/Seoul") LocalDateTime dateTime; } diff --git a/src/main/java/umc/ShowHoo/web/book/service/BookAdminService.java b/src/main/java/umc/ShowHoo/web/book/service/BookAdminService.java index 938b458..02a7cbc 100644 --- a/src/main/java/umc/ShowHoo/web/book/service/BookAdminService.java +++ b/src/main/java/umc/ShowHoo/web/book/service/BookAdminService.java @@ -27,6 +27,16 @@ public class BookAdminService { private final BookRepository bookRepository; private final CancelBookRepository cancelBookRepository; + public List getAllBookList(Long showsId){ + Shows shows=showsRepository.findById(showsId) + .orElseThrow(()->new ShowsHandler(ErrorStatus.SHOW_NOT_FOUND)); + List bookList=bookRepository.findAllByShows(shows); + + return bookList.stream() + .map(BookConverter::toBookInfoDTO) + .collect(Collectors.toList()); + } + public List getBookInfoList(Long showsId, BookDetail detail){ Shows shows=showsRepository.findById(showsId) .orElseThrow(()->new ShowsHandler(ErrorStatus.SHOW_NOT_FOUND)); diff --git a/src/main/java/umc/ShowHoo/web/shows/entity/Shows.java b/src/main/java/umc/ShowHoo/web/shows/entity/Shows.java index 22317df..700e5e6 100644 --- a/src/main/java/umc/ShowHoo/web/shows/entity/Shows.java +++ b/src/main/java/umc/ShowHoo/web/shows/entity/Shows.java @@ -65,4 +65,5 @@ public class Shows { @OneToOne(mappedBy = "shows") private SpaceApply spaceApply; + } diff --git a/src/main/java/umc/ShowHoo/web/space/entity/Space.java b/src/main/java/umc/ShowHoo/web/space/entity/Space.java index 646ff05..7e8dfff 100644 --- a/src/main/java/umc/ShowHoo/web/space/entity/Space.java +++ b/src/main/java/umc/ShowHoo/web/space/entity/Space.java @@ -49,8 +49,6 @@ public class Space extends BaseEntity { private String bankName; //은행명 private String bankAccount; //계좌번호 private String bankOwner; //예금주 - private double latitude; - private double longitude; @Column(nullable = false) private String notice; // 유의사항 private Double grade; // 평점 From 9d350e21f5c482528b1f98cda9accc75af73fda0 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Fri, 23 Aug 2024 15:24:43 +0900 Subject: [PATCH 3/4] =?UTF-8?q?chore=20:=20=EC=9C=84=EB=8F=84=20=EA=B2=BD?= =?UTF-8?q?=EB=8F=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/umc/ShowHoo/web/space/entity/Space.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/umc/ShowHoo/web/space/entity/Space.java b/src/main/java/umc/ShowHoo/web/space/entity/Space.java index 7e8dfff..646ff05 100644 --- a/src/main/java/umc/ShowHoo/web/space/entity/Space.java +++ b/src/main/java/umc/ShowHoo/web/space/entity/Space.java @@ -49,6 +49,8 @@ public class Space extends BaseEntity { private String bankName; //은행명 private String bankAccount; //계좌번호 private String bankOwner; //예금주 + private double latitude; + private double longitude; @Column(nullable = false) private String notice; // 유의사항 private Double grade; // 평점 From 68d247856c2315aaab73216937a44f694ee1148a Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Fri, 23 Aug 2024 16:03:15 +0900 Subject: [PATCH 4/4] =?UTF-8?q?chore=20:=20redirectUri=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../umc/ShowHoo/web/login/controller/LoginController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/umc/ShowHoo/web/login/controller/LoginController.java b/src/main/java/umc/ShowHoo/web/login/controller/LoginController.java index 09d34ff..5c68beb 100644 --- a/src/main/java/umc/ShowHoo/web/login/controller/LoginController.java +++ b/src/main/java/umc/ShowHoo/web/login/controller/LoginController.java @@ -37,10 +37,10 @@ public String logout(){ return "로그아웃"; } - @Value("https://66c82156b6d67800084f0db9--showhoo.netlify.app/login/oauth2/code/kakao") + @Value("https://66c82eac6cbdbb00089ce5c5--showhoo.netlify.app/login/oauth2/code/kakao") private String redirectUri; - @Value("https://66c82156b6d67800084f0db9--showhoo.netlify.app") + @Value("https://66c82eac6cbdbb00089ce5c5--showhoo.netlify.app") private String logout_redirectUri; @Value("${kakao.client.id}")