From 44cdb55bcedc2419ee741c68066f6d4929b7c5ba Mon Sep 17 00:00:00 2001 From: kms Date: Wed, 22 May 2024 20:21:17 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[REFACTOR]:=20findLoginMember()=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=EC=BD=94=EB=93=9C=EB=A1=9C=20=EB=A6=AC=ED=8E=99=20?= =?UTF-8?q?getMyPage=20=EB=B6=80=EB=B6=84=20=EB=A6=AC=ED=8E=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/service/mypage/MyPageServiceImpl.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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 index 78cd449f..714b9bfc 100644 --- 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,13 +9,17 @@ 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 @@ -23,7 +27,7 @@ @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; @@ -31,7 +35,16 @@ public class MyPageServiceImpl implements MyPageService{ @Override public MyPageDTO getMyPage(Long memberId, String posts) { - Member member = memberRepository.findById(memberId).get(); + Optional memberOptional = findMemberService.findLoginMember(); + Member member; + // 로그인 체크 + if(memberOptional.isPresent()) + { + member = memberOptional.get(); + memberId = member.getId(); + } + else throw new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND); + int titleCnt = titleRepository.countTrueColumnsForMember(memberId); List latestPostList = postList(memberId, posts); From fb5fbdf76f8b91eb1aa57dfbd0d2929381ef2a99 Mon Sep 17 00:00:00 2001 From: kms Date: Thu, 23 May 2024 00:00:47 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[REFACTOR]:=20findLoginMember()=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=EC=BD=94=EB=93=9C=EB=A1=9C=20=EB=A6=AC=ED=8E=99=20?= =?UTF-8?q?=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20&=20MyPageServiceImpl=20?= =?UTF-8?q?&=20MyPage=EC=84=9C=EB=B9=84=EC=8A=A4=20=EC=9D=B8=ED=84=B0?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/user/controller/MemberRestController.java | 8 +++----- .../domain/user/service/mypage/MyPageService.java | 2 +- .../domain/user/service/mypage/MyPageServiceImpl.java | 3 ++- 3 files changed, 6 insertions(+), 7 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 index be7e3fa8..df300da8 100644 --- 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 deleteUserImg(@PathVariable("memberId") Long memberId else return ApiResponse.onFailure("400", "프로필 사진 삭제에 실패하였습니다.", null); } - @GetMapping("/{memberId}") + @GetMapping("/") @Operation(summary = "마이페이지 홈 API", description = "마이페이지 홈을 조회하는 API입니다.") - public ApiResponse getMyPostList( - @PathVariable(name = "memberId") Long memberId, - @RequestParam(name = "posts", required = false) String posts) { - return ApiResponse.onSuccess(myPageService.getMyPage(memberId, posts)); + public ApiResponse 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 index a6d2043d..26a0023e 100644 --- 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 index 714b9bfc..ff148eaa 100644 --- a/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/MyPageServiceImpl.java +++ b/src/main/java/KGUcapstone/OutDecision/domain/user/service/mypage/MyPageServiceImpl.java @@ -34,9 +34,10 @@ public class MyPageServiceImpl implements MyPageService{ private final PostConverter postConverter; @Override - public MyPageDTO getMyPage(Long memberId, String posts) { + public MyPageDTO getMyPage(String posts) { Optional memberOptional = findMemberService.findLoginMember(); Member member; + Long memberId; // 로그인 체크 if(memberOptional.isPresent()) { From 0dcfeb5fbbcfc4f65965cd030e2cc733317c7655 Mon Sep 17 00:00:00 2001 From: kms Date: Fri, 24 May 2024 09:50:19 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[REFACTOR]:=20Mapping=20url=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/user/controller/MemberRestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/KGUcapstone/OutDecision/domain/user/controller/MemberRestController.java b/src/main/java/KGUcapstone/OutDecision/domain/user/controller/MemberRestController.java index df300da8..835d8dda 100644 --- a/src/main/java/KGUcapstone/OutDecision/domain/user/controller/MemberRestController.java +++ b/src/main/java/KGUcapstone/OutDecision/domain/user/controller/MemberRestController.java @@ -110,7 +110,7 @@ public ApiResponse deleteUserImg(@PathVariable("memberId") Long memberId else return ApiResponse.onFailure("400", "프로필 사진 삭제에 실패하였습니다.", null); } - @GetMapping("/") + @GetMapping() @Operation(summary = "마이페이지 홈 API", description = "마이페이지 홈을 조회하는 API입니다.") public ApiResponse getMyPostList(@RequestParam(name = "posts", required = false) String posts) { return ApiResponse.onSuccess(myPageService.getMyPage(posts));