Merge branch 'develop' into fix/PRODUCT-153

Author: leegwichan

src/main/java/eatda/controller/member/MemberController.java

@@ -17,6 +17,12 @@ public class MemberController {
 
     private final MemberService memberService;
 
+    @GetMapping("/api/member")
+    public ResponseEntity<MemberResponse> getMember(LoginMember member) {
+        MemberResponse response = memberService.getMember(member.id());
+        return ResponseEntity.ok(response);
+    }
+
     @GetMapping("/api/member/nickname/check")
     public ResponseEntity<Void> checkNickname(LoginMember member, @RequestParam String nickname) {
         memberService.validateNickname(nickname, member.id());

src/main/java/eatda/service/member/MemberService.java

@@ -16,6 +16,12 @@ public class MemberService {
 
     private final MemberRepository memberRepository;
 
+    @Transactional(readOnly = true)
+    public MemberResponse getMember(long memberId) {
+        Member member = memberRepository.getById(memberId);
+        return new MemberResponse(member);
+    }
+
     @Transactional(readOnly = true)
     public void validateNickname(String nickname, long memberId) {
         Member member = memberRepository.getById(memberId);

src/test/java/eatda/controller/BaseControllerTest.java

@@ -46,7 +46,7 @@ public class BaseControllerTest {
     protected MemberRepository memberRepository;
 
     @Autowired
-    private JwtManager jwtManager;
+    protected JwtManager jwtManager;
 
     @MockitoBean
     private OauthClient oauthClient;

src/test/java/eatda/controller/member/MemberControllerTest.java

@@ -4,13 +4,39 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import eatda.controller.BaseControllerTest;
+import eatda.domain.member.Member;
 import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpHeaders;
 
 class MemberControllerTest extends BaseControllerTest {
 
+    @Nested
+    class GetMember {
+
+        @Test
+        void 회원_정보를_조회할_수_있다() {
+            Member member = memberGenerator.generateRegisteredMember(
+                    "123", "[email protected]", "test-nickname", "01012345678");
+            String accessToken = jwtManager.issueAccessToken(member.getId());
+
+            MemberResponse response = given()
+                    .header(HttpHeaders.AUTHORIZATION, accessToken)
+                    .when().get("/api/member")
+                    .then()
+                    .statusCode(200)
+                    .extract().as(MemberResponse.class);
+
+            assertAll(
+                    () -> assertThat(response.id()).isEqualTo(member.getId()),
+                    () -> assertThat(response.nickname()).isEqualTo(member.getNickname()),
+                    () -> assertThat(response.phoneNumber()).isEqualTo(member.getPhoneNumber()),
+                    () -> assertThat(response.isSignUp()).isFalse()
+            );
+        }
+    }
+
     @Nested
     class CheckNickname {
 

src/test/java/eatda/document/member/MemberDocumentTest.java

@@ -30,6 +30,62 @@
 
 public class MemberDocumentTest extends BaseDocumentTest {
 
+    @Nested
+    class GetMember {
+
+        RestDocsRequest requestDocument = request()
+                .tag(Tag.MEMBER_API)
+                .summary("회원 정보 조회")
+                .requestHeader(
+                        headerWithName(HttpHeaders.AUTHORIZATION).description("액세스 토큰")
+                );
+
+        RestDocsResponse responseDocument = response()
+                .responseBodyField(
+                        fieldWithPath("id").type(NUMBER).description("회원 식별자"),
+                        fieldWithPath("email").type(STRING).description("회원 이메일"),
+                        fieldWithPath("isSignUp").type(BOOLEAN).description("회원 가입 요청 여부 (false 고정)"),
+                        fieldWithPath("nickname").type(STRING).description("회원 닉네임").optional(),
+                        fieldWithPath("phoneNumber").type(STRING).description("회원 전화번호 ex) 01012345678").optional(),
+                        fieldWithPath("optInMarketing").type(BOOLEAN).description("마케팅 동의 여부").optional()
+                );
+
+        @Test
+        void 회원_정보_조회_성공() {
+            MemberResponse response = new MemberResponse(1L, "[email protected]", false, "test-nickname", "01012345678", true);
+            doReturn(response).when(memberService).getMember(anyLong());
+
+            var document = document("member/get", 200)
+                    .request(requestDocument)
+                    .response(responseDocument)
+                    .build();
+
+            given(document)
+                    .contentType(ContentType.JSON)
+                    .header(HttpHeaders.AUTHORIZATION, accessToken())
+                    .when().get("/api/member")
+                    .then().statusCode(200);
+        }
+
+        @EnumSource(value = BusinessErrorCode.class,
+                names = {"UNAUTHORIZED_MEMBER", "EXPIRED_TOKEN", "INVALID_MEMBER_ID"})
+        @ParameterizedTest
+        void 회원_정보_조회_실패(BusinessErrorCode errorCode) {
+            doThrow(new BusinessException(errorCode)).when(memberService).getMember(anyLong());
+
+            var document = document("member/get", errorCode)
+                    .request(requestDocument)
+                    .response(ERROR_RESPONSE)
+                    .build();
+
+            given(document)
+                    .contentType(ContentType.JSON)
+                    .header(HttpHeaders.AUTHORIZATION, accessToken())
+                    .when().get("/api/member")
+                    .then().statusCode(errorCode.getStatus().value());
+        }
+    }
+
     @Nested
     class CheckNickname {
 

src/test/java/eatda/service/member/MemberServiceTest.java

@@ -20,6 +20,35 @@ class MemberServiceTest extends BaseServiceTest {
     @Autowired
     private MemberService memberService;
 
+    @Nested
+    class GetMember {
+
+        @Test
+        void 회원_정보를_조회할_수_있다() {
+            Member member = memberGenerator.generateRegisteredMember("123", "[email protected]", "nickname", "01012345678");
+
+            MemberResponse response = memberService.getMember(member.getId());
+
+            assertAll(
+                    () -> assertThat(response.id()).isEqualTo(member.getId()),
+                    () -> assertThat(response.nickname()).isEqualTo(member.getNickname()),
+                    () -> assertThat(response.phoneNumber()).isEqualTo(member.getPhoneNumber()),
+                    () -> assertThat(response.optInMarketing()).isEqualTo(member.isOptInMarketing()),
+                    () -> assertThat(response.isSignUp()).isFalse()
+            );
+        }
+
+        @Test
+        void 존재하지_않는_회원의_정보를_조회하면_예외가_발생한다() {
+            long nonExistentMemberId = 999L;
+
+            BusinessException exception = assertThrows(BusinessException.class,
+                    () -> memberService.getMember(nonExistentMemberId));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MEMBER_ID);
+        }
+    }
+
     @Nested
     class ValidateNickname {
 
@@ -45,7 +74,7 @@ class ValidateNickname {
         @Test
         void 중복된_닉네임이_있으면_예외가_발생한다() {
             memberGenerator.generate("123", "[email protected]", "duplicate-nickname");
-            Member member = memberGenerator.generate("456", "[email protected]","another-nickname");
+            Member member = memberGenerator.generate("456", "[email protected]", "another-nickname");
             String newNickname = "duplicate-nickname";
 
             BusinessException exception = assertThrows(BusinessException.class,
@@ -60,8 +89,8 @@ class ValidatePhoneNumber {
 
         @Test
         void 중복되지_않은_전화번호이면_예외가_발생하지_않는다() {
-            memberGenerator.generate("123", "[email protected]","nickname");
-            Member member = memberGenerator.generate("456", "[email protected]","unique-nickname");
+            memberGenerator.generate("123", "[email protected]", "nickname");
+            Member member = memberGenerator.generate("456", "[email protected]", "unique-nickname");
             String newPhoneNumber = "01012345678";
 
             assertThatCode(() -> memberService.validatePhoneNumber(newPhoneNumber, member.getId()))
@@ -80,7 +109,8 @@ class ValidatePhoneNumber {
         @Test
         void 중복된_전화번호가_있으면_예외가_발생한다() {
             memberGenerator.generateRegisteredMember("nickname1", "[email protected]", "123", "01012345678");
-            Member member = memberGenerator.generateRegisteredMember("nickname2", "[email protected]", "456", "01087654321");
+            Member member = memberGenerator.generateRegisteredMember("nickname2", "[email protected]", "456",
+                    "01087654321");
             String newPhoneNumber = "01012345678";
 
             BusinessException exception = assertThrows(BusinessException.class,