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.

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

[REFACTOR] 코드리뷰 #113

Open
wants to merge 420 commits into
base: main
Choose a base branch
from
Open
Changes from 65 commits
Commits
Show all changes
420 commits
Select commit Hold shift + click to select a range
489b514
Merge pull request #45 from UMC-ShowHoo/feature/#39
hyoinkang Aug 2, 2024
dbd4cac
Merge pull request #50 from UMC-ShowHoo/feature/#46
hyoinkang Aug 2, 2024
34b55f2
feat: 공연장 사진 등록 api 구현
qormoon Aug 2, 2024
0c9c0ab
refactor: 공연장 등록 시 공연장 사진 String으로 받아 저장 #53
qormoon Aug 2, 2024
f659966
refactor: 공연장 등록 시 계좌번호 추가 #53
qormoon Aug 2, 2024
dbb9da1
feat: 성수기 대관료 엔티티 생성 #53
qormoon Aug 2, 2024
abfbfe5
[FIX] dev pull (#34)
dldusgh318 Aug 2, 2024
90ced02
[Feat] 공연자/공연장 - 대관 양식, 대관 서류 업로드/다운로드 API 구현 (#34)
dldusgh318 Aug 2, 2024
9b1b004
[FIX] dev pull (#34)
dldusgh318 Aug 2, 2024
8e6deae
Merge pull request #54 from UMC-ShowHoo/feature/#34
dldusgh318 Aug 2, 2024
a7a1430
feat: 공연장 등록 시 성수기 대관료 저장할 수 있게 추가 #53
qormoon Aug 2, 2024
09dd95c
feat: 휴무일 엔티티 생성 #53
qormoon Aug 2, 2024
7525742
feat: 공연장 등록에 휴무일 추가 #53
qormoon Aug 2, 2024
71fd8bd
fix: db 중복 저장 오류 해결 #53
qormoon Aug 2, 2024
aa38b66
feat: 대관 수락 및 거절
hyesuhan Aug 2, 2024
bd4e4f5
Revert "feat 대관 api"
hyesuhan Aug 2, 2024
5a9b634
Merge remote-tracking branch 'origin/dev' into dev
hyesuhan Aug 2, 2024
3951688
refeactor: 가격 조회 api 수정 #53
qormoon Aug 3, 2024
e546fdd
feat: 성수기일 때 가격 변화 #53
qormoon Aug 3, 2024
d2b45ab
[MODIFY] Book 테이블 결제금액 추가 (#34)
dldusgh318 Aug 3, 2024
1b9af41
Merge pull request #55 from UMC-ShowHoo/feature/#34
dldusgh318 Aug 3, 2024
83b313e
feature : 공연 게시글 조회 API 시그니처 작성
hyoinkang Aug 3, 2024
e917cb5
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
hyoinkang Aug 3, 2024
ceb529f
feat: 대관신청하기 결제하기 api 구현 #53
qormoon Aug 3, 2024
2998952
chore: 대관신청하기 api 설명 추가 #53
qormoon Aug 3, 2024
c768134
feature : 공연 게시글 조회 API 서비스 로직 작성
hyoinkang Aug 3, 2024
c7e911e
Merge pull request #57 from UMC-ShowHoo/feature/#53
qormoon Aug 3, 2024
0047551
feature : 공연 게시글 조회 API + 찜 여부 조회 로직 작성
hyoinkang Aug 3, 2024
5991723
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
hyoinkang Aug 3, 2024
a40e2f7
[FEAT] 공연자 - 공연 준비: 예매자 관리 API 구현 (#56)
dldusgh318 Aug 3, 2024
781ac14
feat: 공연자 프로필 이미지 업로드 api 구현 #58
qormoon Aug 3, 2024
eb73ee8
refactor: 공연자 프로필 등록 api 사진 url로 받게 수정 #58
qormoon Aug 3, 2024
702df22
refactor: 프로필 이미지 수정 시 추가한 이미지 url 반환 #58
qormoon Aug 3, 2024
864d47b
feat: notification 엔티티 생성 #48
ujiiin Aug 3, 2024
a547b71
feat: notification member 매핑 #48
ujiiin Aug 3, 2024
a6a41a0
feat: performer, spaceUser, audience 에러핸들러 및 repo 추가 매핑 #48
ujiiin Aug 3, 2024
21d7843
feat: member, performerProfile 핸들러 추가 및 errorStatus 수정 #48
ujiiin Aug 3, 2024
85299a1
feat: 알림 생성, 삭제, 조회 API 구현 #48
ujiiin Aug 3, 2024
178b5ec
feat: 리뷰 이미지 업로드 api 구현 #58
qormoon Aug 3, 2024
1b9707f
feat: 대관 신청시 공연장에게 알림 #48
ujiiin Aug 3, 2024
b84dc91
refactor: 리뷰 작성하기 api 사진 부분 수정 #58
qormoon Aug 3, 2024
750fbdc
refactor: 대관 신청시 공연장에게 알림 #48
ujiiin Aug 3, 2024
4acfd8e
Merge pull request #64 from UMC-ShowHoo/feature/#58
qormoon Aug 3, 2024
adc057c
feat: notification handler 작성 #48
ujiiin Aug 3, 2024
6ed5d98
feat: 공연장 리뷰 작성시 공연장에게 알림 #48
ujiiin Aug 3, 2024
f17a773
feat: 공연장 리뷰 댓글 작성시 performer에게 알림 #48
ujiiin Aug 3, 2024
efb0362
feat: 공연 수락시 관람자에게 알림 #48
ujiiin Aug 3, 2024
d283038
Merge branch 'dev' into feature/#48
ujiiin Aug 3, 2024
692121d
Merge pull request #65 from UMC-ShowHoo/feature/#48
ujiiin Aug 3, 2024
d2f68ee
feature : 카카오 연결 끊기 기능 구현
hyoinkang Aug 4, 2024
1071e83
[FIX] 공연자 - 공연준비 : 공연 정보 등록 API 멀티파트 수정 (#66)
dldusgh318 Aug 4, 2024
32c35d3
[FIX] 공연자 - 공연준비 페이지 swagger responses 수정 (#66)
dldusgh318 Aug 4, 2024
e5a224b
[FIX] 공연자 - 공연준비 예매자 관리 pull (#66)
dldusgh318 Aug 4, 2024
4aae625
[FIX] 공연자/공연장 - 공연준비: 큐시트 작성 페이지 swagger responses 수정(#66)
dldusgh318 Aug 4, 2024
cb6b374
[MODIFY] 공연자 공연준비: shows 테이블의 공연 설명 삭제 (#68)
dldusgh318 Aug 4, 2024
0930b56
[MODIFY] 공연자 공연준비: 공연 설명 테이블(ShowsDescription) 설계(#68)
dldusgh318 Aug 4, 2024
59acee9
[MODIFY] 공연자 공연준비: 공연 설명 API 구현(#68)
dldusgh318 Aug 4, 2024
700ab08
fix: 공연 정보 작성 및 요청 사항
hyesuhan Aug 4, 2024
1357282
Merge pull request #59 from UMC-ShowHoo/feature/#51
hyoinkang Aug 4, 2024
a02bb0a
Merge pull request #63 from UMC-ShowHoo/feature/#56
hyoinkang Aug 4, 2024
dacb5e7
Merge pull request #67 from UMC-ShowHoo/feature/#66
hyoinkang Aug 4, 2024
a77a6c1
Merge pull request #69 from UMC-ShowHoo/feature/#68
hyoinkang Aug 4, 2024
1d0b78f
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
hyoinkang Aug 4, 2024
5b4023b
[FIX] dev 병합 오류 수정중 (#68)
dldusgh318 Aug 4, 2024
583c936
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
dldusgh318 Aug 4, 2024
ab22c27
fix : 에러 해결
hyoinkang Aug 4, 2024
02b5fa0
Merge pull request #72 from UMC-ShowHoo/feature/#60
hyoinkang Aug 4, 2024
76a9b75
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
hyoinkang Aug 4, 2024
c68e26b
feat: 공연자 마이페이지 조회 API 구현 #31
ujiiin Aug 4, 2024
df87d99
feat: 찜한 공연장 조회 API 구현 #31
ujiiin Aug 4, 2024
c5ed4d1
feat: 공연장 유저 마이페이지 API 구현 #31
ujiiin Aug 4, 2024
05362e5
Merge pull request #74 from UMC-ShowHoo/feature/#31
ujiiin Aug 4, 2024
a86a0fe
modify : 티켓 가격 정보 추가
hyoinkang Aug 4, 2024
b24a0e3
feature : 공연 티켓 매진 validator 구현
hyoinkang Aug 4, 2024
13d556c
modify : Shows 엔티티 연관관계 수정 (Performer -> PerformerProfile) 및 관련 오류 해결
hyoinkang Aug 4, 2024
ebf79f6
Merge pull request #77 from UMC-ShowHoo/modify/#73
hyoinkang Aug 4, 2024
9baabb5
feature : 예매 상태 업데이트 스케줄러 작성
hyoinkang Aug 5, 2024
1ce01b4
ci: application-prod 8081 포트 설정 #31
ujiiin Aug 5, 2024
2179bfa
refactor: capacity값이 없을 경우 0으로 처리 #71
ujiiin Aug 5, 2024
492cef3
refactor: review가 작성될 때 grade 업데이트 #71
ujiiin Aug 5, 2024
8532e01
Merge pull request #80 from UMC-ShowHoo/refactor/#71
ujiiin Aug 5, 2024
3d5c3b8
feat: 공연자 알림 - 공연 취소 되었을 때, 대관 취소 되었을 때 추가 #71
ujiiin Aug 5, 2024
12aa6e0
fix: merge 및 에러 해결 #36
ujiiin Aug 5, 2024
17a7b7a
Merge pull request #70 from UMC-ShowHoo/feature#36
ujiiin Aug 5, 2024
584ae0e
Revert "대관 거절 수락 관련 API"
ujiiin Aug 5, 2024
dd917f5
Merge pull request #82 from UMC-ShowHoo/revert-70-feature#36
ujiiin Aug 5, 2024
b87111e
feat: 대관 승인 API 복구 #83
ujiiin Aug 5, 2024
b308a37
Merge pull request #84 from UMC-ShowHoo/feature/#83
ujiiin Aug 5, 2024
2fd1464
[FIX] dev pull해옴 (#68)
dldusgh318 Aug 5, 2024
e0f1136
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
ujiiin Aug 5, 2024
3b95168
Merge pull request #78 from UMC-ShowHoo/modify/#75
qormoon Aug 5, 2024
a98f029
[FIX] 멀티파트, 글 동시 post 할 때 생기는 오류 수정 (#68)
dldusgh318 Aug 5, 2024
0ed08ce
Merge pull request #79 from UMC-ShowHoo/feature/#76
qormoon Aug 5, 2024
6ae3cf8
[FIX] dev pull (#68)
dldusgh318 Aug 5, 2024
51635d0
Merge pull request #85 from UMC-ShowHoo/feature/#68
dldusgh318 Aug 5, 2024
5265582
feat: 대관 승인 알림 #83
ujiiin Aug 5, 2024
8a7593a
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
ujiiin Aug 5, 2024
801a44f
feat: 알림에서 perfomerProfile name 가져오도록 변경 #83
ujiiin Aug 5, 2024
322f37f
feature : 카카오계정과 함께 로그아웃
hyoinkang Aug 5, 2024
3908ed5
Merge pull request #86 from UMC-ShowHoo/feature/#81
ujiiin Aug 5, 2024
9d339bd
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
hyoinkang Aug 5, 2024
7d329af
feat: 알림 개수 조회 API 구현 #87
ujiiin Aug 5, 2024
142510b
Merge pull request #88 from UMC-ShowHoo/feature/#61
hyoinkang Aug 5, 2024
1abfe04
Merge remote-tracking branch 'origin/dev' into dev
ujiiin Aug 5, 2024
055e141
Merge branch 'dev' into feature/#62
hyoinkang Aug 5, 2024
eaaa4a9
Merge pull request #90 from UMC-ShowHoo/feature/#62
hyoinkang Aug 5, 2024
e5f0d52
feat: 공연장 목록 조회 비로그인 사용자 구분 #89
ujiiin Aug 5, 2024
8a22625
Merge pull request #92 from UMC-ShowHoo/feature/#89
ujiiin Aug 5, 2024
fa2e1d0
[FIX] dev pull (#68)
dldusgh318 Aug 5, 2024
4a9c9bc
[FIX] rentalFile에 show테이블 연결 수정 (#68)
dldusgh318 Aug 5, 2024
72507ab
feature : DB delete
hyoinkang Aug 5, 2024
12cd516
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
hyoinkang Aug 5, 2024
6dbdcbc
[FIX] dev merge (#68)
dldusgh318 Aug 5, 2024
ff35e89
feature : 취소 가능 여부 로직 구현
hyoinkang Aug 6, 2024
d3a4566
Merge pull request #93 from UMC-ShowHoo/feature/#91
hyoinkang Aug 6, 2024
7751ccb
Merge pull request #94 from UMC-ShowHoo/feature/#68
hyoinkang Aug 6, 2024
398d3eb
modify : 관람 완료 조회 API 취소 내역 조회 API로 변경
hyoinkang Aug 6, 2024
6a62ccd
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
hyoinkang Aug 6, 2024
8c0692a
Merge pull request #94 from UMC-ShowHoo/feature/#68
hyoinkang Aug 6, 2024
4c92577
[REFACTOR] 파일 구조 리팩터링
ujiiin Aug 6, 2024
03047ce
feat : Shows 엔티티 isComplete init
hyoinkang Aug 6, 2024
6a45c6a
Merge remote-tracking branch 'origin/dev' into dev
ujiiin Aug 6, 2024
9616ad2
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
hyoinkang Aug 6, 2024
4595b2f
refactor : isCancellable 실행 조건 추가
hyoinkang Aug 6, 2024
9862a46
[REFACTOR] space 엔티티 column nullable 설정 #96
ujiiin Aug 6, 2024
5429107
[REFACTOR] space 검색 필터링 API location 필터 수정 및 2개로 나눈 api 1개로 병합 #96
ujiiin Aug 6, 2024
9093417
[REFACTOR] spacePrefer 에러 핸들링 추가 #96
ujiiin Aug 6, 2024
dd3bb5c
Merge pull request #98 from UMC-ShowHoo/refactor/#96
ujiiin Aug 6, 2024
d997735
[FEAT] 공연자 공연준비 : 취소 기한 API 추가 (#99)
dldusgh318 Aug 7, 2024
29aed10
[MODIFY] 공연자 공연준비 : 포스터 s3 저장 (#101)
dldusgh318 Aug 7, 2024
fe82a89
Merge pull request #97 from UMC-ShowHoo/feature/#95
hyoinkang Aug 10, 2024
d464f18
[FIX] 공연장 전체 조회 오류 수정
ujiiin Aug 12, 2024
c61c790
fix : 카카오 로그인 CORS 에러 수정
hyoinkang Aug 12, 2024
755c0bc
[FIX] 에러 더블 체크 수정
ujiiin Aug 12, 2024
b7eb2d4
Merge pull request #107 from UMC-ShowHoo/fix/#105
hyoinkang Aug 12, 2024
58ccf42
fix : 카카오 로그인 redirect uri 수정
hyoinkang Aug 12, 2024
cf93d02
[FIX] rentalFIle 스웨거 오류 수정중 (#101)
dldusgh318 Aug 12, 2024
40867e1
[FIX] dev pull (#101)
dldusgh318 Aug 12, 2024
e2f48a1
[FIX] rentalFile 스웨거오류 수정 (#101)
dldusgh318 Aug 12, 2024
e59270b
Merge branch 'dev' into feature/#99
dldusgh318 Aug 12, 2024
2a669a5
Merge pull request #100 from UMC-ShowHoo/feature/#99
dldusgh318 Aug 12, 2024
7d925c4
Merge branch 'dev' into feature/#101
dldusgh318 Aug 12, 2024
87e79de
Merge pull request #103 from UMC-ShowHoo/feature/#101
dldusgh318 Aug 12, 2024
f357bde
[FEAT] 공연자의 공연장 찜 유무 조회 #111 (#112)
ujiiin Aug 13, 2024
9750766
chore: 프로필 조회 시 이름, 전화번호 추가
qormoon Aug 14, 2024
b32b9af
chore: 공연장 등록 시 공연장 유형 추가 #4
qormoon Aug 15, 2024
0cdc7fe
chore: 스웨거 설명 추가 #4
qormoon Aug 15, 2024
2a5c090
fix : 공연장 대관 불가능 날짜 조회 API (#108)
hyesuhan Aug 16, 2024
f5df0e2
Revert "fix : 공연장 대관 불가능 날짜 조회 API (#108)" (#114)
hyoinkang Aug 16, 2024
c0b59fe
refactor : 조회 API 수정 (#110)
hyoinkang Aug 16, 2024
d81c383
fix : ddl-auto update로 수정
hyoinkang Aug 17, 2024
a53f623
[FIX] 공연자 마이페이지 조회 한개만 조회되도록 수정
ujiiin Aug 17, 2024
468d88a
[FIX] performerProfileResponseDTO.profileDTO createdAt 추가
ujiiin Aug 17, 2024
564acc2
[FIX] BaseEntity create_at -> createAt 변경
ujiiin Aug 18, 2024
4eb00dd
[FEAT] 공연자 공연준비 - 포스터url 반환 API (#118) (#119)
dldusgh318 Aug 18, 2024
30e4975
fix: 대관 가능 날짜 확인 API
hyesuhan Aug 18, 2024
1ea22af
fix : 대관 가능 날싸 확인 API를 GETMAPPING (#121)
hyesuhan Aug 18, 2024
92a6140
Revert "fix : 대관 가능 날싸 확인 API를 GETMAPPING (#121)"
hyesuhan Aug 18, 2024
0c156ee
ifs: 대관 날짜 list오류 수정 (#123)
hyesuhan Aug 19, 2024
85c3384
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
hyesuhan Aug 19, 2024
4fa3706
공연장의 날짜별로 대관 내역 조회 API (#126)
hyesuhan Aug 19, 2024
2e1cf96
[REFACTOR] 코드리뷰 수정사항 (#125)
dldusgh318 Aug 19, 2024
50a49bf
feat : 멤버 정보 조회 API 구현 (#117)
hyoinkang Aug 19, 2024
fed674d
[feat]각 공연자 별 추가 장비 receipt & [fix]날짜로 대관 확인 시 performer poster과 타이틀 …
hyesuhan Aug 19, 2024
e35b6dc
[FIX] spaceApply 취소 거절 구분
ujiiin Aug 19, 2024
c00b0ec
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
ujiiin Aug 19, 2024
6e7c644
chore: 리뷰 엔티티 값 추가 #47
qormoon Aug 19, 2024
3b04b57
Revert "[feat]각 공연자 별 추가 장비 receipt & [fix]날짜로 대관 확인 시 performer post…
hyoinkang Aug 19, 2024
c67bc56
[fix] 공연장 영수증 API (#131)
hyesuhan Aug 20, 2024
3015aa6
[REFACTOR] 코드 리뷰 수정사항 #124 (#132)
dldusgh318 Aug 20, 2024
cd313df
feat: 리뷰 작성 시간, 멤버 이름과 이미지 저장 #47
qormoon Aug 20, 2024
ff64415
chore: 리뷰 답변 엔티티에 작성시간 추가 #47
qormoon Aug 20, 2024
824b894
feat: 리뷰 조회 api 반환값 추가 #47
qormoon Aug 20, 2024
1b4f8f6
feat: 리뷰 api 반환값 추가 #47
qormoon Aug 20, 2024
6e0dfee
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
qormoon Aug 20, 2024
ac0ecdf
chore: db 초기화
qormoon Aug 20, 2024
2c8bca4
chore: db update 변경
qormoon Aug 20, 2024
9b88020
[REFACTOR] 코드 리뷰 수정 사항 수정 (#134)
hyoinkang Aug 20, 2024
00ebc63
chore : authorization 수정
hyoinkang Aug 20, 2024
7c28211
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
hyoinkang Aug 20, 2024
07e4e48
[REFACTOR] 공연장 API 수정 (#136)
qormoon Aug 20, 2024
de9ec28
[FEAT] 공연 준비 - 입장 관리 API 구현 (#137)
hyoinkang Aug 20, 2024
6b21924
refactor : 공연 상세정보 조회 API response 수정
hyoinkang Aug 20, 2024
f430dd7
[FEAT] 공연 매진 여부 및 남은 티켓 조회 로직 추가 (#139)
hyoinkang Aug 20, 2024
d8b74c3
chore: 대관신청 시 spaceId로 변경 #133
qormoon Aug 21, 2024
e13381c
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
qormoon Aug 21, 2024
19a9add
Revert "Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-…
qormoon Aug 21, 2024
a2fcdb2
Reapply "Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo…
qormoon Aug 21, 2024
9bfaed9
[FEAT] 공연자 공연준비 - 예매자관리에서 예매자의 예매 상태 넘기기 (#124) (#141)
dldusgh318 Aug 21, 2024
6ebccd3
[FEAT] 찜 유무 조회 API에 spacePreferId 추가
ujiiin Aug 21, 2024
a7f443f
[FIX] 에러핸들링 수정
ujiiin Aug 21, 2024
4555316
chore: 토큰없이 api 접근 허용
qormoon Aug 21, 2024
21bda8f
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
qormoon Aug 21, 2024
89a5600
fix: 시큐리티 경로 매칭 수정
qormoon Aug 21, 2024
22ac8b2
[MODIFIY] 공연장 영수증 API - 날짜, 추가 서비스 (#143)
hyesuhan Aug 21, 2024
94d54ce
[MODIFIY] 공연장 수락 슈팅 문제 (#145)
hyesuhan Aug 21, 2024
e735f81
chore : shows - showsDsc cascade 설정
hyoinkang Aug 22, 2024
841f502
[FIX] Fatch error 수정 (#146)
hyesuhan Aug 22, 2024
3f11859
chore: 오류 주석 처리
qormoon Aug 22, 2024
db38d2a
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
qormoon Aug 22, 2024
1e42671
[FIX] 공연장 공연준비 - 큐시트 작성API 엔드포인트 수정 (#124) (#147)
dldusgh318 Aug 22, 2024
ba0d9ce
[MODIFY] 공연 조회 쿼리 변경 (#149)
hyoinkang Aug 22, 2024
919faf8
[FIX] deleteSpaceApply 에러 수정
ujiiin Aug 22, 2024
0485943
[FIX] createSpaceApply notification 에러 수정
ujiiin Aug 22, 2024
c9ca390
[FIX] 공연장 전체조회, 검색 API에서 preferred 제외, spaceId 추가
ujiiin Aug 22, 2024
4007686
[FIX] notification 오타 수정
ujiiin Aug 22, 2024
b3a9a36
chore : 공연게시글 검색 조회 엔드포인트 변경
hyoinkang Aug 22, 2024
6e14541
[FIX] spaceApply, shows 연관관계 수정
ujiiin Aug 22, 2024
beb423b
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
ujiiin Aug 22, 2024
5c17b54
[FIX] spacePrefer API swagger에 token 명시
ujiiin Aug 22, 2024
0f11678
[MODIFY] 공연게시글 조회 방식 변경 (#152)
hyoinkang Aug 22, 2024
d8d49eb
chore : 엔드포인트 수정
hyoinkang Aug 22, 2024
873c86a
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
ujiiin Aug 22, 2024
cd9da80
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
ujiiin Aug 22, 2024
66fa4d8
chore : /aud/search/* 토큰 없이 API 접근 허용
hyoinkang Aug 22, 2024
d7457f6
[FIX] spaceApply 삭제 오류 해결
ujiiin Aug 22, 2024
e97749d
[REFACTOR] 공연자 공연준비 - 큐시트 작성: spaceApplyId로 shows 큐시트파일 저장 (#124) (#153)
dldusgh318 Aug 22, 2024
827a897
[FIX] 대관 날짜로 공연장 확인 및 shows 확인 (#154)
hyesuhan Aug 22, 2024
9d7ed52
chore: space테이블에 위도 경도 추가
qormoon Aug 22, 2024
765de03
[FIX] shows-spaceApply cascade 수정, shows-rentalFile cascade 추가 (#155)
dldusgh318 Aug 22, 2024
186c890
Feature/#124 (#156)
dldusgh318 Aug 23, 2024
dc9c347
[FIX] spaceApply, shows 연관관계 수정
ujiiin Aug 23, 2024
fc185a8
[FIX] spaceApply service 수정
ujiiin Aug 23, 2024
6f1785b
[REFACTOR] 공연자 공연준비 시 큐시트 폼 다운 엔드포인트 변경(#124) (#157)
dldusgh318 Aug 23, 2024
c3c375e
chore: space테이블에 위도 경도 추가
qormoon Aug 23, 2024
de133c6
Revert "[FIX] spaceApply service 수정"
ujiiin Aug 23, 2024
f7f4217
Revert "[FIX] spaceApply, shows 연관관계 수정"
ujiiin Aug 23, 2024
27becea
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
ujiiin Aug 23, 2024
c980166
[FIX] spaceApply, shows 연관관계 수정
ujiiin Aug 23, 2024
69d5ab9
modify : 입장 관리 API 조회 방식 변경 (#159)
hyoinkang Aug 23, 2024
6b62c13
[FIX] DB create
ujiiin Aug 23, 2024
b58e53e
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
ujiiin Aug 23, 2024
0605df2
[FIX] DB update
ujiiin Aug 23, 2024
d2f6bf4
chore : redirectUri 변경
hyoinkang Aug 23, 2024
878160e
[FIX] yml 설정
ujiiin Aug 23, 2024
3c06c94
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
ujiiin Aug 23, 2024
a3e87e6
[FIX] yml 설정
ujiiin Aug 23, 2024
3cb9470
chore : redirectUri 변경
hyoinkang Aug 23, 2024
134df5d
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
hyoinkang Aug 23, 2024
a72633e
[ci] ci/cd오류
ujiiin Aug 23, 2024
a7c938d
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
ujiiin Aug 23, 2024
348c467
redirect-uri 변경
ujiiin Aug 23, 2024
67f84de
chore : redirectUri 변경
hyoinkang Aug 23, 2024
e7016a9
[FEAT] 전체 예매자 조회 (#160)
dldusgh318 Aug 23, 2024
9d350e2
chore : 위도 경도 추가
hyoinkang Aug 23, 2024
68d2478
chore : redirectUri 변경
hyoinkang Aug 23, 2024
0b9f712
[FIX] shows, spaceApply 연관관계 수정
ujiiin Aug 23, 2024
c5f469a
Merge branch 'dev' of https://github.com/UMC-ShowHoo/ShowHoo-Server i…
ujiiin Aug 23, 2024
f4a99b7
[FIX] shows, spaceApply 연관관계 수정
ujiiin Aug 23, 2024
380835c
[ifx] (#161)
hyesuhan Aug 23, 2024
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
Original file line number Diff line number Diff line change
@@ -19,15 +19,28 @@ public enum ErrorStatus implements BaseErrorCode {
//Exception 핸들링 테스트
TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "에러 핸들링 테스트"),

//MEMBER
MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER001", "member not found"),

//SPACE
SPACE_NOT_FOUND(HttpStatus.NOT_FOUND, "SPACE001", "Space not found"),

//SPACEUSER
SPACEUSER_NOT_FOUND(HttpStatus.NOT_FOUND, "SPACEUSER001", "SpaceUser not found"),

//AUDIENCE
AUDIENCE_NOT_FOUND(HttpStatus.NOT_FOUND, "AUDIENCE001", "Audience not found"),

//BOOK
BOOK_NOT_FOUND(HttpStatus.NOT_FOUND, "BOOK001", "Book not found"),
SHOW_ALREADY_SOLD_OUT(HttpStatus.BAD_REQUEST, "BOOK002", "Already sold out Shows"),

//PERFORMER
PERFORMER_NOT_FOUND(HttpStatus.NOT_FOUND, "PERFORMER001", "Performer not found"),

//PERFORMER PROFILE
PERFORMER_PROFILE_NOT_FOUND(HttpStatus.NOT_FOUND, "PERFORMER_PROFILE001", "Performer Profile not found"),

//SHOW
SHOW_NOT_FOUND(HttpStatus.NOT_FOUND,"SHOW001","Show not found"),

@@ -40,10 +53,16 @@ public enum ErrorStatus implements BaseErrorCode {
//SPACE_APPLY
SPACE_APPLY_NOT_FOUND(HttpStatus.NOT_FOUND, "SPACE_APPLY001", "SpaceApply not found"),

//SPACE_REVIEW
SPACE_REVIEW_PERMISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "SPACE_REVIEW001", "SpaceReviewPermission not found"),

//RENTALFILE
RENTALFILE_FORM_NOT_FOUND(HttpStatus.NOT_FOUND,"RENTALFILE_FORM001","RentalFile form not found"),

RENTALFILE_NOT_FOUND(HttpStatus.NOT_FOUND,"RENTALFILE001","RentalFile not found")
RENTALFILE_NOT_FOUND(HttpStatus.NOT_FOUND,"RENTALFILE001","RentalFile not found"),

//NOTIFICATION
NOTIFICATION_TYPE_NOT_FOUND(HttpStatus.NOT_FOUND,"NOTIFICATION001","정의되지 않은 notification type 입니다.")

;

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package umc.ShowHoo.apiPayload.exception.handler;

import umc.ShowHoo.apiPayload.code.BaseErrorCode;
import umc.ShowHoo.apiPayload.exception.GeneralException;

public class BookHandler extends GeneralException {

public BookHandler(BaseErrorCode errorCode) {
super(errorCode);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package umc.ShowHoo.web.Shows.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -10,33 +12,80 @@
import umc.ShowHoo.web.Shows.dto.ShowsRequestDTO;
import umc.ShowHoo.web.Shows.dto.ShowsResponseDTO;
import umc.ShowHoo.web.Shows.entity.Shows;
import umc.ShowHoo.web.Shows.repository.ShowsRepository;
import umc.ShowHoo.web.Shows.service.ShowsService;
import umc.ShowHoo.web.showsDescription.converter.ShowsDscConverter;
import umc.ShowHoo.web.showsDescription.dto.ShowsDscRequestDTO;
import umc.ShowHoo.web.showsDescription.dto.ShowsDscResponseDTO;
import umc.ShowHoo.web.showsDescription.entity.ShowsDescription;

@RestController
@RequiredArgsConstructor
public class ShowsController {
private final ShowsRepository showsRepository;
private final ShowsService showsService;

@PostMapping(value="/performer/{showId}/register",consumes = "multipart/form-data")
@Operation(summary = "공연자 공연 준비-요청사항, 공연 포스터/티켓 발행 api", description = "공연 포스터 및 정보 등록 시에 필요한 API")
@PostMapping(value="/{performerId}/{showId}/show-register",consumes = "multipart/form-data")
@Operation(summary = "공연자 공연 준비-공연 포스터 및 공연 정보 등록 api", description = "공연 포스터 및 정보 등록 시에 필요한 API")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공")
})
public ApiResponse<ShowsResponseDTO.ShowinfoDTO> createShow(
public ApiResponse<ShowsResponseDTO.postShowDTO> createShow(
@PathVariable Long showId,
@PathVariable Long performerId,
//@RequestBody ShowsRequestDTO showsRequestDTO,
@RequestPart ShowsRequestDTO showsRequestDTO,
@RequestBody ShowsRequestDTO.ShowInfoDTO showsRequestDTO,
@RequestPart(required = false) MultipartFile poster){

Shows shows= showsService.createShows(showsRequestDTO,poster);
Shows shows= showsService.createShows(showsRequestDTO,poster,performerId);
shows.setId(showId);

return ApiResponse.onSuccess(ShowsConverter.toPostShowDTO(shows));
}

@PostMapping(value="/{performerId}/{showId}/show-register/description",consumes = "multipart/form-data")
@Operation(summary = "공연자 공연 준비- 공연 설명 등록 API", description = "공연을 등록할 때 공연 설명을 작성하는 API")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공")
})
/* @Parameters({
@Parameter(name = "text",description = "등록하는 공연 설명의 텍스트"),
})*/
public ApiResponse<ShowsDscResponseDTO.PostDscDTO> createShowDsc(@PathVariable Long showId,
@RequestBody ShowsDscRequestDTO.DescriptionDTO descriptionDTO,
@RequestBody(required = false) MultipartFile img){
ShowsDescription showsDescription=showsService.createShowDsc(descriptionDTO,img,showId);

return ApiResponse.onSuccess(ShowsConverter.toShowsDTO(shows));
return ApiResponse.onSuccess(ShowsDscConverter.toPostDscDTO(showsDescription));
}

@PostMapping(value="/{performerId}/{showId}/ticket-register")
@Operation(summary = "공연자 공연 준비-티켓 발행 등록 api", description = "공연 은행정보, 티켓 등록 시에 필요한 API")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공")
})
public ApiResponse<ShowsResponseDTO.postShowDTO> createShowTicket(
@PathVariable Long showId,
@RequestBody ShowsRequestDTO.ticketInfoDTO ticketInfoDTO){

Shows shows=showsService.createShowsTicket(ticketInfoDTO,showId);

return ApiResponse.onSuccess(ShowsConverter.toPostShowDTO(shows));
}

@PostMapping(value="/{performerId}/{showId}/requirement-register")
@Operation(summary = "공연자 공연 준비-요청 사항 등록 api", description = "공연 요청사항 등록 시에 필요한 API")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공")
})
public ApiResponse<ShowsResponseDTO.postShowDTO> createShowReq(
@PathVariable Long showId,
@RequestBody ShowsRequestDTO.requirementDTO requirementDTO){

Shows shows=showsService.createShowsReq(requirementDTO,showId);

return ApiResponse.onSuccess(ShowsConverter.toPostShowDTO(shows));
}



@GetMapping("/space/{showId}/show-prepare")
@Operation(summary = "공연장 공연 준비- 요청사항",description = "공연장이 공연자의 요청사항을 확인할 때 필요한 API")
@@ -48,4 +97,6 @@ public ApiResponse<ShowsResponseDTO.ShowRequirementDTO> getShowRequirement(@Path
return ApiResponse.onSuccess(showRequirement);
}



}
33 changes: 24 additions & 9 deletions src/main/java/umc/ShowHoo/web/Shows/converter/ShowsConverter.java
Original file line number Diff line number Diff line change
@@ -6,32 +6,47 @@

public class ShowsConverter {

public static Shows toEntity(ShowsRequestDTO dto,String poster){
public static ShowsResponseDTO.postShowDTO toPostShowDTO(Shows shows){
return ShowsResponseDTO.postShowDTO.builder()
.showId(shows.getId())
.build();
}

public static Shows toShowInfo(ShowsRequestDTO.ShowInfoDTO dto, String poster){
return Shows.builder()
.requirement(dto.getRequirement())
.name(dto.getName())
.showAge(dto.getShowAge())
.date(dto.getDate())
.description(dto.getDescription())
.poster(poster)
.runningTime(dto.getRunningTime())
.time(dto.getTime())
.perMaxticket(dto.getPerMaxticket())
.ticketPrice(dto.getTicketPrice())
.bank(dto.getBank())
.accountHolder(dto.getAccountHolder())
.accountNum(dto.getAccountNum())
.build();
}

public static Shows toTicketInfo(ShowsRequestDTO.ticketInfoDTO dto,Shows shows){
shows.setBank(dto.getBank());
shows.setAccountHolder(dto.getAccountHolder());
shows.setAccountNum(dto.getAccountNum());
shows.setTicketNum(dto.getTicketNum());
shows.setTicketPrice(dto.getTicketPrice());
shows.setPerMaxticket(dto.getPerMaxticket());

return shows;
}

public static Shows toRequirement(ShowsRequestDTO.requirementDTO dto,Shows shows){
shows.setRequirement(dto.getRequirement());

return shows;
}


public static ShowsResponseDTO.ShowinfoDTO toShowsDTO(Shows shows) {
return ShowsResponseDTO.ShowinfoDTO.builder()
.shows_id(shows.getId())
.name(shows.getName())
.showAge(shows.getShowAge())
.date(shows.getDate())
.description(shows.getDescription())
.runningTime(shows.getRunningTime())
.time(shows.getTime())
.ticketPrice(shows.getTicketPrice())
55 changes: 37 additions & 18 deletions src/main/java/umc/ShowHoo/web/Shows/dto/ShowsRequestDTO.java
Original file line number Diff line number Diff line change
@@ -6,23 +6,42 @@
import lombok.NoArgsConstructor;


@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class ShowsRequestDTO {
private Long performerId;
private String requirement;
private String poster;
private String name;
private String description;
private String date;
private String time;
private String runningTime;
private Integer showAge;
private String bank;
private String accountHolder;
private String accountNum;
private String ticketPrice;
private Integer perMaxticket;

@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public static class ShowInfoDTO{
private Long performerId;
private String poster;
private String name;
private String date;
private String time;
private String runningTime;
private Integer showAge;
}


@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public static class ticketInfoDTO{
private String bank;
private String accountHolder;
private String accountNum;
private String ticketPrice;
private Integer ticketNum;
private Integer perMaxticket;
}

@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public static class requirementDTO {
private String requirement;
}

}
Original file line number Diff line number Diff line change
@@ -7,6 +7,14 @@

public class ShowsResponseDTO {

@Builder
@Getter
@NoArgsConstructor
@AllArgsConstructor
public static class postShowDTO{
Long showId;
}

@Builder
@Getter
@NoArgsConstructor
@@ -15,7 +23,6 @@ public static class ShowinfoDTO{
Long shows_id;
String poster;
String name;
String description;
String date;
String time;
String runningTime;
6 changes: 5 additions & 1 deletion src/main/java/umc/ShowHoo/web/Shows/entity/Shows.java
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import umc.ShowHoo.web.showsDescription.entity.ShowsDescription;
import umc.ShowHoo.web.showsPrefer.entity.ShowsPrefer;

import umc.ShowHoo.web.rentalFile.entity.RentalFile;
@@ -27,13 +28,13 @@ public class Shows {
private String requirement;
private String poster; //포스터 사진
private String name; //공연 이름
private String description;//공연 소개
private String date; //공연 날짜
private String time; //공연 시간
private String runningTime; //러닝 타임
private Integer showAge; //관람연령

private String ticketPrice; //티켓 가격
private Integer ticketNum; //티켓 발행 매수
private Integer perMaxticket; //티켓 인당 구매 제한
private String bank; //은행명
private String accountHolder; //예금주
@@ -52,4 +53,7 @@ public class Shows {

@OneToMany(mappedBy = "shows", cascade = CascadeType.ALL)
private List<ShowsPrefer> preferList;

@OneToOne(mappedBy = "shows")
private ShowsDescription showsDescription;
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package umc.ShowHoo.web.Shows.repository;


import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import umc.ShowHoo.web.Shows.entity.Shows;

@Repository
public interface ShowsRepository extends JpaRepository<Shows, Long> {
Page<Shows> findByNameContaining(String request, PageRequest pageRequest);
}
Loading