diff --git a/doc/reports/checkstyle/20190403_checkstyle.JPG b/doc/reports/checkstyle/20190304_checkstyle.JPG similarity index 100% rename from doc/reports/checkstyle/20190403_checkstyle.JPG rename to doc/reports/checkstyle/20190304_checkstyle.JPG diff --git a/doc/reports/checkstyle/20191103_checkstyle.JPG b/doc/reports/checkstyle/20190311_checkstyle.JPG similarity index 100% rename from doc/reports/checkstyle/20191103_checkstyle.JPG rename to doc/reports/checkstyle/20190311_checkstyle.JPG diff --git a/doc/reports/checkstyle/20191803_checkstyle.JPG b/doc/reports/checkstyle/20190318_checkstyle.JPG similarity index 100% rename from doc/reports/checkstyle/20191803_checkstyle.JPG rename to doc/reports/checkstyle/20190318_checkstyle.JPG diff --git a/doc/reports/coverage/20190318_coverage.png b/doc/reports/coverage/20190318_coverage.png new file mode 100644 index 0000000..13ada5d Binary files /dev/null and b/doc/reports/coverage/20190318_coverage.png differ diff --git a/src/Server/src/main/java/greenify/server/service/UserService.java b/src/Server/src/main/java/greenify/server/service/UserService.java index 94ab431..311af22 100644 --- a/src/Server/src/main/java/greenify/server/service/UserService.java +++ b/src/Server/src/main/java/greenify/server/service/UserService.java @@ -27,7 +27,8 @@ public class UserService { public UserDto registerUser(String name, String password) { User user = userRepository.findByName(name); if (user == null) { - user = userRepository.save(new User(null, name, password, 0)); + user = new User(null, name, password, 0); + userRepository.save(user); } else { throw new ApplicationException("User already exists"); } diff --git a/src/Server/src/test/java/greenify/server/service/UserServiceTest.java b/src/Server/src/test/java/greenify/server/service/UserServiceTest.java index afd5550..a1ed76c 100644 --- a/src/Server/src/test/java/greenify/server/service/UserServiceTest.java +++ b/src/Server/src/test/java/greenify/server/service/UserServiceTest.java @@ -11,6 +11,7 @@ import greenify.server.data.repository.UserRepository; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.mock.mockito.MockBean; @@ -51,6 +52,13 @@ public class UserServiceTest { assertEquals(found.getName(), name); } + @Test + public void userRegisterTest() { + User user = new User(1L, "name", "password", 0); + UserDto registered = userService.registerUser(user.getName(), user.getPassword()); + assertEquals(registered.getName(), "name"); + } + @Test public void getAllUserTest() { assertEquals(userRepository.findAll(), userService.getAllUsers());