[Feat] 회원 조회 추가

jiyunio · Jun 17, 2024 · 379c852 · 379c852
1 parent fb5088d
commit 379c852
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/src/main/java/com/jiyunio/todolist/member/MemberController.java b/src/main/java/com/jiyunio/todolist/member/MemberController.java
@@ -47,11 +47,11 @@ public ResponseEntity<JwtDTO> signIn(@Valid @RequestBody SignInDTO signInDto) {
         return ResponseEntity.ok(memberService.signIn(signInDto));
     }
 
-    @GetMapping("/members")
-    @Operation(summary = "회원 전체 조회")
+    @GetMapping("")
+    @Operation(summary = "회원 조회")
     @ApiResponse(responseCode = "200", description = "회원 조회 성공", content = @Content(schema = @Schema(implementation = ResponseMemberDTO.class)))
-    public List<ResponseMemberDTO> getMember() {
-        return memberService.getMembers();
+    public ResponseEntity<ResponseMemberDTO> getMember(@AuthenticationPrincipal CustomUserDetails user) {
+        return ResponseEntity.ok(memberService.getMember(user.getUsername()));
     }
 
     @PutMapping("")

diff --git a/src/main/java/com/jiyunio/todolist/member/MemberService.java b/src/main/java/com/jiyunio/todolist/member/MemberService.java
@@ -20,9 +20,6 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Service
 @RequiredArgsConstructor
 public class MemberService {
@@ -68,16 +65,12 @@ public JwtDTO signIn(@Valid SignInDTO signInDto) {
         return jwtProvider.createToken(authentication);
     }
 
-    public List<ResponseMemberDTO> getMembers() {
-        List<Member> members = memberRepository.findAll();
-        List<ResponseMemberDTO> getMembers = new ArrayList<>();
-        for (Member member : members) {
-            getMembers.add(ResponseMemberDTO.builder()
-                    .memberId(member.getId())
-                    .userId(member.getUserId())
-                    .build());
-        }
-        return getMembers;
+    public ResponseMemberDTO getMember(String userId) {
+        Member member = memberRepository.findByUserId(userId).get();
+        return ResponseMemberDTO.builder()
+                .memberId(member.getId())
+                .userId(member.getUserId())
+                .build();
     }
 
     public ResponseMemberDTO updateUserPw(String userId, @Valid ChangeUserPwDTO changeUserPwDto) {