fix logs

ramory-l · Jan 6, 2021 · ab33b20 · ab33b20
1 parent eb80d5d
commit ab33b20
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/backend/src/main/java/ru/school/matcha/controllers/UserController.java b/backend/src/main/java/ru/school/matcha/controllers/UserController.java
@@ -134,7 +134,7 @@ public class UserController {
         String hash = request.params("hash");
         userService.updatePassword(hash);
         response.status(Response.GET.getStatus());
-        return "";
+        return "Password edited";
     };
 
     public static Route getMatcha = (request, response) -> {
@@ -194,7 +194,7 @@ public class UserController {
         String hash = request.params("hash");
         userService.verified(hash);
         response.status(Response.GET.getStatus());
-        return "";
+        return "Profile verified";
     };
 
     public static Route addToBlackList = (request, response) -> {

diff --git a/backend/src/main/java/ru/school/matcha/services/UserServiceImpl.java b/backend/src/main/java/ru/school/matcha/services/UserServiceImpl.java
@@ -122,6 +122,15 @@ public List<User> getMatcha(Long id) {
     public Long createUser(User user) {
         checkAllDataForNewUser(user);
         String username = user.getUsername();
+        String email = user.getEmail();
+        try {
+            getUserByUsername(username);
+            throw new MatchaException("User with username already exist");
+        } catch (NotFoundException ignored) {}
+        try {
+            getUserByEmail(email);
+            throw new MatchaException("User with email already exist");
+        } catch (NotFoundException ignored) {}
         try {
             try {
                 user.setPassword(PasswordCipher.generateStrongPasswordHash(user.getPassword()));