Registration fix, add user role

AlexP11223 · AlexP11223 · commit 5f3360358c4a · 2015-04-30T11:11:32.000+03:00
diff --git a/src/main/java/alexp/blog/model/User.java b/src/main/java/alexp/blog/model/User.java
@@ -47,7 +47,7 @@ public class User {
     @JoinTable(name = "users_roles",
             joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"),
             inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id"))
-    private Collection<Role> roles = new ArrayList<>();
+    private List<Role> roles = new ArrayList<>();
 
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "user")
     public List<Comment> comments = new ArrayList<>();;
@@ -88,11 +88,11 @@ public boolean isEnabled() {
         return enabled;
     }
 
-    public Collection<Role> getRoles() {
+    public List<Role> getRoles() {
         return roles;
     }
 
-    public void setRoles(Collection<Role> roles) {
+    public void setRoles(List<Role> roles) {
         this.roles = roles;
     }
 
diff --git a/src/main/java/alexp/blog/repository/RoleRepository.java b/src/main/java/alexp/blog/repository/RoleRepository.java
@@ -0,0 +1,9 @@
+package alexp.blog.repository;
+
+import alexp.blog.model.Role;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface RoleRepository extends JpaRepository<Role, Long> {
+
+    Role findByName(String name);
+}
diff --git a/src/main/java/alexp/blog/service/UserServiceImpl.java b/src/main/java/alexp/blog/service/UserServiceImpl.java
@@ -2,6 +2,7 @@
 
 import alexp.blog.model.Role;
 import alexp.blog.model.User;
+import alexp.blog.repository.RoleRepository;
 import alexp.blog.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
@@ -25,6 +26,9 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private UserRepository userRepository;
 
+    @Autowired
+    private RoleRepository roleRepository;
+
     @Autowired
     private PasswordEncoder passwordEncoder;
 
@@ -68,6 +72,8 @@ public boolean emailExists(String email) {
     public void register(User user) {
         user.setPassword(passwordEncoder.encode(user.getPassword()));
 
+        user.getRoles().add(roleRepository.findByName("ROLE_USER"));
+
         user.setEnabled(true);
 
         userRepository.saveAndFlush(user);
diff --git a/src/test/java/alexp/blog/service/UserServiceTest.java b/src/test/java/alexp/blog/service/UserServiceTest.java
@@ -2,6 +2,7 @@
 
 import alexp.blog.model.Role;
 import alexp.blog.model.User;
+import alexp.blog.repository.RoleRepository;
 import alexp.blog.repository.UserRepository;
 import org.junit.Before;
 import org.junit.Test;
@@ -26,9 +27,13 @@ public class UserServiceTest {
 
     public static final String NAME = "name";
     public static final String EMAIL = "email";
+
     @Mock
     private UserRepository userRepository;
 
+    @Mock
+    private RoleRepository roleRepository;
+
     @Mock
     private PasswordEncoder passwordEncoder;
 
@@ -86,13 +91,22 @@ public void shouldReturnNullWhenUsernameNotExists() {
 
     @Test
     public void shouldAddNewUser() {
+        Role role = new Role();
+
+        when(roleRepository.findByName(Matchers.anyString())).thenReturn(role);
+
         User user = new User();
 
         userService.register(user);
 
         assertThat(user.isEnabled(), is(equalTo(true)));
 
+        assertThat(user.getRoles().size(), is(equalTo(1)));
+        assertThat(user.getRoles().get(0), is(role));
+
         verify(userRepository, times(1)).saveAndFlush(user);
+
+        verify(roleRepository, times(1)).findByName(Matchers.anyString());
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public class User {`
`47`	`47`	`@JoinTable(name = "users_roles",`
`48`	`48`	`joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"),`
`49`	`49`	`inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id"))`
`50`		`- private Collection<Role> roles = new ArrayList<>();`
	`50`	`+ private List<Role> roles = new ArrayList<>();`
`51`	`51`
`52`	`52`	`@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "user")`
`53`	`53`	`public List<Comment> comments = new ArrayList<>();;`
`@@ -88,11 +88,11 @@ public boolean isEnabled() {`
`88`	`88`	`return enabled;`
`89`	`89`	`}`
`90`	`90`
`91`		`- public Collection<Role> getRoles() {`
	`91`	`+ public List<Role> getRoles() {`
`92`	`92`	`return roles;`
`93`	`93`	`}`
`94`	`94`
`95`		`- public void setRoles(Collection<Role> roles) {`
	`95`	`+ public void setRoles(List<Role> roles) {`
`96`	`96`	`this.roles = roles;`
`97`	`97`	`}`
`98`	`98`