From d76d3946d809142d27151e8a6c6eb654dbaba78c Mon Sep 17 00:00:00 2001
From: JSoi <jsoiworks@gmail.com>
Date: Thu, 14 Jul 2022 01:58:31 +0900
Subject: [PATCH] =?UTF-8?q?#3,=20#18=20[Update]=20=EC=9C=A0=EC=A0=80=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20=EB=A6=AC=ED=8C=A9?=
 =?UTF-8?q?=ED=84=B0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/controller/UserInfoController.java   | 13 ++--
 .../user/dto/UserInfoResponseDto.java         | 65 +------------------
 .../user/service/UserInfoService.java         |  7 +-
 3 files changed, 11 insertions(+), 74 deletions(-)

diff --git a/src/main/java/com/mpnp/baechelin/user/controller/UserInfoController.java b/src/main/java/com/mpnp/baechelin/user/controller/UserInfoController.java
index 5e95bb9..0b0b342 100644
--- a/src/main/java/com/mpnp/baechelin/user/controller/UserInfoController.java
+++ b/src/main/java/com/mpnp/baechelin/user/controller/UserInfoController.java
@@ -2,10 +2,14 @@
 
 import com.mpnp.baechelin.user.dto.UserInfoResponseDto;
 import com.mpnp.baechelin.user.service.UserInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.User;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -16,11 +20,8 @@ public class UserInfoController {
     private final UserInfoService userInfoService;
 
     @GetMapping
-    // Security 추가 후 변경할 예정
-//    public ResponseEntity<UserInfoResponseDto> getUserInfo(@AuthenticationPrincipal User user) {
-    public ResponseEntity<UserInfoResponseDto> getUserInfo(@RequestParam Integer userId) {
-        log.warn("USERID {} " , userId);
-//        return new ResponseEntity<>(userInfoService.giveUserInfo(user), HttpStatus.OK);
-        return new ResponseEntity<>(userInfoService.giveUserInfo(userId), HttpStatus.OK);
+    @ApiOperation(value = "유저 정보를 반환합니다")
+    public ResponseEntity<UserInfoResponseDto> getUserInfo(@AuthenticationPrincipal User user) {
+        return new ResponseEntity<>(userInfoService.giveUserInfo(user.getUsername()), HttpStatus.OK);
     }
 }
diff --git a/src/main/java/com/mpnp/baechelin/user/dto/UserInfoResponseDto.java b/src/main/java/com/mpnp/baechelin/user/dto/UserInfoResponseDto.java
index 31e91ae..9729af2 100644
--- a/src/main/java/com/mpnp/baechelin/user/dto/UserInfoResponseDto.java
+++ b/src/main/java/com/mpnp/baechelin/user/dto/UserInfoResponseDto.java
@@ -16,72 +16,11 @@
 @NoArgsConstructor
 @Getter
 public class UserInfoResponseDto {
-    // User info
     private String name;
-    private List<ReviewResponseDto> reviewList;
-    private List<BookmarkFolderResponseDto> bookmarkFolderList;
+    private String email;
 
     public UserInfoResponseDto(User user) {
         this.name = user.getName();
-        this.reviewList = user.getReviewList().stream().map(ReviewResponseDto::new).collect(Collectors.toList());
-        this.bookmarkFolderList = user.getFolderList().stream().map(BookmarkFolderResponseDto::new).collect(Collectors.toList());
-        //folder
-
-    }
-
-    @Builder
-    @AllArgsConstructor
-    @NoArgsConstructor
-    @Getter
-    static class BookmarkFolderResponseDto {
-        private int userId;
-        private List<BookmarkResponseDto> folders; // 폴더 여러 개
-
-        public BookmarkFolderResponseDto(Folder folder) {
-            this.userId = folder.getUserId().getId();
-            this.folders = folder.getBookmarkList().stream().map(BookmarkResponseDto::new).collect(Collectors.toList());
-        }
+        this.email = user.getEmail();
     }
-
-    @Getter
-    @Setter
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    static class BookmarkResponseDto {
-        private int folderId;
-        private int storeId;
-
-        public BookmarkResponseDto(Bookmark bookmark){
-            this.folderId = bookmark.getFolderId().getId();
-            this.storeId = bookmark.getStoreId().getId();
-        }
-    }
-
-    @Builder
-    @AllArgsConstructor
-    @NoArgsConstructor
-    @Getter
-    static class ReviewResponseDto {
-        int id; // storeId
-        int review; // reviewId
-        Double point;
-
-        String comment;
-        String reviewImageUrl;
-
-
-        LocalDateTime createdAt;
-        LocalDateTime modifiedAt;
-
-        public ReviewResponseDto(Review review) {
-            this.id = review.getStoreId().getId();
-            this.review = review.getId();
-            this.point = review.getPoint();
-            this.comment = review.getReview();
-            this.reviewImageUrl = review.getReviewImageUrl();
-        }
-    }
-
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/mpnp/baechelin/user/service/UserInfoService.java b/src/main/java/com/mpnp/baechelin/user/service/UserInfoService.java
index 2642444..b8465a4 100644
--- a/src/main/java/com/mpnp/baechelin/user/service/UserInfoService.java
+++ b/src/main/java/com/mpnp/baechelin/user/service/UserInfoService.java
@@ -14,11 +14,8 @@
 public class UserInfoService {
     private final UserRepository userRepository;
 
-    // TODO Security 추가 후 변경할 예정
-    //    public UserInfoResponseDto giveUserInfo(User user){
-    public UserInfoResponseDto giveUserInfo(Integer userId) {
-        User targetUser = userRepository.findById(userId).orElseThrow(() -> new IllegalArgumentException("test - no user"));
+    public UserInfoResponseDto giveUserInfo(String socialId) {
+        User targetUser = userRepository.findBySocialId(socialId);
         return new UserInfoResponseDto(targetUser);
-//        return new UserInfoResponseDto(user);
     }
 }