diff --git a/src/main/java/hanium/modic/backend/web/user/dto/response/SearchUsersResponse.java b/src/main/java/hanium/modic/backend/web/user/dto/response/SearchUsersResponse.java index a1b0ba64..4bef49b7 100644 --- a/src/main/java/hanium/modic/backend/web/user/dto/response/SearchUsersResponse.java +++ b/src/main/java/hanium/modic/backend/web/user/dto/response/SearchUsersResponse.java @@ -3,8 +3,8 @@ import hanium.modic.backend.domain.user.entity.UserEntity; public record SearchUsersResponse( - Long id, - String name, + Long userId, + String userName, boolean hasUserImage, String userImageUrl ) { diff --git a/src/main/java/hanium/modic/backend/web/user/dto/response/UserInfoResponse.java b/src/main/java/hanium/modic/backend/web/user/dto/response/UserInfoResponse.java index 108c697b..ebf8e62b 100644 --- a/src/main/java/hanium/modic/backend/web/user/dto/response/UserInfoResponse.java +++ b/src/main/java/hanium/modic/backend/web/user/dto/response/UserInfoResponse.java @@ -8,7 +8,7 @@ @JsonInclude(NON_NULL) public record UserInfoResponse( - Long id, + Long userId, String userEmail, String userName, boolean hasUserImage, diff --git a/src/test/java/hanium/modic/backend/domain/user/service/UserServiceTest.java b/src/test/java/hanium/modic/backend/domain/user/service/UserServiceTest.java index 3ad58b07..599255b6 100644 --- a/src/test/java/hanium/modic/backend/domain/user/service/UserServiceTest.java +++ b/src/test/java/hanium/modic/backend/domain/user/service/UserServiceTest.java @@ -131,7 +131,7 @@ void getUserInfoTest() { UserInfoResponse response = userService.getUserInfo(user); // then - assertThat(response.id()).isEqualTo(userId); + assertThat(response.userId()).isEqualTo(userId); assertThat(response.userEmail()).isEqualTo(user.getEmail()); assertThat(response.userName()).isEqualTo(user.getName()); } diff --git a/src/test/java/hanium/modic/backend/web/user/controller/UserControllerIntegrationTest.java b/src/test/java/hanium/modic/backend/web/user/controller/UserControllerIntegrationTest.java index be8224ea..cf9d82e7 100644 --- a/src/test/java/hanium/modic/backend/web/user/controller/UserControllerIntegrationTest.java +++ b/src/test/java/hanium/modic/backend/web/user/controller/UserControllerIntegrationTest.java @@ -88,7 +88,7 @@ void getUserInfoApiTest() throws Exception { .header("Authorization", "Bearer " + token.accessToken()) .contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) - .andExpectAll(jsonPath("$.data.id").value(user.getId()), + .andExpectAll(jsonPath("$.data.userId").value(user.getId()), jsonPath("$.data.userEmail").value(user.getEmail()), jsonPath("$.data.userName").value(user.getName())); } diff --git a/src/test/java/hanium/modic/backend/web/user/controller/UserControllerTest.java b/src/test/java/hanium/modic/backend/web/user/controller/UserControllerTest.java index f93ec581..b1f1e4d3 100644 --- a/src/test/java/hanium/modic/backend/web/user/controller/UserControllerTest.java +++ b/src/test/java/hanium/modic/backend/web/user/controller/UserControllerTest.java @@ -149,7 +149,7 @@ void getUserInfo_success() throws Exception { // when & then mockMvc.perform(get("/api/users/me")) .andExpect(status().isOk()) - .andExpect(jsonPath("$.data.id").value(mockUser.getId())) + .andExpect(jsonPath("$.data.userId").value(mockUser.getId())) .andExpect(jsonPath("$.data.userEmail").value(mockUser.getEmail())); SecurityContextHolder.clearContext();