deal with userForm

Julien Iguchi-Cartigny
1 parent 0399d385
Showing 6 changed files with 54 additions and 47 deletions Show diff stats
src/main/java/fr/plil/sio/web/mvc/NewUserController.java
src/main/java/fr/plil/sio/web/mvc/User.java
src/main/java/fr/plil/sio/web/mvc/UserService.java
src/main/java/fr/plil/sio/web/mvc/UserServiceImpl.java
src/test/java/fr/plil/sio/web/mvc/NewUserControllerTest.java
src/test/java/fr/plil/sio/web/mvc/UserFormValidatorTest.java
@@ -2,6 +2,7 @@ package fr.plil.sio.web.mvc;
  
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
@@ -15,6 +16,9 @@ public class NewUserController {
     private UserRepository userRepository;
  
     @Resource
+    private UserService userService;
+
+    @Resource
     private UserSession userSession;
  
     @Resource
@@ -26,7 +30,8 @@ public class NewUserController {
     }
  
     @RequestMapping(value = {"/newUser"}, method = RequestMethod.POST)
-    public String postNewUser(User user, BindingResult result) {
+    public String postNewUser(@ModelAttribute("userForm") UserForm user,
+                              BindingResult result) {
  
         if (!userSession.getUsername().equals("admin")) {
             result.rejectValue("username", "new.user.only.admin");
@@ -44,7 +49,7 @@ public class NewUserController {
             return "newUser";
         }
  
-        userRepository.save(user);
+        userService.createUser(user.getUsername(), user.getPassword());
  
         return "redirect:/";
     }
@@ -60,4 +65,8 @@ public class NewUserController {
     public void setUserFormValidator(UserFormValidator userFormValidator) {
         this.userFormValidator = userFormValidator;
     }
+
+    public void setUserService(UserService userService) {
+        this.userService = userService;
+    }
 }
@@ -39,23 +39,4 @@ public class User {
     public void setPassword(String password) {
         this.password = password;
     }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final User other = (User) obj;
-        return !((this.username == null) ? (other.username != null) : !this.username.equals(other.username));
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 29 * hash + (this.username != null ? this.username.hashCode() : 0);
-        return hash;
-    }
 }
@@ -0,0 +1,6 @@
+package fr.plil.sio.web.mvc;
+
+public interface UserService {
+
+    User createUser(String username, String password);
+}
@@ -0,0 +1,23 @@
+package fr.plil.sio.web.mvc;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+@Service("userService")
+public class UserServiceImpl implements UserService {
+
+    @Resource
+    private UserRepository userRepository;
+
+    @Override
+    @Transactional
+    public User createUser(String username, String password) {
+        User user = new User();
+        user.setUsername(username);
+        user.setPassword(password);
+        userRepository.save(user);
+        return user;
+    }
+}
@@ -7,29 +7,29 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.servlet.ModelAndView;
  
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
  
 public class NewUserControllerTest {
  
     private NewUserController newUserController;
     private BindingResult results;
-    private User user;
+    private UserForm user;
     private UserRepository userRepository;
     private UserSession userSession;
     private UserFormValidator userFormValidator;
+    private UserService userService;
  
     @Before
     public void createInstances() {
         newUserController = new NewUserController();
-        user = new User();
+        user = new UserForm();
         results = new BeanPropertyBindingResult(user, "user");
         userRepository = mock(UserRepository.class);
-
         User user = new User("admin", "password");
         when(userRepository.findByUsername("admin")).thenReturn(user);
-
         newUserController.setUserRepository(userRepository);
+        userService = mock(UserService.class);
+        newUserController.setUserService(userService);
         userSession = new UserSession();
         userSession.setUsername("admin");
         newUserController.setUserSession(userSession);
@@ -49,16 +49,17 @@ public class NewUserControllerTest {
     @Test
     public void testPostNewUserSucceed() {
         user.setUsername("abc");
-        user.setPassword("abc");
+        user.setPassword("abcD#");
         String view = newUserController.postNewUser(user, results);
         assertFalse(results.hasErrors());
-        assertEquals("redirect:/",view);
+        assertEquals("redirect:/", view);
+        verify(userService).createUser("abc", "abcD#");
     }
  
     @Test
     public void testPostNewUserFailedNotAdmin() {
         user.setUsername("abc");
-        user.setPassword("abc");
+        user.setPassword("abcD#");
         userSession.setUsername("blabla");
         String view = newUserController.postNewUser(user, results);
         assertTrue(results.hasErrors());
@@ -10,22 +10,22 @@ import static org.junit.Assert.assertTrue;
  
 public class UserFormValidatorTest {
  
-    private User user;
+    private UserForm user;
     private UserFormValidator validator;
     private Errors results;
  
     @Before
     public void createInstances() {
         validator = new UserFormValidator();
-        user = new User();
+        user = new UserForm();
         user.setUsername("abc");
-        user.setPassword("abc");
+        user.setPassword("abc#A");
         results = new BeanPropertyBindingResult(user, "user");
     }
  
     @Test
     public void testSupports() {
-        assertTrue(validator.supports(User.class));
+        assertTrue(validator.supports(UserForm.class));
     }
  
     @Test
@@ -34,17 +34,4 @@ public class UserFormValidatorTest {
         assertFalse(results.hasErrors());
     }
  
-    @Test
-    public void testValidatePasswordTooShort() {
-        user.setPassword("ab");
-        validator.validate(user,results);
-        assertTrue(results.hasErrors());
-    }
-
-    @Test
-    public void testValidateUsernameTooShort() {
-        user.setUsername("ab");
-        validator.validate(user,results);
-        assertTrue(results.hasErrors());
-    }
 }