Skip to content

Refactor: 예약 목록 조회시 관리자 조회 차별화 #298

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

Merged
gitseoyeon merged 2 commits into from
Nov 7, 2024
Merged

Refactor: 예약 목록 조회시 관리자 조회 차별화 #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
488c455
Refactor: getGroupReservation 메소드 수정
gitseoyeon Nov 6, 2024
22ca452
Chore: 도커 빌드 명령 수정
gitseoyeon Nov 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
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run: test -f ./src/main/resources/application.properties && echo "File exists" || echo "File does not exist"

- name: docker image build
run: docker build -t ${{ secrets.DOCKER_USERNAME }}/openbook:latest .
run: docker build --build-arg DEPENDENCY=build/dependency -t ${{ secrets.DOCKER_USERNAME }}/openbook --platform linux/amd64 .

- name: docker login
uses: docker/login-action@v2
Expand Down
18 changes: 15 additions & 3 deletions src/main/java/com/openbook/openbook/service/booth/BoothReservationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public List<BoothReservationDto> getReservationsByBooth(long boothId){
if(!booth.getStatus().equals(BoothStatus.APPROVE)){
throw new OpenBookException(ErrorCode.BOOTH_NOT_APPROVED);
}
return getGroupReservation(boothId);
return getGroupReservation(boothId, false);
}

@Transactional
Expand All @@ -66,10 +66,10 @@ public List<BoothReservationDto> getAllManageReservations(Long userId, Long boot
if(!booth.getManager().getId().equals(userId)){
throw new OpenBookException(ErrorCode.FORBIDDEN_ACCESS);
}
return getGroupReservation(boothId);
return getGroupReservation(boothId, true);
}

private List<BoothReservationDto> getGroupReservation(Long boothId){
private List<BoothReservationDto> getGroupReservation(Long boothId, boolean isAdmin) {
List<BoothReservation> reservations = getBoothReservations(boothId);
Map<String, List<BoothReservation>> groupedByName = reservations.stream()
.collect(Collectors.groupingBy(BoothReservation::getName));
Expand All @@ -85,6 +85,18 @@ private List<BoothReservationDto> getGroupReservation(Long boothId){
List<BoothReservationDetailDto> details = dateEntry.getValue().stream()
.flatMap(reservation -> reservationDetailService
.getReservationDetails(reservation.getId()).stream())
.map(detail -> {
if (isAdmin) {
return detail;
} else {
return new BoothReservationDetailDto(
detail.id(),
detail.times(),
detail.status(),
null
);
}
})
.collect(Collectors.toList());

return BoothReservationDateDto.of(date, details);
Expand Down