Refactor: getGroupReservation 메소드 수정

Project-OpenBook · Nov 6, 2024 · 488c455 · 488c455
1 parent 8302df6
commit 488c455
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/main/java/com/openbook/openbook/service/booth/BoothReservationService.java b/src/main/java/com/openbook/openbook/service/booth/BoothReservationService.java
@@ -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
@@ -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));
@@ -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);