woowacourse · woowahanCU · Aug 3, 2019 · Jul 9, 2019 · Jul 9, 2019 · Jul 9, 2019
diff --git a/src/main/java/techcourse/myblog/config/ExceptionHandler.java b/src/main/java/techcourse/myblog/config/ExceptionHandler.java
@@ -4,6 +4,7 @@
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import techcourse.myblog.exception.ErrorMessage;
 import techcourse.myblog.exception.LoginException;
+import techcourse.myblog.exception.SignUpException;
 
 @ControllerAdvice
 public class ExceptionHandler {
@@ -13,4 +14,11 @@ public String handleLoginException(LoginException e, Model model) {
         model.addAttribute("error", errorMessage);
         return "login";
     }
+
+    @org.springframework.web.bind.annotation.ExceptionHandler(SignUpException.class)
+    public String handleSignUpException(SignUpException e, Model model) {
+        ErrorMessage errorMessage = new ErrorMessage(e.getMessage());
+        model.addAttribute("error", errorMessage);
+        return "signup";
+    }
 }
diff --git a/src/main/java/techcourse/myblog/exception/SignUpException.java b/src/main/java/techcourse/myblog/exception/SignUpException.java
@@ -0,0 +1,7 @@
+package techcourse.myblog.exception;
+
+public class SignUpException extends RuntimeException {
+    public SignUpException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/techcourse/myblog/validator/EmailConstraint.java b/src/main/java/techcourse/myblog/validator/EmailConstraint.java
@@ -7,7 +7,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target(ElementType.FIELD)
+@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint(validatedBy = EmailConstraintValidator.class)
 public @interface EmailConstraint {

diff --git a/src/main/java/techcourse/myblog/validator/EmailConstraintValidator.java b/src/main/java/techcourse/myblog/validator/EmailConstraintValidator.java
@@ -1,6 +1,8 @@
 package techcourse.myblog.validator;
 
 import techcourse.myblog.domain.UserRepository;
+import techcourse.myblog.exception.LoginException;
+import techcourse.myblog.exception.SignUpException;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
@@ -23,14 +25,6 @@ public boolean isValid(String value, ConstraintValidatorContext context) {
             return false;
         }
 
-        boolean isExist = userRepository.existsByEmail(value);
-        if (isExist) {
-            context.disableDefaultConstraintViolation();
-            context.buildConstraintViolationWithTemplate("이메일 중복")
-                    .addConstraintViolation();
-            return false;
-        }
-
-        return true;
+        return !userRepository.existsByEmail(value);
     }
 }
diff --git a/src/main/java/techcourse/myblog/web/UserController.java b/src/main/java/techcourse/myblog/web/UserController.java
@@ -2,13 +2,15 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import techcourse.myblog.exception.LoginException;
 import techcourse.myblog.domain.User;
 import techcourse.myblog.domain.UserRepository;
 import techcourse.myblog.dto.UserDto;
 import techcourse.myblog.dto.UserLoginDto;
 import techcourse.myblog.dto.UserResponseDto;
+import techcourse.myblog.exception.SignUpException;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -39,7 +41,10 @@ public String createSignForm() {
     }
 
     @PostMapping("/users")
-    public String saveUser(@Valid UserDto userDto, HttpSession httpSession) {
+    public String saveUser(@Valid UserDto userDto, BindingResult bindingResult, HttpSession httpSession) {
+        if (bindingResult.hasErrors()) {
+            throw new SignUpException("email 중복");
+        }
         User user = new User(userDto.getName(), userDto.getEmail(), userDto.getPassword());
         userRepository.save(user);
 

diff --git a/src/main/resources/templates/signup.html b/src/main/resources/templates/signup.html
@@ -4,6 +4,9 @@
 <head th:replace="signup-head :: signUpHead"></head>
 
 <body>
+<div th:unless="${error} == null" class="alert alert-danger" th:text="${error.errorMessage}">
+    Invalid username or password.
+</div>
 <div class="app">
     <div class="header navbar bg-transparent no-border">
         <div class="header-container pdd-right-15">