Merge pull request #300 from Seluj78/feature/298-ignore-matched-users

Added ignoring of matched and liked users

Author: Seluj78

backend/PyMatcha/routes/api/search.py

@@ -38,8 +38,15 @@ def search():
     today = datetime.datetime.utcnow()
 
     query = _get_gender_query(current_user.orientation, current_user.gender)
+    matches_id = [match.id for match in current_user.get_matches()]
+    likes_sent_user_ids = [like.liked_id for like in current_user.get_likes_sent()]
     returned_list = []
     for user in query:
+        if user.id == current_user.id:
+            continue
+        if user.id in matches_id or user.id in likes_sent_user_ids:
+            continue
+
         user_age = (
             today.year - user.birthdate.year - ((today.month, today.day) < (user.birthdate.month, user.birthdate.day))
         )

backend/PyMatcha/utils/recommendations.py

@@ -32,9 +32,15 @@ def create_user_recommendations(user_to_update):
 
     if not query:
         return
+
+    matches_id = [match.id for match in user_to_update.get_matches()]
+    likes_sent_user_ids = [like.liked_id for like in user_to_update.get_likes_sent()]
+
     for user in query:
         if user.id == user_to_update.id:
             continue
+        if user.id in matches_id or user.id in likes_sent_user_ids:
+            continue
         score = 0
 
         distance = _get_distance(user_to_update.geohash, user.geohash)