Skip to content

Refoctor: admin 전용 메뉴 이름 추가 #262

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
Jjiggu merged 3 commits into from
Aug 8, 2025
Merged

Refoctor: admin 전용 메뉴 이름 추가 #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f73879
refactor(User): storeId 필드 추가
Jjiggu Aug 8, 2025
a07cbeb
refactor(Swagger): api 설명 수정
Jjiggu Aug 8, 2025
381a1da
refactor(Oder): 주문 내역 조회 시 관리자용 이름 노출되도록 변경
Jjiggu Aug 8, 2025
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 ...admin-api/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class OrderController {
private final OrderService orderService;

@GetMapping("/{storeId}")
@Operation(summary = "주점별 주문리스트 조회", description = "특정 주점에 대한 예약리스트 조회")
@Operation(summary = "주점별 주문 리스트 조회", description = "특정 주점에 대한 주문 리스트 조회")
@ApiResponse(responseCode = "200", description = "주문 리스트 조회")
public ResponseEntity<?> getOrderListByStoreId(@PathVariable Long storeId,
@AuthenticationPrincipal MemberDetails memberDetails) {
Expand Down
4 changes: 2 additions & 2 deletions ...t-app-admin-api/src/main/java/com/nowait/applicationadmin/order/dto/OrderResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ public static OrderResponseDto fromEntity(UserOrder userOrder) {
Map<String, MenuDetail> menuDetails = new LinkedHashMap<>();

for (OrderItem item : userOrder.getOrderItems()) {
String name = item.getMenu().getName();
String displayName = item.getMenu().getAdminDisplayName();
int quantity = item.getQuantity();
int price = item.getMenu().getPrice(); // 메뉴 단가

// 메뉴명이 중복되면 수량만 누적
// merge 람다함수 활용(해당 key가 있으면 수량 누적, 없으면 새로 생성)
menuDetails.merge(name,
menuDetails.merge(displayName,
new MenuDetail(quantity, price),
(oldVal, newVal) -> new MenuDetail(
oldVal.getQuantity() + newVal.getQuantity(),
Expand Down
3 changes: 3 additions & 0 deletions ...admin-api/src/main/java/com/nowait/applicationadmin/user/dto/ManagerLoginResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public class ManagerLoginResponseDto {
private String email;
@Schema(description = "닉네임", example = "무한이")
private String nickname;
@Schema(description = "주점 Id", example = "1")
private Long storeId;
@Schema(description = "JWT TOKEN", example = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxNCIsImVtYWlsIjoiYXBpZG9jQGVtYWlsLmNvbSIsInJvbGVzIjpbIk1FTUJFUiJdLCJleHAiOjE3MTIyMjQ5NzV9.SQKtyHmqn2NKzHy4BX7_IgBePO_svEtmz1xbO9ToMz8")
private String accessToken;

Expand All @@ -25,6 +27,7 @@ public static ManagerLoginResponseDto fromEntity(User user,String token) {
.userId(user.getId())
.email(user.getEmail())
.nickname(user.getNickname())
.storeId(user.getStoreId())
.accessToken(token)
.build();
}
Expand Down