Merge pull request #322 from Seluj78/feature/minmax-search

Added minmax search route + added common tags in search route

Author: Seluj78

backend/PyMatcha/routes/api/search.py

@@ -1,15 +1,18 @@
 import datetime
+import json
 
 from flask import Blueprint
 from flask import request
 from flask_jwt_extended import current_user
 from flask_jwt_extended import jwt_required
+from PyMatcha import redis
 from PyMatcha.utils.decorators import validate_params
 from PyMatcha.utils.errors import BadRequestError
 from PyMatcha.utils.match_score import _get_common_tags
 from PyMatcha.utils.match_score import _get_distance
 from PyMatcha.utils.match_score import _get_gender_query
 from PyMatcha.utils.success import SuccessOutput
+from PyMatcha.utils.tasks import calc_search_min_max
 
 search_bp = Blueprint("search", __name__)
 
@@ -71,16 +74,29 @@ def search():
                 if max_distance != -1:
                     continue
         else:
+            distance = -1
             if max_distance != -1:
                 raise BadRequestError("user needs to sets his location first")
 
         user_tags = [t.name for t in user.get_tags()]
         common_tags = _get_common_tags(tags, user_tags)
         if not common_tags:
+            common_tags = []
             if tags:
                 continue
 
         user_dict = user.to_dict()
-        user_dict.update({"distance": distance, "common_tags": common_tags})
+        user_dict["distance"] = distance
+        user_dict["common_tags"] = common_tags
         returned_list.append(user_dict)
     return SuccessOutput("search_results", returned_list)
+
+
+@search_bp.route("/search/values", methods=["GET"])
+def get_min_maxes_values():
+    try:
+        minmax = json.loads(redis.get("search_minmax"))
+    except TypeError:
+        calc_search_min_max()
+        minmax = json.loads(redis.get("search_minmax"))
+    return SuccessOutput("search_minmax", minmax)

backend/PyMatcha/utils/tasks.py

@@ -1,4 +1,5 @@
 import datetime
+import json
 import logging
 from math import ceil
 
@@ -22,6 +23,9 @@ def setup_periodic_tasks(sender, **kwargs):
     sender.add_periodic_task(60, update_offline_users.s(), name="Update online users every minute")
     sender.add_periodic_task(3600, update_heat_scores.s(), name="Update heat scores every hour")
     sender.add_periodic_task(60, update_user_recommendations.s(), name="Update user recommendations every minute")
+    sender.add_periodic_task(
+        600, calc_search_min_max.s(), name="Update Minimum and Maximum scores and ages for search every 10 minutes"
+    )
 
 
 @celery.task
@@ -111,3 +115,28 @@ def update_user_recommendations():
 @celery.task
 def set_user_superlikes(user_id, amount=5):
     redis.set(f"superlikes:{user_id}", amount)
+
+
+@celery.task
+def calc_search_min_max():
+    min_score = 9999
+    max_score = 0
+    min_age = 100
+    max_age = 0
+    for user in User.select_all():
+        if user.heat_score > max_score:
+            max_score = user.heat_score
+        if user.heat_score < min_score:
+            min_score = user.heat_score
+
+        today = datetime.datetime.utcnow()
+
+        age = today.year - user.birthdate.year - ((today.month, today.day) < (user.birthdate.month, user.birthdate.day))
+
+        if age > max_age:
+            max_age = age
+        if age < min_age:
+            min_age = age
+    minmax = {"min_score": min_score, "max_score": max_score, "min_age": min_age, "max_age": max_age}
+    redis.set("search_minmax", json.dumps(minmax))
+    return "Successfully updated min and max ages and scores"