feat(user-service): 점주 회원가입 - 중복 이메일 로직 추가

- 중복 이메일 로직 추가
- DuplicateUserEmailException 추가
- 테스트 추가
This commit is contained in:
bum12ark
2022-02-24 21:39:30 +09:00
parent ac9ba94883
commit 4af396636d
5 changed files with 110 additions and 7 deletions

View File

@@ -72,4 +72,6 @@ operation::customer-get-notExistUserException[snippets='curl-request,http-reques
== 점주
=== 회원가입 - 점주
operation::storeOwner-post[snippets='curl-request,http-request,http-response,request-fields,response-fields']
operation::storeOwner-post[snippets='curl-request,http-request,http-response,request-fields,response-fields']
=== 회원가입 - 점주 : 중복 이메일
operation::storeOwner-post-duplicateUserEmailException[snippets='curl-request,http-request,http-response,request-fields,response-fields']

View File

@@ -0,0 +1,11 @@
package com.justpickup.userservice.domain.user.exception;
import com.justpickup.userservice.global.exception.CustomException;
import org.springframework.http.HttpStatus;
public class DuplicateUserEmail extends CustomException {
public DuplicateUserEmail(String message) {
super(HttpStatus.CONFLICT, message);
}
}

View File

@@ -7,4 +7,5 @@ import java.util.Optional;
public interface UserRepository extends JpaRepository<User, Long> {
Optional<User> findByEmail(String username);
boolean existsByEmail(String email);
}

View File

@@ -5,6 +5,7 @@ import com.justpickup.userservice.domain.user.dto.StoreOwnerDto;
import com.justpickup.userservice.domain.user.entity.Customer;
import com.justpickup.userservice.domain.user.entity.StoreOwner;
import com.justpickup.userservice.domain.user.entity.User;
import com.justpickup.userservice.domain.user.exception.DuplicateUserEmail;
import com.justpickup.userservice.domain.user.exception.NotExistUserException;
import com.justpickup.userservice.domain.user.repository.CustomerRepository;
import com.justpickup.userservice.domain.user.repository.UserRepository;
@@ -53,9 +54,14 @@ public class UserServiceImpl implements UserService, UserDetailsService {
@Override
@Transactional
public void saveStoreOwner(StoreOwnerDto storeOwnerDto) {
String email = storeOwnerDto.getEmail();
boolean exists = userRepository.existsByEmail(email);
if (exists) throw new DuplicateUserEmail(email + "은 중복된 이메일입니다.");
String encode = passwordEncoder.encode(storeOwnerDto.getPassword());
StoreOwner storeOwner = new StoreOwner(storeOwnerDto.getEmail(), encode, storeOwnerDto.getName(),
StoreOwner storeOwner = new StoreOwner(email, encode, storeOwnerDto.getName(),
storeOwnerDto.getPhoneNumber(), storeOwnerDto.getBusinessNumber());
StoreOwner save = userRepository.save(storeOwner);

View File

@@ -3,25 +3,34 @@ package com.justpickup.userservice.domain.user.web;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.justpickup.userservice.config.TestConfig;
import com.justpickup.userservice.domain.user.dto.CustomerDto;
import com.justpickup.userservice.domain.user.exception.DuplicateUserEmail;
import com.justpickup.userservice.domain.user.exception.NotExistUserException;
import com.justpickup.userservice.domain.user.service.UserService;
import com.justpickup.userservice.global.dto.Code;
import com.justpickup.userservice.global.security.SecurityConfig;
import com.justpickup.userservice.global.utils.CookieProvider;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
import org.springframework.context.annotation.Import;
import org.springframework.restdocs.payload.FieldDescriptor;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willThrow;
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
import static org.springframework.restdocs.payload.PayloadDocumentation.*;
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
import static org.springframework.restdocs.request.RequestDocumentation.pathParameters;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
@@ -29,7 +38,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@WebMvcTest(UserController.class)
@WebMvcTest(controllers = UserController.class,
excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = SecurityConfig.class)}
)
@AutoConfigureMockMvc(addFilters = false)
@Import(TestConfig.class)
@AutoConfigureRestDocs(uriHost = "127.0.0.1", uriPort = 8001)
class UserControllerTest {
@@ -43,6 +55,9 @@ class UserControllerTest {
@MockBean
UserService userService;
@SpyBean
CookieProvider cookieProvider;
@Test
@DisplayName("회원 조회")
void getCustomer() throws Exception {
@@ -115,4 +130,72 @@ class UserControllerTest {
))
;
}
@Test
@DisplayName("회원가입 - 점주")
void registerStoreOwner() throws Exception {
UserController.JoinStoreOwnerRequest requestBody =
new UserController.JoinStoreOwnerRequest("test@naver.com", "1234", "Park",
"010-1234-5678", "1234");
ResultActions actions = mockMvc.perform(post("/store-owner")
.content(objectMapper.writeValueAsString(requestBody))
.contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)
);
actions.andExpect(status().isCreated())
.andDo(print())
.andDo(document("storeOwner-post",
requestFields(
fieldWithPath("email").description("이메일"),
fieldWithPath("password").description("비밀번호"),
fieldWithPath("name").description("이름"),
fieldWithPath("phoneNumber").description("휴대폰번호"),
fieldWithPath("businessNumber").description("사업자등록번호")
),
responseFields(
fieldWithPath("code").description("결과코드 SUCCESS/ERROR"),
fieldWithPath("message").description("메시지"),
fieldWithPath("data").description("데이터")
)
))
;
}
@Test
@DisplayName("회원가입 - 점주 : 존재하는 회원 이메일")
void registerStoreOwnerDuplicateUserEmailException() throws Exception {
String email = "test@naver.com";
UserController.JoinStoreOwnerRequest requestBody =
new UserController.JoinStoreOwnerRequest(email, "1234", "Park",
"010-1234-5678", "1234");
willThrow(new DuplicateUserEmail(email + "은 중복된 이메일입니다."))
.given(userService).saveStoreOwner(any());
ResultActions actions = mockMvc.perform(post("/store-owner")
.content(objectMapper.writeValueAsString(requestBody))
.contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)
);
actions.andExpect(status().isConflict())
.andDo(print())
.andDo(document("storeOwner-post-duplicateUserEmailException",
requestFields(
fieldWithPath("email").description("이메일"),
fieldWithPath("password").description("비밀번호"),
fieldWithPath("name").description("이름"),
fieldWithPath("phoneNumber").description("휴대폰번호"),
fieldWithPath("businessNumber").description("사업자등록번호")
),
responseFields(
fieldWithPath("code").description("결과코드 SUCCESS/ERROR"),
fieldWithPath("message").description("메시지"),
fieldWithPath("data").description("데이터")
)
))
;
}
}