Merge pull request #181 from OutDecision/issue/180

[REFACTOR]: 마이페이지 메인 홈
OutDecision · May 26, 2024 · 3b8d3d0 · 3b8d3d0
2 parents 19cdf42 + 0dcfeb5
commit 3b8d3d0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 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
@@ -110,12 +110,10 @@ public ApiResponse<Object> deleteUserImg(@PathVariable("memberId") Long memberId
         else return ApiResponse.onFailure("400", "프로필 사진 삭제에 실패하였습니다.", null);
     }
 
-    @GetMapping("/{memberId}")
+    @GetMapping()
     @Operation(summary = "마이페이지 홈 API", description = "마이페이지 홈을 조회하는 API입니다.")
-    public ApiResponse<MyPageDTO> getMyPostList(
-            @PathVariable(name = "memberId") Long memberId,
-            @RequestParam(name = "posts", required = false) String posts) {
-        return ApiResponse.onSuccess(myPageService.getMyPage(memberId, posts));
+    public ApiResponse<MyPageDTO> getMyPostList(@RequestParam(name = "posts", required = false) String posts) {
+        return ApiResponse.onSuccess(myPageService.getMyPage(posts));
     }
 
     @GetMapping("/{memberId}/title")

diff --git a/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/MyPageService.java b/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/MyPageService.java
@@ -3,5 +3,5 @@
 import KGUcapstone.OutDecision.domain.user.dto.MemberResponseDTO;
 
 public interface MyPageService {
-    MemberResponseDTO.MyPageDTO getMyPage(Long memberId, String posts);
+    MemberResponseDTO.MyPageDTO getMyPage(String posts);
 }
diff --git a/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/MyPageServiceImpl.java b/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/MyPageServiceImpl.java
@@ -9,29 +9,43 @@
 import KGUcapstone.OutDecision.domain.user.domain.Member;
 import KGUcapstone.OutDecision.domain.user.dto.MemberResponseDTO.MyPageDTO;
 import KGUcapstone.OutDecision.domain.user.repository.MemberRepository;
+import KGUcapstone.OutDecision.domain.user.service.FindMemberService;
 import KGUcapstone.OutDecision.domain.vote.repository.VoteRepository;
+import KGUcapstone.OutDecision.global.error.exception.handler.MemberHandler;
+import KGUcapstone.OutDecision.global.error.status.ErrorStatus;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
 @Transactional
 public class MyPageServiceImpl implements MyPageService{
     private final PostRepository postRepository;
-    private final MemberRepository memberRepository;
+    private final FindMemberService findMemberService;
     private final LikesRepository likesRepository;
     private final VoteRepository voteRepository;
     private final TitleRepository titleRepository;
     private final PostConverter  postConverter;
 
     @Override
-    public MyPageDTO getMyPage(Long memberId, String posts) {
-        Member member = memberRepository.findById(memberId).get();
+    public MyPageDTO getMyPage(String posts) {
+        Optional<Member> memberOptional = findMemberService.findLoginMember();
+        Member member;
+        Long memberId;
+        // 로그인 체크
+        if(memberOptional.isPresent())
+        {
+            member = memberOptional.get();
+            memberId = member.getId();
+        }
+        else throw new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND);
+
         int titleCnt = titleRepository.countTrueColumnsForMember(memberId);
 
         List<Post> latestPostList = postList(memberId, posts);