Use BuilddbConstants for role.

7 files changed, 26 insertions, 18 deletions

diff --git a/src/main/java/org/berzerkula/builddb/controllers/AccountController.java b/src/main/java/org/berzerkula/builddb/controllers/AccountController.java
index 896f586..81c3fb0 100644
--- a/src/main/java/org/berzerkula/builddb/controllers/AccountController.java
+++ b/src/main/java/org/berzerkula/builddb/controllers/AccountController.java
@@ -85,7 +85,7 @@ public class AccountController {
 			newUser.setEmail(registerDto.getEmail());
 			newUser.setPhone(registerDto.getPhone());
 			newUser.setAddress(registerDto.getAddress());
-			newUser.setRole("client");
+			newUser.setRole(BuilddbConstants.ROLE_CLIENT);
 			newUser.setCreatedAt(new Date());
 			newUser.setPassword(bCryptEncoder.encode(registerDto.getPassword()));
 
diff --git a/src/test/java/org/berzerkula/builddb/BuilddbApplicationAppUserTests.java b/src/test/java/org/berzerkula/builddb/BuilddbApplicationAppUserTests.java
index 5420acc..c77a12a 100644
--- a/src/test/java/org/berzerkula/builddb/BuilddbApplicationAppUserTests.java
+++ b/src/test/java/org/berzerkula/builddb/BuilddbApplicationAppUserTests.java
@@ -21,7 +21,7 @@ class BuilddbApplicationAppUserTests {
 	private String phone = "870-555-5555";
 	private String address = "612 Wolf Avenue";
 	private String password = "johndoesecret";
-	private String role = "client";
+	private String role = BuilddbConstants.ROLE_CLIENT;
 	private Date createdAt = new Date();
 
 	@Autowired
diff --git a/src/test/java/org/berzerkula/builddb/controllers/BuilddbAccountControllerTest.java b/src/test/java/org/berzerkula/builddb/controllers/BuilddbAccountControllerTest.java
index f96e129..7631980 100644
--- a/src/test/java/org/berzerkula/builddb/controllers/BuilddbAccountControllerTest.java
+++ b/src/test/java/org/berzerkula/builddb/controllers/BuilddbAccountControllerTest.java
@@ -1,5 +1,6 @@
 package org.berzerkula.builddb.controllers;
 
+import org.berzerkula.builddb.BuilddbConstants;
 import org.berzerkula.builddb.config.SecurityConfig;
 import org.berzerkula.builddb.models.AppUser;
 import org.berzerkula.builddb.repositories.AppUserRepository;
@@ -54,13 +55,13 @@ class BuilddbAccountControllerTest {
                 .andDo(print());
     }
 
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     @Test
     void shouldReturnProfileView() throws Exception {
 
         appUserRepository.deleteAll();
         AppUser appUser = new AppUser("John", "Doe", "test@berzerkula.org",
-                "555-555-5555", "612 Wolf Avenue", "password", "client");
+                "555-555-5555", "612 Wolf Avenue", "password", BuilddbConstants.ROLE_CLIENT);
         appUserRepository.save(appUser);
 
         this.mockMvc.perform(get("/profile")
@@ -133,7 +134,7 @@ class BuilddbAccountControllerTest {
 
         appUserRepository.deleteAll();
         AppUser appUser = new AppUser("John", "Doe", "test@berzerkula.org",
-                "555-555-5555", "612 Wolf Avenue", "password", "client");
+                "555-555-5555", "612 Wolf Avenue", "password", BuilddbConstants.ROLE_CLIENT);
         appUserRepository.save(appUser);
 
         mockMvc.perform(post("/register")
diff --git a/src/test/java/org/berzerkula/builddb/controllers/BuilddbDashboardControllerTest.java b/src/test/java/org/berzerkula/builddb/controllers/BuilddbDashboardControllerTest.java
index d0e5496..15c7188 100644
--- a/src/test/java/org/berzerkula/builddb/controllers/BuilddbDashboardControllerTest.java
+++ b/src/test/java/org/berzerkula/builddb/controllers/BuilddbDashboardControllerTest.java
@@ -1,5 +1,6 @@
 package org.berzerkula.builddb.controllers;
 
+import org.berzerkula.builddb.BuilddbConstants;
 import org.berzerkula.builddb.config.SecurityConfig;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +34,7 @@ class BuilddbDashboardControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="admin")
+    @WithMockUser(roles=BuilddbConstants.ROLE_ADMIN)
     void shouldReturnAdminView() throws Exception {
         this.mockMvc.perform(get("/admin"))
                 .andExpect(status().isOk())
@@ -42,7 +43,7 @@ class BuilddbDashboardControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldReturnClientView() throws Exception {
         this.mockMvc.perform(get("/client"))
                 .andExpect(status().isOk())
diff --git a/src/test/java/org/berzerkula/builddb/controllers/BuilddbPkgControllerTest.java b/src/test/java/org/berzerkula/builddb/controllers/BuilddbPkgControllerTest.java
index 778f336..462b365 100644
--- a/src/test/java/org/berzerkula/builddb/controllers/BuilddbPkgControllerTest.java
+++ b/src/test/java/org/berzerkula/builddb/controllers/BuilddbPkgControllerTest.java
@@ -1,5 +1,6 @@
 package org.berzerkula.builddb.controllers;
 
+import org.berzerkula.builddb.BuilddbConstants;
 import org.berzerkula.builddb.config.SecurityConfig;
 import org.berzerkula.builddb.models.Pkg;
 import org.berzerkula.builddb.repositories.TestH2PkgRepository;
@@ -33,7 +34,7 @@ class BuilddbPkgControllerTest {
     private MockMvc mockMvc;
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldReturnEmptyPackageListView() throws Exception {
         this.mockMvc.perform(get("/pkgs"))
                 .andExpect(status().isOk())
@@ -42,7 +43,7 @@ class BuilddbPkgControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldReturnAddPackageView() throws Exception {
 
         this.mockMvc.perform(get("/pkgs/add"))
@@ -52,7 +53,7 @@ class BuilddbPkgControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldReturnEditPackageView() throws Exception {
 
         Pkg pkg = new Pkg(1, "test", "1.2.3", "", "", "", "", "", "");
@@ -68,7 +69,7 @@ class BuilddbPkgControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldGetPopupWhenDeletePackage() throws Exception {
 
         Pkg pkg = new Pkg(1, "test", "1.2.3", "", "", "", "", "", "");
@@ -84,7 +85,7 @@ class BuilddbPkgControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldAddPkgValidationError() throws Exception {
         mockMvc.perform(post("/pkgs/add")
                         .with(csrf())
@@ -103,7 +104,7 @@ class BuilddbPkgControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldAddPkgSuccess() throws Exception {
         mockMvc.perform(post("/pkgs/add")
                         .with(csrf())
@@ -122,7 +123,7 @@ class BuilddbPkgControllerTest {
     }
 
     @Test
-    @WithMockUser(roles="client")
+    @WithMockUser(roles=BuilddbConstants.ROLE_CLIENT)
     void shouldEditPkgSuccess() throws Exception {
 
         Pkg pkg = new Pkg(123, "test", "1.2.3", "", "", "", "", "", "");
diff --git a/src/test/java/org/berzerkula/builddb/repositories/AppUserRepositoryTest.java b/src/test/java/org/berzerkula/builddb/repositories/AppUserRepositoryTest.java
index 59fa9f4..5be591f 100644
--- a/src/test/java/org/berzerkula/builddb/repositories/AppUserRepositoryTest.java
+++ b/src/test/java/org/berzerkula/builddb/repositories/AppUserRepositoryTest.java
@@ -1,6 +1,7 @@
 package org.berzerkula.builddb.repositories;
 
 import org.assertj.core.api.Assertions;
+import org.berzerkula.builddb.BuilddbConstants;
 import org.berzerkula.builddb.models.AppUser;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +18,7 @@ class AppUserRepositoryTest {
     void testCreateReadDelete() {
 
         AppUser appUser = new AppUser("John", "Doe", "john.doe@test.com", "", "",
-                "password","client");
+                "password", BuilddbConstants.ROLE_CLIENT);
 
         appUserRepository.save(appUser);
 
diff --git a/src/test/java/org/berzerkula/builddb/services/AppUserServiceTest.java b/src/test/java/org/berzerkula/builddb/services/AppUserServiceTest.java
index 2a21b56..044beb9 100644
--- a/src/test/java/org/berzerkula/builddb/services/AppUserServiceTest.java
+++ b/src/test/java/org/berzerkula/builddb/services/AppUserServiceTest.java
@@ -1,5 +1,6 @@
 package org.berzerkula.builddb.services;
 
+import org.berzerkula.builddb.BuilddbConstants;
 import org.berzerkula.builddb.models.AppUser;
 import org.berzerkula.builddb.repositories.AppUserRepository;
 import org.junit.jupiter.api.Test;
@@ -29,9 +30,12 @@ class AppUserServiceTest {
     void testFindByEmailAndNullOrNotNull() {
 
         List<AppUser> appUsers = new ArrayList<AppUser>();
-        AppUser one = new AppUser("John", "Doe", "john.doe@test.com", "", "", "password", "client");
-        AppUser two = new AppUser("John2", "Doe2", "john.doe2@test.com", "", "", "password", "client");
-        AppUser three = new AppUser("John3", "Doe3", "john.doe3@test.com", "", "", "password", "client");
+        AppUser one = new AppUser("John", "Doe", "john.doe@test.com", "", "",
+                "password", BuilddbConstants.ROLE_CLIENT);
+        AppUser two = new AppUser("John2", "Doe2", "john.doe2@test.com", "", "",
+                "password", BuilddbConstants.ROLE_CLIENT);
+        AppUser three = new AppUser("John3", "Doe3", "john.doe3@test.com", "", "",
+                "password", BuilddbConstants.ROLE_CLIENT);
 
         appUsers.add(one);
         appUsers.add(two);