Merge pull request #183 from OutDecision/issue/182

♻️ [REFACTOR]: 마이페이지 칭호 변경
OutDecision · May 29, 2024 · 47e6955 · 47e6955
2 parents bcc6960 + 889b545
commit 47e6955
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/main/java/KGUcapstone/OutDecision/domain/user/controller/MemberRestController.java b/src/main/java/KGUcapstone/OutDecision/domain/user/controller/MemberRestController.java
@@ -123,10 +123,10 @@ public ApiResponse<List<String>> updateTitle(@PathVariable("memberId") Long memb
         return ApiResponse.onSuccess(myTitlesDTO);
     }
 
-    @PutMapping("/{memberId}/title")
+    @PutMapping("/title")
     @Operation(summary = "마이페이지 칭호 변경 API", description = "마이페이지 홈에서 칭호를 변경하는 API입니다.")
-    public ApiResponse<Object> updateTitle(@PathVariable("memberId") Long memberId, @RequestBody @Valid UpdateTitleDTO request) {
-        boolean success = titleService.updateUserTitle(memberId, request);
+    public ApiResponse<Object> updateTitle(@RequestBody @Valid UpdateTitleDTO request) {
+        boolean success = titleService.updateUserTitle(request);
         if (success) return ApiResponse.onSuccess("칭호가 성공적으로 변경되었습니다.");
         else return ApiResponse.onFailure("400", "칭호 변경에 실패하였습니다.", null);
     }

diff --git a/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/TitleService.java b/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/TitleService.java
@@ -8,7 +8,7 @@
 
 public interface TitleService {
     // 프로필 사진 변경
-    boolean updateUserTitle(Long memberId, UpdateRequestDTO.UpdateTitleDTO request);
+    boolean updateUserTitle(UpdateRequestDTO.UpdateTitleDTO request);
 
     List<String> myTitlesDTO(Long memberId);
 

diff --git a/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/TitleServiceImpl.java b/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/TitleServiceImpl.java
@@ -8,24 +8,33 @@
 import KGUcapstone.OutDecision.domain.user.domain.Member;
 import KGUcapstone.OutDecision.domain.user.dto.UpdateRequestDTO.UpdateTitleDTO;
 import KGUcapstone.OutDecision.domain.user.repository.MemberRepository;
+import KGUcapstone.OutDecision.domain.user.service.FindMemberService;
+import KGUcapstone.OutDecision.global.error.exception.handler.MemberHandler;
+import KGUcapstone.OutDecision.global.error.status.ErrorStatus;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
 @Transactional
 public class TitleServiceImpl implements TitleService{
     private final MemberRepository memberRepository;
+    private final FindMemberService findMemberService;
     private final TitleRepository titleRepository;
 
     // 칭호 변경
     @Override
-    public boolean updateUserTitle(Long memberId, UpdateTitleDTO request) {
-        Member member = memberRepository.findById(memberId).get();
+    public boolean updateUserTitle(UpdateTitleDTO request) {
+        Optional<Member> memberOptional = findMemberService.findLoginMember();
+        Member member;
+        // 로그인 체크
+        if(memberOptional.isPresent()) member = memberOptional.get();
+        else throw new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND);
 
         member.updateUserTitle(request.getTitle());
         memberRepository.save(member);