improve search endpoint

ramory-l · Jan 5, 2021 · 855a238 · 855a238
1 parent 3087ee8
commit 855a238
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 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
@@ -64,14 +64,18 @@ public class UserController {
     };
 
     public static Route search = (request, response) -> {
+        Integer ageFrom = nonNull(request.queryParams("agefrom")) ? parseInt(request.queryParams("agefrom")) : null;
+        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;
         FormDto formDto = new FormDto(
                 null,
                 Boolean.parseBoolean(request.queryParams("man")),
                 Boolean.parseBoolean(request.queryParams("woman")),
-                parseInt(request.queryParams("agefrom")),
-                parseInt(request.queryParams("ageto")),
-                parseInt(request.queryParams("ratefrom")),
-                parseInt(request.queryParams("rateto")),
+                ageFrom,
+                ageTo,
+                rateFrom,
+                rateTo,
                 parseInt(request.queryParams("radius"))
         );
         String tags = request.queryParams("tags");

diff --git a/backend/src/main/java/ru/school/matcha/services/UserServiceImpl.java b/backend/src/main/java/ru/school/matcha/services/UserServiceImpl.java
@@ -55,7 +55,13 @@ public List<User> search(long userId, Form form, List<String> tags) {
                         if (user.getBirthday() != null) {
                             Date userBirthday = user.getBirthday();
                             int years = Years.yearsBetween(new DateTime(userBirthday), new DateTime()).getYears();
-                            if (years <= form.getAgeFrom() || years >= form.getAgeTo()) {
+                            if (isNull(form.getAgeFrom()) && isNull(form.getAgeTo())) {
+                                return false;
+                            }
+                            if (nonNull(form.getAgeFrom()) && years <= form.getAgeFrom()) {
+                                return false;
+                            }
+                            if (nonNull(form.getAgeTo()) && years >= form.getAgeTo()) {
                                 return false;
                             }
                         }