diff --git a/server/src/main/java/com/ticketing/server/user/application/request/LoginRequest.java b/server/src/main/java/com/ticketing/server/user/application/request/LoginRequest.java index 815f142..96d67d5 100644 --- a/server/src/main/java/com/ticketing/server/user/application/request/LoginRequest.java +++ b/server/src/main/java/com/ticketing/server/user/application/request/LoginRequest.java @@ -3,14 +3,13 @@ package com.ticketing.server.user.application.request; import javax.validation.constraints.Email; import javax.validation.constraints.NotEmpty; import lombok.Getter; +import lombok.NoArgsConstructor; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @Getter +@NoArgsConstructor public class LoginRequest { - public LoginRequest() { - } - public LoginRequest(String email, String password) { this.email = email; this.password = password; diff --git a/server/src/main/java/com/ticketing/server/user/application/request/SignUpRequest.java b/server/src/main/java/com/ticketing/server/user/application/request/SignUpRequest.java index 45b0a7b..9148261 100644 --- a/server/src/main/java/com/ticketing/server/user/application/request/SignUpRequest.java +++ b/server/src/main/java/com/ticketing/server/user/application/request/SignUpRequest.java @@ -5,11 +5,20 @@ import com.ticketing.server.user.service.dto.SignUpDTO; import javax.validation.constraints.Email; import javax.validation.constraints.NotEmpty; import lombok.Getter; +import lombok.NoArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; @Getter +@NoArgsConstructor public class SignUpRequest { + public SignUpRequest(String name, String email, String password, String phone) { + this.name = name; + this.email = email; + this.password = password; + this.phone = phone; + } + @NotEmpty(message = "{validation.not.empty.name}") private String name; diff --git a/server/src/test/java/com/ticketing/server/user/application/UserControllerTest.java b/server/src/test/java/com/ticketing/server/user/application/UserControllerTest.java index 866c2c9..af0d9df 100644 --- a/server/src/test/java/com/ticketing/server/user/application/UserControllerTest.java +++ b/server/src/test/java/com/ticketing/server/user/application/UserControllerTest.java @@ -6,6 +6,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultHandlers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.ticketing.server.user.application.request.LoginRequest; +import com.ticketing.server.user.application.request.SignUpRequest; import com.ticketing.server.user.service.interfaces.UserService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -33,6 +37,9 @@ class UserControllerTest { @Autowired PasswordEncoder passwordEncoder; + @Autowired + ObjectMapper objectMapper; + MockMvc mvc; @BeforeEach @@ -42,13 +49,10 @@ class UserControllerTest { .apply(springSecurity()) .build(); + SignUpRequest signUpRequest = new SignUpRequest("ticketing", "ticketing@gmail.com", "qwe123", "010-2240-7920"); + mvc.perform(post("/user") - .content("{\n" + - " \"email\": \"ticketing@gmail.com\",\n" + - " \"password\": \"qwe123\",\n" + - " \"name\": \"ticketing\",\n" + - " \"phone\": \"010-2240-7920\"\n" + - "}") + .content(asJsonString(signUpRequest)) .contentType(MediaType.APPLICATION_JSON)); } @@ -56,14 +60,11 @@ class UserControllerTest { @DisplayName("로그인 인증 성공") void loginSuccess() throws Exception { // given - String requestJson = "{\n" + - " \"email\": \"ticketing@gmail.com\",\n" + - " \"password\": \"qwe123\"\n" + - "}"; + LoginRequest request = new LoginRequest("ticketing@gmail.com", "qwe123"); // when ResultActions actions = mvc.perform(post("/user/login") - .content(requestJson) + .content(asJsonString(request)) .contentType(MediaType.APPLICATION_JSON)); // then @@ -76,14 +77,11 @@ class UserControllerTest { @DisplayName("로그인 패스워드 인증 실패") void loginPasswordFail() throws Exception { // given - String requestJson = "{\n" + - " \"email\": \"ticketing@gmail.com\",\n" + - " \"password\": \"qwe1234\"\n" + - "}"; + LoginRequest request = new LoginRequest("ticketing@gmail.com", "qwe1234"); // when ResultActions actions = mvc.perform(post("/user/login") - .content(requestJson) + .content(asJsonString(request)) .contentType(MediaType.APPLICATION_JSON)); // then @@ -91,4 +89,8 @@ class UserControllerTest { .andExpect(status().isUnauthorized()); } + private String asJsonString(Object object) throws JsonProcessingException { + return objectMapper.writeValueAsString(object); + } + } \ No newline at end of file