-
Notifications
You must be signed in to change notification settings - Fork 0
Feat: 회원 정보 저장, 조회 API 개발 #15
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
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
70c3579
[#14] feat: login 한 유저 반환하는 어노테이션 추가
choiseoji 7360332
[#14] feat: 유저 정보 저장, 조회 컨트롤러 추가
choiseoji e5b0301
[#14] feat: 유저 정보 저장, 조회 서비스 추가
choiseoji 581a62d
[#14] feat: 가입한 크루가 없는 경우 발생할 에러 추가
choiseoji fe2f24f
[#14] feat: 가입한 크루 반환하는 레포지토리 코드 추가
choiseoji 8b0d9cf
[#14] feat: member 관련 dto 추가
choiseoji 59e47f4
[#14] feat: member 기본 정보 수정하는 세터 추가
choiseoji d4db35a
[#14] feat: 전역 예외 처리기에서 MemberNotJoinedCrew 에러 추가
choiseoji e19eec9
[#14] test: 멤버 정보 저장, 조회 테스트 코드 추가
choiseoji fe5b392
[#14] feat: approveJoin 에 public 설정 추가
choiseoji b1dc9cc
[#14] feat: approved 된 joinCrew에서 crew 조회하도록 조건 추가
choiseoji 1210549
[#14] feat: 크루 없으면 "N/A" 반환하도록 설정
choiseoji 7d945cd
[#14] delete: 회원 정보 저장 API 삭제
choiseoji File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
src/main/java/run/backend/domain/member/controller/MemberController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package run.backend.domain.member.controller; | ||
|
|
||
| import io.swagger.v3.oas.annotations.Operation; | ||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.web.bind.annotation.*; | ||
| import run.backend.domain.member.dto.response.MemberInfoResponse; | ||
| import run.backend.domain.member.entity.Member; | ||
| import run.backend.domain.member.service.MemberServiceImpl; | ||
| import run.backend.global.annotation.member.Login; | ||
| import run.backend.global.common.response.CommonResponse; | ||
|
|
||
| @RestController | ||
| @RequiredArgsConstructor | ||
| @RequestMapping("/api/v1/members") | ||
| @Tag(name = "Members", description = "Member 관련 API") | ||
| public class MemberController { | ||
|
|
||
| private final MemberServiceImpl memberService; | ||
|
|
||
| @Operation(summary = "유저 정보 조회", description = "마이페이지 상단 유저 정보를 조회하는 API 입니다.") | ||
| @GetMapping | ||
| public CommonResponse<MemberInfoResponse> getMemberInfo(@Login Member member) { | ||
|
|
||
| MemberInfoResponse response = memberService.getMemberInfo(member); | ||
| return new CommonResponse<>("유저 정보 조회 성공", response); | ||
| } | ||
| } |
8 changes: 7 additions & 1 deletion
8
src/main/java/run/backend/domain/member/dto/request/MemberInfoRequest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,10 @@ | ||
| package run.backend.domain.member.dto.request; | ||
|
|
||
| public record MemberInfoRequest() { | ||
| import run.backend.domain.member.enums.Gender; | ||
|
|
||
| public record MemberInfoRequest( | ||
| Gender gender, | ||
| int age, | ||
| String nickname | ||
| ) { | ||
| } |
6 changes: 5 additions & 1 deletion
6
src/main/java/run/backend/domain/member/dto/response/MemberInfoResponse.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,8 @@ | ||
| package run.backend.domain.member.dto.response; | ||
|
|
||
| public record MemberInfoResponse() { | ||
| public record MemberInfoResponse( | ||
| String profileImageUrl, | ||
| String nickName, | ||
| String crewName | ||
| ) { | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
src/main/java/run/backend/domain/member/exception/MemberErrorCode.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package run.backend.domain.member.exception; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
| import run.backend.global.exception.ErrorCode; | ||
|
|
||
| @Getter | ||
| @AllArgsConstructor | ||
| public enum MemberErrorCode implements ErrorCode { | ||
|
|
||
| MEMBER_NOT_JOINED_CREW(5001, "가입한 크루가 없습니다."); | ||
|
|
||
| private final int errorCode; | ||
| private final String errorMessage; | ||
| } |
16 changes: 16 additions & 0 deletions
16
src/main/java/run/backend/domain/member/exception/MemberException.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package run.backend.domain.member.exception; | ||
|
|
||
| import run.backend.global.exception.CustomException; | ||
|
|
||
| public class MemberException extends CustomException { | ||
|
|
||
| public MemberException(final MemberErrorCode memberErrorCode) { | ||
| super(memberErrorCode); | ||
| } | ||
|
|
||
| public static class MemberNotJoinedCrew extends MemberException { | ||
| public MemberNotJoinedCrew() { | ||
| super(MemberErrorCode.MEMBER_NOT_JOINED_CREW); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 8 additions & 8 deletions
16
src/main/java/run/backend/domain/member/service/MemberService.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| package run.backend.domain.member.service; | ||
|
|
||
| import run.backend.domain.member.dto.request.MemberInfoRequest; | ||
| import run.backend.domain.member.dto.response.MemberInfoResponse; | ||
| import run.backend.domain.member.entity.Member; | ||
|
|
||
| public interface MemberService { | ||
|
|
||
| void updateMember(Long memberId, MemberInfoRequest memberInfoRequest); | ||
| MemberInfoResponse getMemberInfo(Member member); | ||
|
|
||
| MemberInfoResponse getMemberInfo(Long memberId); | ||
| // void updateMember(); | ||
|
|
||
| void deleteMember(Long memberId); | ||
|
|
||
| void leaveCrew(Long memberId, Long crewId); | ||
|
|
||
| void joinCrew(String crewCode); | ||
| // void deleteMember(Member member); | ||
| // | ||
| // void leaveCrew(Member member, Long crewId); | ||
| // | ||
| // void joinCrew(String crewCode); | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/main/java/run/backend/domain/member/service/MemberServiceImpl.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package run.backend.domain.member.service; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
| import run.backend.domain.crew.entity.Crew; | ||
| import run.backend.domain.crew.enums.JoinStatus; | ||
| import run.backend.domain.member.dto.response.MemberInfoResponse; | ||
| import run.backend.domain.member.entity.Member; | ||
| import run.backend.domain.member.repository.MemberRepository; | ||
|
|
||
| @Service | ||
| @RequiredArgsConstructor | ||
| @Transactional(readOnly = true) | ||
| public class MemberServiceImpl implements MemberService { | ||
|
|
||
| private final MemberRepository memberRepository; | ||
|
|
||
| @Override | ||
| public MemberInfoResponse getMemberInfo(Member member) { | ||
|
|
||
| String crewName = memberRepository.findCrewByMemberIdAndStatus(member.getId(), JoinStatus.APPROVED) | ||
| .map(Crew::getName) | ||
| .orElse("N/A"); | ||
|
|
||
| return new MemberInfoResponse(member.getProfileImage(), member.getNickname(), crewName); | ||
| } | ||
| } |
11 changes: 11 additions & 0 deletions
11
src/main/java/run/backend/global/annotation/member/Login.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package run.backend.global.annotation.member; | ||
|
|
||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| @Target(ElementType.PARAMETER) | ||
| @Retention(RetentionPolicy.RUNTIME) | ||
| public @interface Login { | ||
| } |
35 changes: 35 additions & 0 deletions
35
src/main/java/run/backend/global/annotation/member/LoginArgumentResolver.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package run.backend.global.annotation.member; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.core.MethodParameter; | ||
| import org.springframework.security.core.Authentication; | ||
| import org.springframework.security.core.context.SecurityContextHolder; | ||
| import org.springframework.stereotype.Component; | ||
| import org.springframework.web.bind.support.WebDataBinderFactory; | ||
| import org.springframework.web.context.request.NativeWebRequest; | ||
| import org.springframework.web.method.support.HandlerMethodArgumentResolver; | ||
| import org.springframework.web.method.support.ModelAndViewContainer; | ||
| import run.backend.domain.member.entity.Member; | ||
| import run.backend.global.security.CustomUserDetails; | ||
|
|
||
| @Component | ||
| @RequiredArgsConstructor | ||
| public class LoginArgumentResolver implements HandlerMethodArgumentResolver { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 참고해서 크루도 이런식으로 만들어둘까요??
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 헉 네네 좋아요!! |
||
|
|
||
| @Override | ||
| public boolean supportsParameter(MethodParameter parameter) { | ||
|
|
||
| boolean hasLoginAnnotation = parameter.hasParameterAnnotation(Login.class); | ||
| boolean isMemberType = parameter.getParameterType().equals(Member.class); | ||
| return hasLoginAnnotation && isMemberType; | ||
| } | ||
|
|
||
| @Override | ||
| public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, | ||
| NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { | ||
|
|
||
| Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); | ||
| CustomUserDetails principal = (CustomUserDetails) authentication.getPrincipal(); | ||
| return principal.getMember(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
src/test/java/run/backend/domain/member/service/MemberServiceTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| package run.backend.domain.member.service; | ||
|
|
||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.DisplayName; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.mockito.InjectMocks; | ||
| import org.mockito.Mock; | ||
| import org.mockito.junit.jupiter.MockitoExtension; | ||
| import run.backend.domain.crew.entity.Crew; | ||
| import run.backend.domain.crew.enums.JoinStatus; | ||
| import run.backend.domain.member.dto.response.MemberInfoResponse; | ||
| import run.backend.domain.member.entity.Member; | ||
| import run.backend.domain.member.enums.OAuthType; | ||
| import run.backend.domain.member.repository.MemberRepository; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| @ExtendWith(MockitoExtension.class) | ||
| public class MemberServiceTest { | ||
|
|
||
| @Mock | ||
| private MemberRepository memberRepository; | ||
|
|
||
| @InjectMocks | ||
| private MemberServiceImpl memberService; | ||
|
|
||
| private Member testMember; | ||
| private Crew testCrew; | ||
|
|
||
| @BeforeEach | ||
| public void setUp() { | ||
|
|
||
| // member | ||
| testMember = Member.builder() | ||
| .username("test username") | ||
| .oauthId("test id") | ||
| .oauthType(OAuthType.GOOGLE) | ||
| .profileImage("test image") | ||
| .build(); | ||
|
|
||
| // crew | ||
| testCrew = Crew.builder() | ||
| .name("test crew name") | ||
| .description("크루 소개 테스트") | ||
| .image("test image url") | ||
| .build(); | ||
| } | ||
|
|
||
| @Test | ||
| @DisplayName("회원 정보가 올바르게 조회 되는지 확인") | ||
| public void getMemberInfoTest() { | ||
|
|
||
| // given | ||
| when(memberRepository.findCrewByMemberIdAndStatus(testMember.getId(), JoinStatus.APPROVED)) | ||
| .thenReturn(Optional.of(testCrew)); | ||
|
|
||
| // when | ||
| MemberInfoResponse response = memberService.getMemberInfo(testMember); | ||
|
|
||
| // then | ||
| assertEquals(testMember.getNickname(), response.nickName()); | ||
| assertEquals(testCrew.getName(), response.crewName()); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이게 쿼리dsl이구나~ 참고하겠습니다.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
쿼리dsl은 아직.. ㅠㅜ 설정 추가하면 쿼리 dsl로 바꿀라구요!