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 @@ -13,6 +13,7 @@ public interface PostReviewCommentRepository extends JpaRepository<PostReviewCom

@Query("""
SELECT new hanium.modic.backend.web.postReview.dto.response.PostReviewCommentResponse(
c.id,
c.userId,
u.name,
c.createAt,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public GetMyProfileResponse getMyProfile(final UserEntity user) {
final String userImageUrl = user.getUserImageUrl();

return new GetMyProfileResponse(
user.getId(),
user.getEmail(),
user.getName(),
userImageUrl != null,
Expand All @@ -49,6 +50,7 @@ public GetProfileResponse getProfile(final long userId) {
final String userImageUrl = user.getUserImageUrl();

return new GetProfileResponse(
user.getId(),
user.getEmail(),
user.getName(),
userImageUrl != null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

@JsonInclude(NON_NULL)
public record PostReviewCommentResponse(
Long postReviewCommentId,
Long userId,
String userName,
LocalDateTime createdAt,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@

@JsonInclude(NON_NULL)
public record GetMyProfileResponse(
String email,
String nickname,
Long userId,
String userEmail,
String userName,
boolean hasUserImage,
String profileImageUrl,
String userImageUrl,
long postCount,
long followerCount,
long followingCount,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@

@JsonInclude(NON_NULL)
public record GetProfileResponse(
String email,
String nickname,
Long userId,
String userEmail,
String userName,
boolean hasUserImage,
String profileImageUrl,
String userImageUrl,
long postCount,
long followerCount,
long followingCount
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
@JsonInclude(NON_NULL)
public record UserInfoResponse(
Long id,
String email,
String name,
String userEmail,
String userName,
boolean hasUserImage,
String userImageUrl
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@ void getMyProfileSuccess() {
GetMyProfileResponse response = profileService.getMyProfile(me);

// then
assertThat(response.email()).isEqualTo(me.getEmail());
assertThat(response.nickname()).isEqualTo(me.getName());
assertThat(response.userId()).isEqualTo(me.getId());
assertThat(response.userEmail()).isEqualTo(me.getEmail());
assertThat(response.userName()).isEqualTo(me.getName());
assertThat(response.postCount()).isEqualTo(5L);
assertThat(response.followingCount()).isEqualTo(3L);
assertThat(response.followerCount()).isEqualTo(7L);
Expand All @@ -77,8 +78,9 @@ void getOtherProfileSuccess() {
GetProfileResponse response = profileService.getProfile(userId);

// then
assertThat(response.email()).isEqualTo(target.getEmail());
assertThat(response.nickname()).isEqualTo(target.getName());
assertThat(response.userId()).isEqualTo(target.getId());
assertThat(response.userEmail()).isEqualTo(target.getEmail());
assertThat(response.userName()).isEqualTo(target.getName());
assertThat(response.postCount()).isEqualTo(4L);
assertThat(response.followingCount()).isEqualTo(2L);
assertThat(response.followerCount()).isEqualTo(9L);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ void getUserInfoTest() {

// then
assertThat(response.id()).isEqualTo(userId);
assertThat(response.email()).isEqualTo(user.getEmail());
assertThat(response.name()).isEqualTo(user.getName());
assertThat(response.userEmail()).isEqualTo(user.getEmail());
assertThat(response.userName()).isEqualTo(user.getName());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.springframework.test.web.servlet.ResultActions;

import hanium.modic.backend.base.BaseIntegrationTest;
import hanium.modic.backend.base.login.ContextHolderUtil;
import hanium.modic.backend.base.login.WithCustomUser;
import hanium.modic.backend.domain.user.entity.UserEntity;
import hanium.modic.backend.domain.user.factory.UserFactory;
Expand All @@ -23,14 +24,17 @@ public class ProfileControllerIntegrationTest extends BaseIntegrationTest {
@DisplayName("TEST1: 내 프로필 조회 성공")
@WithCustomUser(email = "me@test.com")
void getMyProfileSuccess() throws Exception {
UserEntity user = ContextHolderUtil.getCurrentUser();

// when: 내 프로필 조회 요청
ResultActions result = mockMvc.perform(get("/api/profiles/me"));

// then: 응답 데이터 검증
result.andExpect(status().isOk())
.andExpect(jsonPath("$.data.email").value("me@test.com"))
.andExpect(jsonPath("$.data.nickname").exists())
.andExpect(jsonPath("$.data.profileImageUrl").doesNotExist()) // 프로필 저장 x
.andExpect(jsonPath("$.data.userId").value(user.getId()))
.andExpect(jsonPath("$.data.userEmail").value("me@test.com"))
.andExpect(jsonPath("$.data.userName").exists())
.andExpect(jsonPath("$.data.userImageUrl").doesNotExist()) // 프로필 저장 x
.andExpect(jsonPath("$.data.postCount").isNumber())
.andExpect(jsonPath("$.data.followerCount").isNumber())
.andExpect(jsonPath("$.data.followingCount").isNumber())
Expand All @@ -52,9 +56,10 @@ void getOtherProfileSuccess() throws Exception {

// then: 응답 데이터 검증
result.andExpect(status().isOk())
.andExpect(jsonPath("$.data.email").value(target.getEmail()))
.andExpect(jsonPath("$.data.nickname").value(target.getName()))
.andExpect(jsonPath("$.data.profileImageUrl").exists())
.andExpect(jsonPath("$.data.userId").value(target.getId()))
.andExpect(jsonPath("$.data.userEmail").value(target.getEmail()))
.andExpect(jsonPath("$.data.userName").value(target.getName()))
.andExpect(jsonPath("$.data.userImageUrl").exists())
.andExpect(jsonPath("$.data.postCount").isNumber())
.andExpect(jsonPath("$.data.followerCount").isNumber())
.andExpect(jsonPath("$.data.followingCount").isNumber());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package hanium.modic.backend.web.user.controller;

import static hanium.modic.backend.common.error.ErrorCode.*;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
Expand All @@ -21,16 +20,15 @@
import hanium.modic.backend.base.login.WithCustomUser;
import hanium.modic.backend.common.jwt.JwtTokenProvider;
import hanium.modic.backend.domain.auth.dto.Token;
import hanium.modic.backend.domain.auth.service.AuthService;
import hanium.modic.backend.domain.auth.service.component.CodeManager;
import hanium.modic.backend.domain.user.entity.UserEntity;
import hanium.modic.backend.domain.user.repository.UserEntityRepository;
import hanium.modic.backend.domain.user.service.UserService;
import hanium.modic.backend.web.user.dto.request.GetUserUpdateTokenRequest;
import hanium.modic.backend.web.user.dto.request.UpdateUserEmailRequest;
import hanium.modic.backend.web.user.dto.request.UpdateUserNameRequest;
import hanium.modic.backend.web.user.dto.request.UpdateUserPasswordRequest;
import hanium.modic.backend.web.user.dto.request.UserCreateRequest;
import hanium.modic.backend.web.user.dto.request.GetUserUpdateTokenRequest;
import hanium.modic.backend.web.user.dto.request.UpdateUserEmailRequest;

public class UserControllerIntegrationTest extends BaseIntegrationTest {

Expand Down Expand Up @@ -62,7 +60,6 @@ void createUserApiTest() throws Exception {
UserCreateRequest request = new UserCreateRequest(email, "youth", "qwer1234@#!", code);
String json = objectMapper.writeValueAsString(request);


// when
mockMvc.perform(post("/api/users")
.contentType(MediaType.APPLICATION_JSON)
Expand Down Expand Up @@ -92,8 +89,8 @@ void getUserInfoApiTest() throws Exception {
.contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
.andExpectAll(jsonPath("$.data.id").value(user.getId()),
jsonPath("$.data.email").value(user.getEmail()),
jsonPath("$.data.name").value(user.getName()));
jsonPath("$.data.userEmail").value(user.getEmail()),
jsonPath("$.data.userName").value(user.getName()));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ void getUserInfo_success() throws Exception {
mockMvc.perform(get("/api/users/me"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.data.id").value(mockUser.getId()))
.andExpect(jsonPath("$.data.email").value(mockUser.getEmail()));
.andExpect(jsonPath("$.data.userEmail").value(mockUser.getEmail()));

SecurityContextHolder.clearContext();
}
Expand Down