Refactor: 멤버 반환명 필드 통일 (#114)

* refactor: 멤버 관련 필드명 통일 - 이름: name - 포지션: position * refactor: 회원 API 토큰 반환 로직 변경 - AuthPrincipal 이용
IT-Cotato · Aug 20, 2024 · 45f8b92 · 45f8b92
1 parent 7203ea5
commit 45f8b92
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 18 deletions.
diff --git a/src/main/java/org/cotato/csquiz/api/admin/dto/MemberEnrollInfoResponse.java b/src/main/java/org/cotato/csquiz/api/admin/dto/MemberEnrollInfoResponse.java
@@ -6,7 +6,7 @@
 
 public record MemberEnrollInfoResponse(
         Long memberId,
-        String memberName,
+        String name,
         MemberPosition position,
         Integer generationNumber,
         MemberRole role

diff --git a/src/main/java/org/cotato/csquiz/api/admin/dto/MemberInfoResponse.java b/src/main/java/org/cotato/csquiz/api/admin/dto/MemberInfoResponse.java
@@ -5,7 +5,7 @@
 
 public record MemberInfoResponse(
         Long memberId,
-        String memberName,
+        String name,
         String backFourNumber,
         MemberRole role
 ) {

diff --git a/src/main/java/org/cotato/csquiz/api/member/controller/MemberController.java b/src/main/java/org/cotato/csquiz/api/member/controller/MemberController.java
@@ -12,8 +12,8 @@
 import org.cotato.csquiz.common.config.jwt.JwtTokenProvider;
 import org.cotato.csquiz.common.error.exception.ImageException;
 import org.cotato.csquiz.domain.auth.service.MemberService;
-import org.springframework.context.annotation.Description;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -35,27 +35,22 @@ public class MemberController {
 
     @GetMapping("/info")
     public ResponseEntity<MemberInfoResponse> findMemberInfo(
-            @RequestHeader("Authorization") String authorizationHeader) {
-        String accessToken = jwtTokenProvider.getBearer(authorizationHeader);
-        Long memberId = jwtTokenProvider.getMemberId(accessToken);
+            @AuthenticationPrincipal Long memberId) {
         return ResponseEntity.ok().body(memberService.findMemberInfo(memberId));
     }
 
     @PatchMapping("/update/password")
-    public ResponseEntity<Void> updatePassword(@RequestHeader("Authorization") String authorizationHeader,
+    public ResponseEntity<Void> updatePassword(@AuthenticationPrincipal Long memberId,
                                                @RequestBody @Valid UpdatePasswordRequest request) {
-        String accessToken = jwtTokenProvider.getBearer(authorizationHeader);
-        Long memberId = jwtTokenProvider.getMemberId(accessToken);
         memberService.updatePassword(memberId, request.password());
         return ResponseEntity.noContent().build();
     }
 
     @Operation(summary = "멤버 전화번호 수정 API")
     @PatchMapping("/phone-number")
-    public ResponseEntity<Void> updatePhoneNumber(@RequestHeader("Authorization") String authorizationHeader,
+    public ResponseEntity<Void> updatePhoneNumber(@AuthenticationPrincipal Long memberId,
             @RequestBody @Valid UpdatePhoneNumberRequest request) {
-        String accessToken = jwtTokenProvider.getBearer(authorizationHeader);
-        memberService.updatePhoneNumber(accessToken, request.phoneNumber());
+        memberService.updatePhoneNumber(memberId, request.phoneNumber());
         return ResponseEntity.noContent().build();
     }
 

diff --git a/src/main/java/org/cotato/csquiz/api/member/dto/MemberInfo.java b/src/main/java/org/cotato/csquiz/api/member/dto/MemberInfo.java
@@ -9,7 +9,7 @@ public record MemberInfo(
         String name,
         String email,
         String backFourNumber,
-        MemberRole memberRole,
+        MemberRole role,
         MemberPosition position
 ) {
     public static MemberInfo of(Member findMember, String backFourNumber) {

diff --git a/src/main/java/org/cotato/csquiz/api/member/dto/MemberMyPageInfoResponse.java b/src/main/java/org/cotato/csquiz/api/member/dto/MemberMyPageInfoResponse.java
@@ -8,7 +8,7 @@ public record MemberMyPageInfoResponse(
         String email,
         String name,
         Integer generationNumber,
-        MemberPosition memberPosition,
+        MemberPosition position,
         String phoneNumber,
         String profileImage
 ) {

diff --git a/src/main/java/org/cotato/csquiz/domain/auth/service/MemberService.java b/src/main/java/org/cotato/csquiz/domain/auth/service/MemberService.java
@@ -7,13 +7,12 @@
 import org.cotato.csquiz.api.admin.dto.MemberInfoResponse;
 import org.cotato.csquiz.api.member.dto.MemberInfo;
 import org.cotato.csquiz.api.member.dto.MemberMyPageInfoResponse;
-import org.cotato.csquiz.common.s3.S3Uploader;
-import org.cotato.csquiz.api.member.dto.UpdatePhoneNumberRequest;
 import org.cotato.csquiz.common.config.jwt.JwtTokenProvider;
 import org.cotato.csquiz.common.entity.S3Info;
 import org.cotato.csquiz.common.error.ErrorCode;
 import org.cotato.csquiz.common.error.exception.AppException;
 import org.cotato.csquiz.common.error.exception.ImageException;
+import org.cotato.csquiz.common.s3.S3Uploader;
 import org.cotato.csquiz.domain.auth.entity.Member;
 import org.cotato.csquiz.domain.auth.enums.MemberRoleGroup;
 import org.cotato.csquiz.domain.auth.repository.MemberRepository;
@@ -71,8 +70,7 @@ private void validateIsSameBefore(String originPassword, String newPassword) {
     }
 
     @Transactional
-    public void updatePhoneNumber(String accessToken, String phoneNumber) {
-        Long memberId = jwtTokenProvider.getMemberId(accessToken);
+    public void updatePhoneNumber(Long memberId, String phoneNumber) {
         Member findMember = memberRepository.findById(memberId)
                 .orElseThrow(() -> new EntityNotFoundException("해당 회원을 찾을 수 없습니다."));