Skip to content
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 @@ -3,6 +3,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
Expand All @@ -11,6 +12,7 @@
import com.und.server.auth.filter.AuthMember;
import com.und.server.member.dto.request.NicknameRequest;
import com.und.server.member.dto.response.MemberResponse;
import com.und.server.member.entity.Member;
import com.und.server.member.service.MemberService;

import io.swagger.v3.oas.annotations.Parameter;
Expand All @@ -25,6 +27,15 @@ public class MemberController {

private final MemberService memberService;

@GetMapping("/member/nickname")
public ResponseEntity<String> getNickname(
@Parameter(hidden = true) @AuthMember final Long memberId
) {
final Member member = memberService.findMemberById(memberId);

return ResponseEntity.status(HttpStatus.OK).body(member.getNickname());
}
Comment on lines +31 to +37

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

API 응답의 일관성과 확장성을 위해 원시 문자열(raw string) 대신 JSON 객체를 반환하는 것이 좋습니다. 다른 API(updateNickname 등)들이 JSON을 반환하는 것과 맞추면 클라이언트 측에서 더 일관되게 처리할 수 있습니다.

java.util.Map을 사용하여 간단한 JSON 객체를 생성할 수 있습니다. 아래 제안처럼 FQCN(정규화된 클래스 이름)을 사용하면 별도의 import문 추가 없이 바로 적용 가능하며, 추후 import문을 추가하고 타입을 간소화할 수 있습니다.

또한 ResponseEntity.status(HttpStatus.OK).body(...) 대신 ResponseEntity.ok(...)을 사용하면 코드를 더 간결하게 만들 수 있습니다.

Suggested change
public ResponseEntity<String> getNickname(
@Parameter(hidden = true) @AuthMember final Long memberId
) {
final Member member = memberService.findMemberById(memberId);
return ResponseEntity.status(HttpStatus.OK).body(member.getNickname());
}
public ResponseEntity<java.util.Map<String, String>> getNickname(
@Parameter(hidden = true) @AuthMember final Long memberId
) {
final Member member = memberService.findMemberById(memberId);
return ResponseEntity.ok(java.util.Map.of("nickname", member.getNickname()));
}


@PatchMapping("/member/nickname")
public ResponseEntity<MemberResponse> updateNickname(
@Parameter(hidden = true) @AuthMember final Long memberId,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
package com.und.server.member.controller;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.verify;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import java.nio.charset.StandardCharsets;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand All @@ -28,6 +31,7 @@
import com.und.server.common.exception.ServerException;
import com.und.server.member.dto.request.NicknameRequest;
import com.und.server.member.dto.response.MemberResponse;
import com.und.server.member.entity.Member;
import com.und.server.member.service.MemberService;

@ExtendWith(MockitoExtension.class)
Expand Down Expand Up @@ -131,6 +135,59 @@ void Given_AuthenticatedUser_When_UpdateNickname_Then_ReturnsOkWithUpdatedInfo()
.andExpect(jsonPath("$.nickname").value(newNickname));
}

@Test
@DisplayName("Fails to get member and returns unauthorized when user is not authenticated")
void Given_UnauthenticatedUser_When_GetMember_Then_ReturnsUnauthorized() throws Exception {
// given
final String url = "/v1/member/nickname";
final AuthErrorResult errorResult = AuthErrorResult.UNAUTHORIZED_ACCESS;

doReturn(true).when(authMemberArgumentResolver).supportsParameter(any());
doThrow(new ServerException(errorResult))
.when(authMemberArgumentResolver).resolveArgument(any(), any(), any(), any());

// when
final ResultActions resultActions = mockMvc.perform(
MockMvcRequestBuilders.get(url)
);

// then
resultActions.andExpect(status().isUnauthorized())
.andExpect(jsonPath("$.code").value(errorResult.name()))
.andExpect(jsonPath("$.message").value(errorResult.getMessage()));
}

@Test
@DisplayName("Succeeds in getting member nickname for an authenticated user")
void Given_AuthenticatedUser_When_GetMember_Then_ReturnsOkWithNickname() throws Exception {
// given
final String url = "/v1/member/nickname";
final Long memberId = 1L;
final String nickname = "Chori";
final Member member = Member.builder()
.id(memberId)
.nickname(nickname)
.build();

doReturn(true).when(authMemberArgumentResolver).supportsParameter(any());
doReturn(memberId).when(authMemberArgumentResolver).resolveArgument(any(), any(), any(), any());
doReturn(member).when(memberService).findMemberById(memberId);

// when
final ResultActions resultActions = mockMvc.perform(
MockMvcRequestBuilders.get(url)
);

// then
final String responseContent = resultActions
.andExpect(status().isOk())
.andReturn()
.getResponse()
.getContentAsString(StandardCharsets.UTF_8);
assertThat(responseContent).isEqualTo(nickname);
Comment on lines +182 to +187

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

컨트롤러가 JSON 객체를 반환하도록 수정하는 제안에 맞춰, 테스트 코드도 JSON 응답을 검증하도록 수정해야 합니다. jsonPath를 사용하면 응답 본문의 특정 필드 값을 간결하게 확인할 수 있습니다.

		resultActions
			.andExpect(status().isOk())
			.andExpect(jsonPath("$.nickname").value(nickname));

verify(memberService).findMemberById(memberId);
}

@Test
@DisplayName("Fails to delete member and returns unauthorized when user is not authenticated")
void Given_UnauthenticatedUser_When_DeleteMember_Then_ReturnsUnauthorized() throws Exception {
Expand Down
Loading