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 findById(Long id); + int remove(Long id); - Optional findByEmail(String email); + int save(CreateDTO createDTO); Optional getEmail(FindEmailDTO findEmailDTO); - int save(CreateDTO createDTO); + Optional findById(Long id); - int remove(Long id); + Optional 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};