Merge pull request #186 from Kek-i/feature/184-users-mypage

Kek-i · Mar 17, 2023 · 6ff9b71 · 6ff9b71
2 parents c06b35b + 6ea4075
commit 6ff9b71
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/main/java/com/codepatissier/keki/order/service/OrderService.java b/src/main/java/com/codepatissier/keki/order/service/OrderService.java
@@ -134,7 +134,7 @@ public GetOrderHistoryRes getOrderHistory(Long userIdx, GetOrderHistoryReq order
     }
 
     // 주문 상태 별 주문 수
-    private NumOfOrder getCountByOrderStatus(User user) throws BaseException{
+    public NumOfOrder getCountByOrderStatus(User user) throws BaseException{
         NumOfOrder numOfOrder = new NumOfOrder();
         if (getRoleByName(user.getRole()) == CUSTOMER) {
             numOfOrder.setOrderWaiting(orderRepository.countByUserAndOrderStatusEquals(user, ORDER_WAITING));

diff --git a/src/main/java/com/codepatissier/keki/user/dto/GetProfileRes.java b/src/main/java/com/codepatissier/keki/user/dto/GetProfileRes.java
@@ -1,7 +1,10 @@
 package com.codepatissier.keki.user.dto;
 
 
+import com.codepatissier.keki.order.dto.NumOfOrder;
+import com.codepatissier.keki.user.entity.User;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 
 @Data
@@ -10,11 +13,16 @@ public class GetProfileRes {
     private String email;
     private String nickname;
     private String profileImg;
+    private int orderWaiting;
+    private int progressing;
+    private int pickupWaiting;
 
-
-    public GetProfileRes(String email, String nickname, String profileImg) {
-        this.email = email;
-        this.nickname = nickname;
-        this.profileImg = profileImg;
+    public GetProfileRes(User user, NumOfOrder numOfOrder) {
+        this.email = user.getEmail();
+        this.nickname = user.getNickname();
+        this.profileImg = user.getProfileImg();
+        this.orderWaiting = numOfOrder.getOrderWaiting();
+        this.progressing = numOfOrder.getProgressing();
+        this.pickupWaiting = numOfOrder.getPickupWaiting();
     }
 }
diff --git a/src/main/java/com/codepatissier/keki/user/service/UserService.java b/src/main/java/com/codepatissier/keki/user/service/UserService.java
@@ -4,6 +4,8 @@
 import com.codepatissier.keki.common.BaseResponseStatus;
 import com.codepatissier.keki.common.Constant;
 import com.codepatissier.keki.common.Role;
+import com.codepatissier.keki.order.dto.NumOfOrder;
+import com.codepatissier.keki.order.service.OrderService;
 import com.codepatissier.keki.user.dto.*;
 import com.codepatissier.keki.user.entity.Provider;
 import com.codepatissier.keki.user.entity.User;
@@ -22,6 +24,7 @@
 public class UserService {
     private final UserRepository userRepository;
     private final AuthService authService;
+    private final OrderService orderService;
 
     // 로그인
     public PostUserRes login(String email, String provider) throws BaseException{
@@ -84,7 +87,9 @@ public void checkNickname(PostNicknameReq postNicknameReq) throws BaseException{
     public GetProfileRes getProfile() throws BaseException {
         Long userIdx = authService.getUserIdx();
         User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
-        return new GetProfileRes(user.getEmail(), user.getNickname(), user.getProfileImg());}
+        NumOfOrder numOfOrder = orderService.getCountByOrderStatus(user);
+        return new GetProfileRes(user, numOfOrder);
+    }
 
     // 구매자 프로필 수정
     @Transactional