Merge pull request #173 from Re-4aliens/refactor/#172_member_id

Refactor/#172 매칭정보 조회 시 ,회원 식별번호 추가
Re-4aliens · Sep 25, 2024 · d2c784d · d2c784d
2 parents aacaa48 + 1165d80
commit d2c784d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 64 deletions.
diff --git a/src/main/java/com/aliens/backend/member/controller/MemberController.java b/src/main/java/com/aliens/backend/member/controller/MemberController.java
@@ -4,6 +4,7 @@
 import com.aliens.backend.global.config.resolver.Login;
 import com.aliens.backend.global.response.success.MemberSuccess;
 import com.aliens.backend.global.response.SuccessResponse;
+import com.aliens.backend.member.controller.dto.response.MemberStatus;
 import com.aliens.backend.member.controller.dto.request.SignUpRequest;
 import com.aliens.backend.member.controller.dto.request.TemporaryPasswordRequest;
 import com.aliens.backend.member.controller.dto.response.MemberPageResponse;
@@ -90,7 +91,7 @@ public SuccessResponse<String> withdraw(@Login LoginMember loginMember) {
     }
 
     @GetMapping("/status")
-    public SuccessResponse<String> getStatus(@Login LoginMember loginMember) {
+    public SuccessResponse<MemberStatus> getStatus(@Login LoginMember loginMember) {
 
         return SuccessResponse.of(
                 MemberSuccess.GET_MEMBER_MATCHING_STATUS_SUCCESS,

diff --git a/src/main/java/com/aliens/backend/member/controller/dto/response/MemberStatus.java b/src/main/java/com/aliens/backend/member/controller/dto/response/MemberStatus.java
@@ -0,0 +1,4 @@
+package com.aliens.backend.member.controller.dto.response;
+
+public record MemberStatus(String status, Long memberId) {
+}
diff --git a/src/main/java/com/aliens/backend/member/sevice/MemberInfoService.java b/src/main/java/com/aliens/backend/member/sevice/MemberInfoService.java
@@ -19,6 +19,7 @@
 import com.aliens.backend.member.controller.dto.response.MemberPageResponse;
 import com.aliens.backend.member.controller.dto.response.MemberResponse;
 import com.aliens.backend.member.controller.dto.request.SignUpRequest;
+import com.aliens.backend.member.controller.dto.response.MemberStatus;
 import com.aliens.backend.member.domain.*;
 import com.aliens.backend.member.domain.repository.MemberInfoRepository;
 import com.aliens.backend.uploader.AwsS3Uploader;
@@ -186,9 +187,9 @@ private MemberInfo getMemberInfo(final LoginMember loginMember) {
     }
 
     @Transactional(readOnly = true)
-    public String getStatus(final LoginMember loginMember) {
+    public MemberStatus getStatus(final LoginMember loginMember) {
         Member member = getMember(loginMember);
-        return member.getStatus();
+        return new MemberStatus(member.getStatus(), loginMember.memberId());
     }
 
     @Transactional(readOnly = true)

diff --git a/src/test/java/com/aliens/backend/docs/MemberRestDocsTest.java b/src/test/java/com/aliens/backend/docs/MemberRestDocsTest.java
@@ -2,6 +2,7 @@
 
 import com.aliens.backend.global.response.SuccessResponse;
 import com.aliens.backend.global.response.success.MemberSuccess;
+import com.aliens.backend.member.controller.dto.response.MemberStatus;
 import com.aliens.backend.member.controller.dto.request.SignUpRequest;
 import com.aliens.backend.member.controller.dto.request.TemporaryPasswordRequest;
 import com.aliens.backend.member.controller.dto.response.MemberPageResponse;
@@ -172,8 +173,8 @@ void withdraw() throws Exception {
     @Test
     @DisplayName("API - 상태 요청")
     void getStatus() throws Exception {
-        String message = MatchingStatus.NOT_APPLIED_NOT_MATCHED.getMessage();
-        SuccessResponse<String> response = SuccessResponse.of(MemberSuccess.GET_MEMBER_MATCHING_STATUS_SUCCESS, message);
+        MemberStatus memberStatus = new MemberStatus(MatchingStatus.NOT_APPLIED_NOT_MATCHED.getMessage(), 1L);
+        SuccessResponse<MemberStatus> response = SuccessResponse.of(MemberSuccess.GET_MEMBER_MATCHING_STATUS_SUCCESS, memberStatus);
         doReturn(response).when(memberController).getStatus(any());
 
         // When and Then
@@ -184,7 +185,9 @@ void getStatus() throws Exception {
                 .andDo(document("member-get-status",
                         responseFields(
                                 fieldWithPath("code").description("성공 코드"),
-                                fieldWithPath("result").description("상태 요청 결과")
+                                fieldWithPath("result").description("상태 요청 결과"),
+                                fieldWithPath("result.status").description("매칭 상태"),
+                                fieldWithPath("result.memberId").description("회원 식별번호")
                         )
                 ));
     }

diff --git a/src/test/java/com/aliens/backend/global/BaseRestDocsTest.java b/src/test/java/com/aliens/backend/global/BaseRestDocsTest.java
diff --git a/src/test/java/com/aliens/backend/member/service/MemberInfoServiceTest.java b/src/test/java/com/aliens/backend/member/service/MemberInfoServiceTest.java
@@ -10,6 +10,7 @@
 import com.aliens.backend.member.controller.dto.request.TemporaryPasswordRequest;
 import com.aliens.backend.member.controller.dto.response.MemberPageResponse;
 import com.aliens.backend.member.controller.dto.response.MemberResponse;
+import com.aliens.backend.member.controller.dto.response.MemberStatus;
 import com.aliens.backend.member.domain.MatchingStatus;
 import com.aliens.backend.member.sevice.MemberInfoService;
 import org.junit.jupiter.api.*;
@@ -138,13 +139,13 @@ void changeMBTI() {
     @DisplayName("상태 요청")
     void getStatus() {
         //Given
-        String expectedMessage = MatchingStatus.NOT_APPLIED_NOT_MATCHED.getMessage();
+        String expectedStatus = MatchingStatus.NOT_APPLIED_NOT_MATCHED.getMessage();
 
         //When
-        String result = memberInfoService.getStatus(loginMember);
+        MemberStatus result = memberInfoService.getStatus(loginMember);
 
         //Then
-        Assertions.assertEquals(expectedMessage, result);
+        Assertions.assertEquals(expectedStatus, result.status());
     }
 
     @Test