Commit df19c24

committed

Added roles

1 parent 089843c commit df19c24Copy full SHA for df19c24

File tree

+29

-1

lines changed

src/main/java/com/naturalprogrammer/spring5tutorial
- domain
  - User.java
- services
  - UserServiceImpl.java

+29

-1

lines changed

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,14 @@`
`1`	`1`	`package com.naturalprogrammer.spring5tutorial.domain;`
`2`	`2`
	`3`	`+import java.util.Collection;`
	`4`	`+import java.util.HashSet;`
	`5`	`+`
`3`	`6`	`import javax.persistence.Column;`
	`7`	`+import javax.persistence.ElementCollection;`
`4`	`8`	`import javax.persistence.Entity;`
	`9`	`+import javax.persistence.EnumType;`
	`10`	`+import javax.persistence.Enumerated;`
	`11`	`+import javax.persistence.FetchType;`
`5`	`12`	`import javax.persistence.GeneratedValue;`
`6`	`13`	`import javax.persistence.Id;`
`7`	`14`	`import javax.persistence.Table;`
`@@ -10,6 +17,10 @@`
`10`	`17`	`@Table(name="usr")`
`11`	`18`	`public class User {`
`12`	`19`
	`20`	`+ public static enum Role {`
	`21`	`+ UNVERIFIED, ADMIN, BLOCKED`
	`22`	`+ }`
	`23`	`+`
`13`	`24`	`@Id`
`14`	`25`	`@GeneratedValue`
`15`	`26`	`private Long id;`
`@@ -22,6 +33,10 @@ public class User {`
`22`	`33`
`23`	`34`	`@Column(nullable=false)`
`24`	`35`	`private String password;`
	`36`	`+`
	`37`	`+ @ElementCollection(fetch = FetchType.EAGER)`
	`38`	`+ @Enumerated(EnumType.STRING)`
	`39`	`+ private Collection<Role> roles = new HashSet<Role>();`
`25`	`40`
`26`	`41`	`public Long getId() {`
`27`	`42`	`return id;`
`@@ -54,4 +69,12 @@ public String getPassword() {`
`54`	`69`	`public void setPassword(String password) {`
`55`	`70`	`this.password = password;`
`56`	`71`	`}`
	`72`	`+`
	`73`	`+ public Collection<Role> getRoles() {`
	`74`	`+ return roles;`
	`75`	`+ }`
	`76`	`+`
	`77`	`+ public void setRoles(Collection<Role> roles) {`
	`78`	`+ this.roles = roles;`
	`79`	`+ }`
`57`	`80`	`}`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`import org.springframework.stereotype.Service;`
`4`	`4`
`5`	`5`	`import com.naturalprogrammer.spring5tutorial.commands.UserCommand;`
	`6`	`+import com.naturalprogrammer.spring5tutorial.domain.User;`
	`7`	`+import com.naturalprogrammer.spring5tutorial.domain.User.Role;`
`6`	`8`	`import com.naturalprogrammer.spring5tutorial.repositories.UserRepository;`
`7`	`9`
`8`	`10`	`@Service("userService")`
`@@ -20,6 +22,9 @@ public UserServiceImpl(UserRepository userRepository) {`
`20`	`22`	`@Override`
`21`	`23`	`public void signup(UserCommand userCommand) {`
`22`	`24`
`23`		`- userRepository.save(userCommand.toUser());`
	`25`	`+ User user = userCommand.toUser();`
	`26`	`+ user.getRoles().add(Role.UNVERIFIED);`
	`27`	`+`
	`28`	`+ userRepository.save(user);`
`24`	`29`	`}`
`25`	`30`	`}`

Comments

(0)