Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

♻️[REFACTOR]: 마이페이지 메인 홈 #181

Merged
merged 3 commits into from
May 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down