sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX::Corrected the UserDto name change in Userservice of server

Browse Source 
the references were still to UserDTO instead of the new UserDto
This commit is contained in:
Sem van der Hoeven
2019-03-17 19:22:59 +01:00
parent dd74a97c47
commit 01b4ac4287
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Server/src/main/java/greenify/server/service/UserService.java
View File

@@ -1,7 +1,7 @@
package greenify.server.service; package greenify.server.service;
import greenify.common.ApplicationException; import greenify.common.ApplicationException;
import greenify.common.UserDTO; import greenify.common.UserDto;
import greenify.server.data.model.User; import greenify.server.data.model.User;
import greenify.server.data.repository.UserRepository; import greenify.server.data.repository.UserRepository;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -21,7 +21,7 @@ public class UserService {
* @param password the password of the user * @param password the password of the user
* @return a userDTO of the registered user * @return a userDTO of the registered user
*/ */
public UserDTO registerUser(String name, String password) { public UserDto registerUser(String name, String password) {
User user = userRepository.findByName(name); User user = userRepository.findByName(name);
if (user != null) { if (user != null) {
throw new ApplicationException("User already exists"); throw new ApplicationException("User already exists");
@@ -29,7 +29,7 @@ public class UserService {
user = userRepository.save(new User(null, name, password, 0)); user = userRepository.save(new User(null, name, password, 0));
} }
logger.info("Created user id=" + user.getId() + ", name=" + user.getName()); logger.info("Created user id=" + user.getId() + ", name=" + user.getName());
return new UserDTO(user.getId(), user.getName()); return new UserDto(user.getId(), user.getName());
} }
@@ -39,7 +39,7 @@ public class UserService {
* @param password the password of the user * @param password the password of the user
* @return a userDTO of the logged in user * @return a userDTO of the logged in user
*/ */
public UserDTO loginUser(String name, String password) { public UserDto loginUser(String name, String password) {
User user = userRepository.findByName(name); User user = userRepository.findByName(name);
if (user == null) { if (user == null) {
throw new ApplicationException("User does not exist"); throw new ApplicationException("User does not exist");
@@ -48,7 +48,7 @@ public class UserService {
throw new ApplicationException("Wrong password"); throw new ApplicationException("Wrong password");
} }
} }
return new UserDTO(user.getId(), user.getName()); return new UserDto(user.getId(), user.getName());
} }
/** /**