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

GTB-41 [feat] 관리자 페이지 주점 웨이팅 현황 API 구현 #38

Merged
merged 10 commits into from
Jul 7, 2024
Merged

GTB-41 [feat] 관리자 페이지 주점 웨이팅 현황 API 구현 #38

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5f9928f
[GTB-41] feat: 웨이팅 요청 dto 생성
rootTiket Jul 7, 2024
da6e284
[GTB-41] feat: 현재 웨이팅 목록 가져오는 로직 구현
rootTiket Jul 7, 2024
2c82b8b
[GTB-41] feat: 컨트롤러 생성
rootTiket Jul 7, 2024
b67d38a
[GTB-41] fix: 현장웨이팅이 있는 경우 동작하지 않은 현상 수정
rootTiket Jul 7, 2024
b78d167
[GTB-41] fix: 에외처리가 잘못되어있는 부분을 수정
rootTiket Jul 7, 2024
0731043
[GTB-41] refactor: uri 표기 변경
rootTiket Jul 7, 2024
79fe343
[GTB-41] refactor: 메서드 명 변경
rootTiket Jul 7, 2024
343e7c1
[GTB-41] refactor: getWaitings 인자를 수정
rootTiket Jul 7, 2024
ddb791e
[GTB-41] refactor: 스웨거 설정 누락된 부분을 수정
rootTiket Jul 7, 2024
d4af353
[GTB-41] refactor: pub을 가져오는 로직 단순화
rootTiket Jul 7, 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
3 changes: 2 additions & 1 deletion src/main/java/site/gachontable/gachontablebe/domain/admin/presentation/AdminController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public ResponseEntity<LoginResponse> login(@RequestBody LoginRequest request) {
public ResponseEntity<PubWaitingListResponse> getWaiting(@RequestHeader("Authorization") String authorizationHeader) {
Admin admin = adminRepository.findById(jwtProvider.getUserIdFromToken(authorizationHeader))
jwnnoh marked this conversation as resolved.
Show resolved Hide resolved
.orElseThrow(AdminNotFoundException::new);
return ResponseEntity.ok(getWaitings.excute(admin));
Pub pub = pubRepository.findByPubId(admin.getPub().getPubId()).orElseThrow(PubNotFoundException::new);
return ResponseEntity.ok(getWaitings.excute(pub));
}
}
3 changes: 1 addition & 2 deletions src/main/java/site/gachontable/gachontablebe/domain/waiting/usecase/GetWaitings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ public class GetWaitings {
private final WaitingRepository waitingRepository;
private final PubRepository pubRepository;

public PubWaitingListResponse excute(Admin admin) {
Pub pub = pubRepository.findByPubId(admin.getPub().getPubId()).orElseThrow(PubNotFoundException::new);
public PubWaitingListResponse excute(Pub pub) {
List<Waiting> waitings = waitingRepository.findAllByPubAndWaitingStatusOrWaitingStatusOrderByCreatedAtAsc(pub, Status.WAITING, Status.AVAILABLE);
return new PubWaitingListResponse(
waitings.size(),
Expand Down