From 533f7f97324108dca77154a35251611baef7c046 Mon Sep 17 00:00:00 2001
From: memoer <hanjn2842@naver.com>
Date: Wed, 27 Jul 2022 20:23:54 +0900
Subject: [PATCH] =?UTF-8?q?test(#45):=20=EC=9C=A0=EC=A0=80=20=EC=95=84?=
 =?UTF-8?q?=EC=9D=B4=EB=94=94=20=EC=B0=BE=EA=B8=B0=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/airjnc/user/dao/UserRepository.java   |  9 +++---
 .../user/dao/impl/MybatisUserRepository.java  | 22 +++++++-------
 .../airjnc/user/dao/mapper/UserMapper.java    |  8 ++---
 .../airjnc/user/dto/request/FindEmailDTO.java |  9 ++++--
 src/main/resources/mybatis/mapper/user.xml    |  2 +-
 .../user/controller/UserControllerTest.java   | 22 ++++++++++----
 .../dao/impl/MybatisUserRepositoryTest.java   | 15 ++++++++++
 .../airjnc/user/service/UserServiceTest.java  | 16 ++++++++--
 .../testutil/config/TestDatabaseConfig.java   | 20 +++++++++----
 .../testutil/fixture/CreateDTOFixture.java    |  8 ++---
 .../testutil/fixture/FindEmailDTOFixture.java | 12 ++++++++
 .../com/testutil/fixture/LogInDTOFixture.java |  5 +---
 .../com/testutil/fixture/UserDTOFixture.java  | 30 +++++--------------
 .../testutil/fixture/UserEntityFixture.java   |  2 +-
 14 files changed, 111 insertions(+), 69 deletions(-)
 create mode 100644 src/test/java/com/testutil/fixture/FindEmailDTOFixture.java

diff --git a/src/main/java/com/airjnc/user/dao/UserRepository.java b/src/main/java/com/airjnc/user/dao/UserRepository.java
index 61d90e8..54762de 100644
--- a/src/main/java/com/airjnc/user/dao/UserRepository.java
+++ b/src/main/java/com/airjnc/user/dao/UserRepository.java
@@ -6,14 +6,13 @@
 
 public interface UserRepository {
 
-  UserEntity findById(Long id);
+  void remove(Long id);
 
-  UserEntity findByEmail(String email);
+  UserEntity save(CreateDTO createDTO);
 
   String getEmail(FindEmailDTO findEmailDTO);
 
-  UserEntity save(CreateDTO createDTO);
-
+  UserEntity findByEmail(String email);
 
-  void remove(Long id);
+  UserEntity findById(Long id);
 }
diff --git a/src/main/java/com/airjnc/user/dao/impl/MybatisUserRepository.java b/src/main/java/com/airjnc/user/dao/impl/MybatisUserRepository.java
index b8204e6..7b56e9e 100644
--- a/src/main/java/com/airjnc/user/dao/impl/MybatisUserRepository.java
+++ b/src/main/java/com/airjnc/user/dao/impl/MybatisUserRepository.java
@@ -22,13 +22,16 @@ public class MybatisUserRepository implements UserRepository {
   private final UserModelMapper userModelMapper;
 
   @Override
-  public UserEntity findById(Long id) {
-    return userMapper.findById(id).orElseThrow(NotFoundException::new);
+  public void remove(Long id) {
+    int affect = userMapper.remove(id);
+    commonInternalCheckService.shouldBeMatch(affect, 1);
   }
 
   @Override
-  public UserEntity findByEmail(String email) {
-    return userMapper.findByEmail(email).orElseThrow(NotFoundException::new);
+  public UserEntity save(CreateDTO createDTO) {
+    int affect = userMapper.save(createDTO);
+    commonInternalCheckService.shouldBeMatch(affect, 1);
+    return userModelMapper.createDTOToUserEntity(createDTO);
   }
 
   @Override
@@ -37,15 +40,12 @@ public String getEmail(FindEmailDTO findEmailDTO) {
   }
 
   @Override
-  public UserEntity save(CreateDTO createDTO) {
-    int affect = userMapper.save(createDTO);
-    commonInternalCheckService.shouldBeMatch(affect, 1);
-    return userModelMapper.createDTOToUserEntity(createDTO);
+  public UserEntity findById(Long id) {
+    return userMapper.findById(id).orElseThrow(NotFoundException::new);
   }
 
   @Override
-  public void remove(Long id) {
-    int affect = userMapper.remove(id);
-    commonInternalCheckService.shouldBeMatch(affect, 1);
+  public UserEntity findByEmail(String email) {
+    return userMapper.findByEmail(email).orElseThrow(NotFoundException::new);
   }
 }
diff --git a/src/main/java/com/airjnc/user/dao/mapper/UserMapper.java b/src/main/java/com/airjnc/user/dao/mapper/UserMapper.java
index 277ff6a..b706b90 100644
--- a/src/main/java/com/airjnc/user/dao/mapper/UserMapper.java
+++ b/src/main/java/com/airjnc/user/dao/mapper/UserMapper.java
@@ -9,13 +9,13 @@
 @Mapper
 public interface UserMapper {
 
-  Optional<UserEntity> findById(Long id);
+  int remove(Long id);
 
-  Optional<UserEntity> findByEmail(String email);
+  int save(CreateDTO createDTO);
 
   Optional<String> getEmail(FindEmailDTO findEmailDTO);
 
-  int save(CreateDTO createDTO);
+  Optional<UserEntity> findById(Long id);
 
-  int remove(Long id);
+  Optional<UserEntity> findByEmail(String email);
 }
diff --git a/src/main/java/com/airjnc/user/dto/request/FindEmailDTO.java b/src/main/java/com/airjnc/user/dto/request/FindEmailDTO.java
index 48d40f2..cd8690d 100644
--- a/src/main/java/com/airjnc/user/dto/request/FindEmailDTO.java
+++ b/src/main/java/com/airjnc/user/dto/request/FindEmailDTO.java
@@ -3,11 +3,10 @@
 import com.airjnc.common.util.CommonRegex;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import lombok.Builder;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 
 @Getter
-@RequiredArgsConstructor
 public class FindEmailDTO {
 
   @NotNull
@@ -15,4 +14,10 @@ public class FindEmailDTO {
 
   @Pattern(regexp = CommonRegex.localDate)
   private final String birthDate;
+
+  @Builder
+  public FindEmailDTO(String name, String birthDate) {
+    this.name = name;
+    this.birthDate = birthDate;
+  }
 }
diff --git a/src/main/resources/mybatis/mapper/user.xml b/src/main/resources/mybatis/mapper/user.xml
index ab366b2..6b78100 100644
--- a/src/main/resources/mybatis/mapper/user.xml
+++ b/src/main/resources/mybatis/mapper/user.xml
@@ -16,7 +16,7 @@
     SELECT email
     FROM user
     WHERE name = #{name}
-      AND birthdate = ${birthDate};
+      AND birthdate = #{birthDate};
   </select>
   <select id="findById" resultType="UserEntity">
     SELECT *
diff --git a/src/test/java/com/airjnc/user/controller/UserControllerTest.java b/src/test/java/com/airjnc/user/controller/UserControllerTest.java
index b62b8f5..60ca45f 100644
--- a/src/test/java/com/airjnc/user/controller/UserControllerTest.java
+++ b/src/test/java/com/airjnc/user/controller/UserControllerTest.java
@@ -8,19 +8,22 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import com.airjnc.common.aspect.Advice;
 import com.airjnc.common.resolver.CurrentUserIdArgumentResolver;
 import com.airjnc.user.dto.request.CreateDTO;
+import com.airjnc.user.dto.request.FindEmailDTO;
 import com.airjnc.user.dto.response.UserDTO;
 import com.airjnc.user.service.UserService;
 import com.airjnc.user.service.UserStateService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.testutil.annotation.AopTest;
 import com.testutil.fixture.CreateDTOFixture;
+import com.testutil.fixture.FindEmailDTOFixture;
 import com.testutil.fixture.UserDTOFixture;
-import java.time.LocalDate;
+import com.testutil.fixture.UserEntityFixture;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
@@ -53,12 +56,19 @@ class UserControllerTest {
 
   @Test
   void findEmail() throws Exception {
-    LocalDate now = LocalDate.now();
+    //given
+    FindEmailDTO findEmailDTO = FindEmailDTOFixture.getBuilder().build();
+    given(userService.findEmail(any(FindEmailDTO.class))).willReturn(UserEntityFixture.EMAIL);
+    //when
     mockMvc.perform(
-        get("/users/findEmail")
-            .param("email", "hanjn2842@naver.com")
-            .param("birthDate", "2022-01-02")
-    ).andDo(print());
+            get("/users/findEmail")
+                .param("name", findEmailDTO.getName())
+                .param("birthDate", findEmailDTO.getBirthDate())
+        ).andDo(print())
+        .andExpect(status().isOk())
+        .andExpect(content().string(UserEntityFixture.EMAIL));
+    //then
+    then(userService).should(times(1)).findEmail(any(FindEmailDTO.class));
   }
 
   @Test
diff --git a/src/test/java/com/airjnc/user/dao/impl/MybatisUserRepositoryTest.java b/src/test/java/com/airjnc/user/dao/impl/MybatisUserRepositoryTest.java
index 07dc6a3..a83e65a 100644
--- a/src/test/java/com/airjnc/user/dao/impl/MybatisUserRepositoryTest.java
+++ b/src/test/java/com/airjnc/user/dao/impl/MybatisUserRepositoryTest.java
@@ -10,6 +10,7 @@
 import com.airjnc.user.domain.Gender;
 import com.airjnc.user.domain.UserEntity;
 import com.airjnc.user.dto.request.CreateDTO;
+import com.airjnc.user.dto.request.FindEmailDTO;
 import com.airjnc.user.util.UserModelMapper;
 import com.testutil.annotation.MybatisTest;
 import com.testutil.fixture.UserEntityFixture;
@@ -62,6 +63,20 @@ void findByEmail() {
     assertThat(findUser.getEmail()).isEqualTo(user.getEmail());
   }
 
+  @Test
+  void getEmail() {
+    //given
+    UserEntity user = UserEntityFixture.getBuilder().build();
+    FindEmailDTO findEmailDTO = FindEmailDTO.builder()
+        .name(user.getName())
+        .birthDate(user.getBirthDate().toString())
+        .build();
+    //when
+    String email = userRepository.getEmail(findEmailDTO);
+    //then
+    assertThat(email).isEqualTo(user.getEmail());
+  }
+
   @Test
   @Transactional
   void save() {
diff --git a/src/test/java/com/airjnc/user/service/UserServiceTest.java b/src/test/java/com/airjnc/user/service/UserServiceTest.java
index 7a24eda..03b82c9 100644
--- a/src/test/java/com/airjnc/user/service/UserServiceTest.java
+++ b/src/test/java/com/airjnc/user/service/UserServiceTest.java
@@ -9,10 +9,12 @@
 import com.airjnc.user.dao.UserRepository;
 import com.airjnc.user.domain.UserEntity;
 import com.airjnc.user.dto.request.CreateDTO;
+import com.airjnc.user.dto.request.FindEmailDTO;
 import com.airjnc.user.dto.response.UserDTO;
 import com.airjnc.user.util.UserModelMapper;
 import com.testutil.annotation.UnitTest;
 import com.testutil.fixture.CreateDTOFixture;
+import com.testutil.fixture.FindEmailDTOFixture;
 import com.testutil.fixture.UserDTOFixture;
 import com.testutil.fixture.UserEntityFixture;
 import org.junit.jupiter.api.Test;
@@ -38,7 +40,7 @@ class UserServiceTest {
   UserService userService;
 
   @Test()
-  void userShouldBeCreated() {
+  void create() {
     //given
     CreateDTO createDTO = spy(CreateDTOFixture.getBuilder().build());
     UserEntity userEntity = UserEntityFixture.getBuilder().build();
@@ -57,7 +59,7 @@ void userShouldBeCreated() {
   }
 
   @Test
-  void userShouldBeRemoved() {
+  void remove() {
     //given
     UserEntity userEntity = UserEntityFixture.getBuilder().build();
     //when
@@ -65,5 +67,15 @@ void userShouldBeRemoved() {
     //then
     then(userRepository).should(times(1)).remove(userEntity.getId());
   }
+
+  @Test
+  void findEmail() {
+    //given
+    FindEmailDTO findEmailDTO = FindEmailDTOFixture.getBuilder().build();
+    //when
+    userService.findEmail(findEmailDTO);
+    //then
+    then(userRepository).should(times(1)).getEmail(findEmailDTO);
+  }
 }
 
diff --git a/src/test/java/com/testutil/config/TestDatabaseConfig.java b/src/test/java/com/testutil/config/TestDatabaseConfig.java
index b8fef79..88d1703 100644
--- a/src/test/java/com/testutil/config/TestDatabaseConfig.java
+++ b/src/test/java/com/testutil/config/TestDatabaseConfig.java
@@ -36,19 +36,27 @@ DataSource dataSource() {
 
   private void clear(DriverManagerDataSource dataSource) {
     JdbcTemplate template = new JdbcTemplate(dataSource);
-    template.update("delete from `user` where `id` = 1");
+    template.update("delete from `user` where `id` = " + UserEntityFixture.ID);
   }
 
   private void initData(DriverManagerDataSource dataSource) {
     JdbcTemplate template = new JdbcTemplate(dataSource);
+    String sql =
+        "insert into `user` (id, email, password, name, gender, phone_number, address, is_active, birthdate, created_at, updated_at, deleted_at) "
+            + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
     UserEntity user = UserEntityFixture.getBuilder().build();
     template.update(
-        "insert into `user` (id, email, password, name, gender, phone_number, address, is_active," +
-            "birthdate, created_at, updated_at, deleted_at)" +
-            "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-        user.getId(), user.getEmail(), user.getPassword(), user.getName(), user.getGender().name(),
+        sql,
+        user.getId(),
+        user.getEmail(),
+        user.getPassword(),
+        user.getName(),
+        user.getGender().name(),
         user.getPhoneNumber(),
-        user.getAddress(), user.isActive(), user.getBirthDate(), user.getCreatedAt(),
+        user.getAddress(),
+        user.isActive(),
+        user.getBirthDate(),
+        user.getCreatedAt(),
         user.getUpdatedAt(),
         user.getDeletedAt()
     );
diff --git a/src/test/java/com/testutil/fixture/CreateDTOFixture.java b/src/test/java/com/testutil/fixture/CreateDTOFixture.java
index c98194e..4628f9b 100644
--- a/src/test/java/com/testutil/fixture/CreateDTOFixture.java
+++ b/src/test/java/com/testutil/fixture/CreateDTOFixture.java
@@ -5,15 +5,15 @@
 
 public class CreateDTOFixture {
 
-  public static final String EMAIL = "test@naver.com";
+  public static final String EMAIL = "test2@naver.com";
 
   public static final String PASSWORD = "q1w2e3r4!";
 
-  public static final String NAME = "testUser";
+  public static final String NAME = "testUser2";
 
-  public static final Gender GENDER = Gender.MALE;
+  public static final Gender GENDER = Gender.FEMALE;
 
-  public static final String birthDate = "2020-01-01";
+  public static final String birthDate = "2021-02-02";
 
   public static CreateDTO.CreateDTOBuilder getBuilder() {
     return CreateDTO.builder()
diff --git a/src/test/java/com/testutil/fixture/FindEmailDTOFixture.java b/src/test/java/com/testutil/fixture/FindEmailDTOFixture.java
new file mode 100644
index 0000000..67bdd45
--- /dev/null
+++ b/src/test/java/com/testutil/fixture/FindEmailDTOFixture.java
@@ -0,0 +1,12 @@
+package com.testutil.fixture;
+
+import com.airjnc.user.dto.request.FindEmailDTO;
+
+public class FindEmailDTOFixture {
+
+  public static FindEmailDTO.FindEmailDTOBuilder getBuilder() {
+    return FindEmailDTO.builder()
+        .name(UserEntityFixture.NAME)
+        .birthDate(UserEntityFixture.BIRTH_DATE.toString());
+  }
+}
diff --git a/src/test/java/com/testutil/fixture/LogInDTOFixture.java b/src/test/java/com/testutil/fixture/LogInDTOFixture.java
index e2eff59..5dbb65b 100644
--- a/src/test/java/com/testutil/fixture/LogInDTOFixture.java
+++ b/src/test/java/com/testutil/fixture/LogInDTOFixture.java
@@ -4,11 +4,8 @@
 
 public class LogInDTOFixture {
 
-  public static final String EMAIL = "test@naver.com";
-
-  public static final String PASSWORD = "q1w2e3r4!";
 
   public static LogInDTO.LogInDTOBuilder getBuilder() {
-    return LogInDTO.builder().email(EMAIL).password(PASSWORD);
+    return LogInDTO.builder().email(UserEntityFixture.EMAIL).password(UserEntityFixture.PASSWORD);
   }
 }
diff --git a/src/test/java/com/testutil/fixture/UserDTOFixture.java b/src/test/java/com/testutil/fixture/UserDTOFixture.java
index 915d103..8360c74 100644
--- a/src/test/java/com/testutil/fixture/UserDTOFixture.java
+++ b/src/test/java/com/testutil/fixture/UserDTOFixture.java
@@ -1,33 +1,17 @@
 package com.testutil.fixture;
 
-import com.airjnc.user.domain.Gender;
 import com.airjnc.user.dto.response.UserDTO;
-import java.time.LocalDate;
 
 public class UserDTOFixture {
 
-  public static final Long ID = 2L;
-
-  public static final String EMAIL = "test@naver.com";
-
-  public static final String NAME = "testUser";
-
-  public static final Gender GENDER = Gender.MALE;
-
-  public static final String PHONE_NUMBER = "010-1111-2222";
-
-  public static final String ADDRESS = "서울 강남구";
-
-  public static final LocalDate BIRTH_DATE = LocalDate.of(2000, 5, 15);
-
   public static UserDTO.UserDTOBuilder getBuilder() {
     return UserDTO.builder()
-        .id(ID)
-        .email(EMAIL)
-        .name(NAME)
-        .gender(GENDER)
-        .phoneNumber(PHONE_NUMBER)
-        .address(ADDRESS)
-        .birthDate(BIRTH_DATE);
+        .id(UserEntityFixture.ID)
+        .email(UserEntityFixture.EMAIL)
+        .name(UserEntityFixture.NAME)
+        .gender(UserEntityFixture.GENDER)
+        .phoneNumber(UserEntityFixture.PHONE_NUMBER)
+        .address(UserEntityFixture.ADDRESS)
+        .birthDate(UserEntityFixture.BIRTH_DATE);
   }
 }
diff --git a/src/test/java/com/testutil/fixture/UserEntityFixture.java b/src/test/java/com/testutil/fixture/UserEntityFixture.java
index 8a24a66..570d58d 100644
--- a/src/test/java/com/testutil/fixture/UserEntityFixture.java
+++ b/src/test/java/com/testutil/fixture/UserEntityFixture.java
@@ -23,7 +23,7 @@ public class UserEntityFixture {
 
   public static final boolean IS_ACTIVE = true;
 
-  public static final LocalDate BIRTH_DATE = LocalDate.of(2000, 5, 15);
+  public static final LocalDate BIRTH_DATE = LocalDate.of(2020, 1, 1);
 
   public static final LocalDateTime CREATED_AT = LocalDateTime.of(2022, 1, 1, 9, 0);