Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 nowait-app-admin-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
implementation project(':nowait-domain:domain-admin-rdb')
implementation project(':nowait-domain:domain-core-rdb')
implementation project(':nowait-domain:domain-redis')
implementation project(":nowait-event")
implementation project(':nowait-event')

// Spring Boot Starter
implementation 'org.springframework.boot:spring-boot-starter-web'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,6 @@ private void validateDeleteAuthorization(User user, Long storeId) {
}
}

// private User getUser(MemberDetails memberDetails) {
// return userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new);
// }

private Menu getMenu(Long menuId) {
return menuRepository.findByIdAndDeletedFalse(menuId)
.orElseThrow(MenuNotFoundException::new);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,8 @@ public class OrderService {

@Transactional(readOnly = true)
public List<OrderResponseDto> findAllOrders(Long storeId, MemberDetails memberDetails) {
log.info("getUser 호출 전");
User user = memberDetails.getUser();
log.info("getUser 호출 완료");
storeRepository.findByStoreIdAndDeletedFalse(storeId).orElseThrow(StoreNotFoundException::new);
log.info("Store 조회 완료");

validateViewAuthorization(user, storeId);

Expand All @@ -63,7 +60,6 @@ public List<OrderResponseDto> findAllOrders(Long storeId, MemberDetails memberDe
.stream()
.map(OrderResponseDto::fromEntity)
.collect(Collectors.toList());
log.info("Order 조회 완료");
return order;
}

Expand Down Expand Up @@ -152,12 +148,4 @@ private void validateUpdateAuthorization(User user, Long storeId) {
throw new OrderUpdateUnauthorizedException();
}
}

// private User getUser(MemberDetails memberDetails) {
// if (memberDetails == null) {
// throw new OrderViewUnauthorizedException();
// }
// // findById로 Select 쿼리 나가는 것을 getReferenceById로 변경하여 방지
// return userRepository.getReferenceById(memberDetails.getId());
// }
}
Original file line number Diff line number Diff line change
Expand Up @@ -541,12 +541,5 @@ private void validateUpdateAuthorization(User user, Long storeId) {
throw new ReservationUpdateUnauthorizedException();
}
}

// private User getUser(MemberDetails memberDetails) {
// if (memberDetails == null) {
// throw new ReservationViewUnauthorizedException();
// }
// return userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new);
// }
}

Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,4 @@ private void validateUpdateAuthorization(User user, Long storeId) {
throw new StoreUpdateUnauthorizedException();
}
}

// private User getUser(MemberDetails memberDetails) {
// if (memberDetails == null) {
// throw new StoreViewUnauthorizedException();
// }
// return userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new);
// }
}
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@ public StorePaymentReadDto updateStorePayment(StorePaymentUpdateRequest request,
return StorePaymentReadDto.fromEntity(storePayment);
}

// private User getUser(MemberDetails memberDetails) {
// return userRepository.findById(memberDetails.getId()).orElseThrow(UserNotFoundException::new);
// }

private void validateViewAuthorization(User user, Long storeId) {
if (!(Role.SUPER_ADMIN.equals(user.getRole()) || user.getStoreId().equals(storeId))) {
throw new StorePaymentViewUnauthorizedException();
Expand Down