fix: solve conflict

IT-Cotato · Aug 12, 2024 · 871134f · 871134f
1 parent 7bb52c9
commit 871134f
Showing 1 changed file with 1 addition and 12 deletions.
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
@@ -52,8 +52,7 @@ public ResponseEntity<Void> updatePassword(@RequestHeader("Authorization") Strin
 
     @Operation(summary = "멤버 전화번호 수정 API")
     @PatchMapping("/phone-number")
-    public ResponseEntity<Void> updatePhoneNumber(
-            @RequestHeader("Authorization") String authorizationHeader,
+    public ResponseEntity<Void> updatePhoneNumber(@RequestHeader("Authorization") String authorizationHeader,
             @RequestBody @Valid UpdatePhoneNumberRequest request) {
         String accessToken = jwtTokenProvider.getBearer(authorizationHeader);
         memberService.updatePhoneNumber(accessToken, request.phoneNumber());
@@ -79,16 +78,6 @@ public ResponseEntity<Void> deleteProfileImage(
         return ResponseEntity.noContent().build();
     }
 
-    @Operation(summary = "멤버 전화번호 수정", description = "멤버 전화번호 수정하기")
-    @PatchMapping("/phone-number")
-    public ResponseEntity<Void> updatePhoneNumber(
-            @RequestHeader("Authorization") String authorizationHeader,
-            @RequestBody @Valid UpdatePhoneNumberRequest request) {
-        String accessToken = jwtTokenProvider.getBearer(authorizationHeader);
-        memberService.updatePhoneNumber(accessToken,request.phoneNumber());
-        return ResponseEntity.noContent().build();
-    }
-
     @GetMapping("/{memberId}/mypage")
     public ResponseEntity<MemberMyPageInfoResponse> findMyPageInfo(@PathVariable("memberId") Long memberId) {
         return ResponseEntity.ok().body(memberService.findMyPageInfo(memberId));