diff --git a/src/main/java/ru/ulstu/SeminarApplication.java b/src/main/java/ru/ulstu/SeminarApplication.java index 072438e..8f9ee5c 100644 --- a/src/main/java/ru/ulstu/SeminarApplication.java +++ b/src/main/java/ru/ulstu/SeminarApplication.java @@ -24,5 +24,8 @@ public class SeminarApplication { public void doSomethingAfterStartup() { System.out.println("hello world, I have just started up"); userService.initDefaultAdmin(); + userService.initDefaultAspirant(); + userService.initDefaultHead(); + userService.initDefaultManager(); } } diff --git a/src/main/java/ru/ulstu/user/UserService.java b/src/main/java/ru/ulstu/user/UserService.java index c8c9f43..0911e41 100644 --- a/src/main/java/ru/ulstu/user/UserService.java +++ b/src/main/java/ru/ulstu/user/UserService.java @@ -64,11 +64,26 @@ public class UserService implements UserDetailsService { return user; } - public void initDefaultAdmin() { - String adminLogin = "admin"; - if (getUserByLogin(adminLogin) == null) { - UserRole adminRole = userRoleRepository.save(new UserRole(UserRoleConstants.ADMIN)); - createUser(new User(adminLogin, adminPassword, Set.of(adminRole))); + private void createDefaultUser(String login, String userRole) { + if (getUserByLogin(login) == null) { + UserRole role = userRoleRepository.save(new UserRole(userRole.toString())); + createUser(new User(login, login.equals("admin") ? adminPassword : login, Set.of(role))); } } + + public void initDefaultAdmin() { + createDefaultUser("admin", UserRoleConstants.ADMIN); + } + + public void initDefaultAspirant() { + createDefaultUser("aspirant", UserRoleConstants.ASPIRANT); + } + + public void initDefaultManager() { + createDefaultUser("manager", UserRoleConstants.MANAGER); + } + + public void initDefaultHead() { + createDefaultUser("head", UserRoleConstants.HEAD); + } } diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index e04a8d6..eab1e38 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -32,7 +32,7 @@ -