From da46582fc0b704ac6b2e03ca2144ec4ae1871d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Wed, 23 Dec 2020 13:48:26 +0100 Subject: [PATCH] Added check for admin user and test it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Woźniak --- .../com/plannaplan/services/UserService.java | 4 ++++ .../plannaplan/services/UserServiceTest.java | 17 +++++++++++++++++ .../controllers/ConfigController.java | 5 +++++ 3 files changed, 26 insertions(+) diff --git a/buisnesslogic/src/main/java/com/plannaplan/services/UserService.java b/buisnesslogic/src/main/java/com/plannaplan/services/UserService.java index 9192490..62a3325 100755 --- a/buisnesslogic/src/main/java/com/plannaplan/services/UserService.java +++ b/buisnesslogic/src/main/java/com/plannaplan/services/UserService.java @@ -85,4 +85,8 @@ public class UserService { return this.repo.getByRefreshToken(refreshToken); } + public boolean adminExists(){ + return this.repo.getAllByRole(UserRoles.ADMIN).size() > 0; + } + } \ No newline at end of file diff --git a/buisnesslogic/src/test/java/com/plannaplan/services/UserServiceTest.java b/buisnesslogic/src/test/java/com/plannaplan/services/UserServiceTest.java index fb047e7..9e6cd45 100755 --- a/buisnesslogic/src/test/java/com/plannaplan/services/UserServiceTest.java +++ b/buisnesslogic/src/test/java/com/plannaplan/services/UserServiceTest.java @@ -100,4 +100,21 @@ public class UserServiceTest { assertTrue(user.getName() != "Tom"); } + + @Test + public void shouldReturnAdminExists() { + final String email = "shouldReturnAdminExists@UserService.test"; + this.userService.save(new User("AdminTom", "Smieszny", email, UserRoles.ADMIN)); + assertTrue(userService.adminExists()); + } + + @Test + /** + * In future can fail the test due to create a admin user in the another tests. + */ + public void shouldReturnNotAdminExists() { + final String email = "shouldReturnNotAdminExists@UserService.test"; + this.userService.save(new User("StudentTom", "Smieszny", email, UserRoles.STUDENT)); + assertTrue(userService.adminExists() == false); + } } diff --git a/restservice/src/main/java/com/plannaplan/controllers/ConfigController.java b/restservice/src/main/java/com/plannaplan/controllers/ConfigController.java index f6fc8df..432e416 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/ConfigController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/ConfigController.java @@ -63,4 +63,9 @@ public class ConfigController { } } + public ResponseEntity initAdmin(@RequestParam("ticket") String ticket){ + + return null; + } + } \ No newline at end of file