Merge branch 'master' of github.com:ramory-l/Matcha

ramory-l · Jan 6, 2021 · 283ae56 · 283ae56
2 parents 9599402 + aba61cb
commit 283ae56
Show file tree

Hide file tree

Showing 2 changed files with 14 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
@@ -68,6 +68,9 @@ public class UserController {
         Integer ageTo = nonNull(request.queryParams("ageto")) ? parseInt(request.queryParams("ageto")) : null;
         Integer rateTo = nonNull(request.queryParams("rateto")) ? parseInt(request.queryParams("rateto")) : null;
         Integer rateFrom = nonNull(request.queryParams("ratefrom")) ? parseInt(request.queryParams("ratefrom")) : null;
+        if (ageFrom < 0 || ageTo < 0) {
+            throw new NumberFormatException();
+        }
         FormDto formDto = new FormDto(
                 null,
                 Boolean.parseBoolean(request.queryParams("man")),
@@ -134,7 +137,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 +197,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()));