feat: admin 권한으로 유저 수정 기능 추가

SWYP-4rd-6 · May 28, 2024 · 3f58371 · 3f58371
1 parent e96fa7d
commit 3f58371
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/com/swygbro/trip/backend/domain/admin/controller/AdminCommandController.java b/src/main/java/com/swygbro/trip/backend/domain/admin/controller/AdminCommandController.java
@@ -12,6 +12,7 @@
 import com.swygbro.trip.backend.domain.review.dto.UpdateReviewRequest;
 import com.swygbro.trip.backend.domain.user.application.UserService;
 import com.swygbro.trip.backend.domain.user.domain.User;
+import com.swygbro.trip.backend.domain.user.dto.UpdateUserRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
@@ -32,6 +33,12 @@ public class AdminCommandController {
     private final ReservationService reservationService;
     private final ReviewService reviewService;
 
+    @PutMapping(value = "/users/{userId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public void updateUserByAdmin(@PathVariable Long userId,
+                                  @RequestPart @Valid UpdateUserRequest dto,
+                                  @RequestPart(required = false) MultipartFile imageFile) {
+        userService.updateUser(userId, dto, imageFile);
+    }
 
     @PostMapping(value = "/guideProducts", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public void createGuideProduct(String nickname,

diff --git a/src/main/java/com/swygbro/trip/backend/domain/user/domain/UserDaoImpl.java b/src/main/java/com/swygbro/trip/backend/domain/user/domain/UserDaoImpl.java
@@ -248,7 +248,7 @@ public Optional<UserInfoCard> getUserInfoCard(Long userId) {
                 .select(qReview.count(), qReview.rating.avg())
                 .from(qReview)
                 .where(qReview.reviewer.eq(user))
-                .groupBy(qUser)
+                .groupBy(qReview.reviewer)
                 .fetchFirst();
         long myReviewCount = 0;
         float myReviewRatingAvg = 0.0f;
@@ -262,6 +262,13 @@ public Optional<UserInfoCard> getUserInfoCard(Long userId) {
                 .email(user.getEmail())
                 .nickname(user.getNickname())
                 .profileImageUrl(user.getProfileImageUrl())
+                .nationality(user.getNationality())
+                .profile(user.getProfile())
+                .phone(user.getPhone())
+                .location(user.getLocation())
+                .birthdate(user.getBirthdate())
+                .signUpType(user.getSignUpType())
+                .languages(user.getUserLanguages().stream().map(UserLanguage::getLanguage).toList())
                 .guideProductCount(guideProductCount)
                 .guideProductReservationCount(guideProductReservationCount)
                 .guideProductReviewRatingAvg(guideProductReviewRatingAvg)