Merge remote-tracking branch 'origin/develop' into develop

Likelion-YeungNam-Univ · Aug 2, 2024 · 2c558fe · 2c558fe
2 parents 6feec6f + 23e85ad
commit 2c558fe
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 6 deletions.
diff --git a/src/main/java/gible/domain/post/api/PostApi.java b/src/main/java/gible/domain/post/api/PostApi.java
@@ -38,6 +38,20 @@ public interface PostApi {
     ResponseEntity<?> savePost(@Valid @RequestBody PostReq postReq,
                                @AuthenticationPrincipal SecurityUserDetails userDetails);
 
+    @Operation(summary = "사용자 정보 불러오기", description = "사용자의 정보를 불러오기 위한 API")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "사용자 정보 불러오기 성공",
+                    content = @Content(mediaType = "application/json", examples = {
+                            @ExampleObject(value = """
+                                        {
+                                            "name": "홍길동",
+                                            "phoneNumber": "010-1234-5678"
+                                        }
+                                    """)
+                    })
+            )
+    })
+    ResponseEntity<?> getUserInfo(@AuthenticationPrincipal SecurityUserDetails userDetails);
 
     @Operation(summary = "게시글 리스트 가져오기", description = "게시글 리스트를 조회하기 위한 API")
     @ApiResponses({

diff --git a/src/main/java/gible/domain/post/controller/PostController.java b/src/main/java/gible/domain/post/controller/PostController.java
@@ -4,6 +4,7 @@
 import gible.domain.post.dto.PostReq;
 import gible.domain.post.service.PostService;
 import gible.domain.security.common.SecurityUserDetails;
+import gible.domain.user.service.UserService;
 import gible.global.common.response.SuccessRes;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -22,6 +23,7 @@
 @RestController
 public class PostController implements PostApi {
 
+    private final UserService userService;
     private final PostService postService;
 
     /* 게시글 업로드 */
@@ -34,6 +36,14 @@ public ResponseEntity<?> savePost(@Valid @RequestBody PostReq postReq,
         return ResponseEntity.status(HttpStatus.CREATED).body(SuccessRes.from("게시글 업로드 완료."));
     }
 
+    /* 게시글에 필요한 정보 불러오기 */
+    @Override
+    @GetMapping("/user-info")
+    public ResponseEntity<?> getUserInfo(@AuthenticationPrincipal SecurityUserDetails userDetails) {
+
+        return ResponseEntity.ok().body(userService.getUserInfo(userDetails.getId()));
+    }
+
     /* 게시글 목록 조회 + 검색 조회 */
     @Override
     @GetMapping

diff --git a/src/main/java/gible/domain/user/dto/UserInfoRes.java b/src/main/java/gible/domain/user/dto/UserInfoRes.java
@@ -0,0 +1,10 @@
+package gible.domain.user.dto;
+
+public record UserInfoRes(
+        String name,
+        String phoneNumber
+) {
+    public static UserInfoRes of(final String name, final String phoneNumber) {
+        return new UserInfoRes(name, phoneNumber);
+    }
+}
diff --git a/src/main/java/gible/domain/user/service/UserService.java b/src/main/java/gible/domain/user/service/UserService.java
@@ -2,6 +2,7 @@
 
 import gible.domain.user.dto.MyPageRes;
 import gible.domain.user.dto.SignUpReq;
+import gible.domain.user.dto.UserInfoRes;
 import gible.domain.user.entity.User;
 import gible.domain.user.repository.UserRepository;
 import gible.exception.CustomException;
@@ -33,12 +34,11 @@ public MyPageRes getMyPage(UUID userId) {
         return MyPageRes.of(user.getEmail(), user.getNickname());
     }
 
-//    @Transactional(readOnly = true)
-//    public List<EventSummaryRes> getParticipationEvents(UUID userId) {
-//        return participateRepository.findByUser_Id(userId)
-//                .stream().map(Participate::getEvent).toList()
-//                .stream().map(EventSummaryRes::fromEntity).toList();
-//    }
+    @Transactional
+    public UserInfoRes getUserInfo(UUID userId) {
+        User user = findById(userId);
+        return UserInfoRes.of(user.getName(), user.getPhoneNumber());
+    }
 
     @Transactional
     public void deleteById(UUID userId) {