Added history routes

Author: Seluj78

backend/PyMatcha/__init__.py

@@ -179,6 +179,7 @@
 from PyMatcha.routes.api.profile.images import images_bp
 from PyMatcha.routes.api.search import search_bp
 from PyMatcha.routes.api.profile.block import profile_block_bp
+from PyMatcha.routes.api.history import history_bp
 
 logging.debug("Registering Flask blueprints")
 application.register_blueprint(user_bp)
@@ -197,6 +198,7 @@
 application.register_blueprint(images_bp)
 application.register_blueprint(search_bp)
 application.register_blueprint(profile_block_bp)
+application.register_blueprint(history_bp)
 
 if application.debug:
     logging.debug("Registering debug route")

backend/PyMatcha/models/user.py

@@ -245,6 +245,9 @@ def get_views(self):
         logging.debug("Getting all views for user profile {}".format(self.id))
         return View.get_multis(profile_id=self.id)
 
+    def get_view_history(self):
+        return View.get_multis(viewer_id=self.id)
+
     def get_reports_received(self):
         logging.debug("Getting all reports received for user {}".format(self.id))
         return Report.get_multis(reported_id=self.id)

backend/PyMatcha/routes/api/history.py

@@ -0,0 +1,100 @@
+from flask import Blueprint
+from flask_jwt_extended import current_user
+from flask_jwt_extended import jwt_required
+from PyMatcha.models.user import User
+from PyMatcha.utils.match_score import _get_common_tags
+from PyMatcha.utils.match_score import _get_distance
+from PyMatcha.utils.success import SuccessOutput
+
+
+history_bp = Blueprint("history_bp", __name__)
+
+
+@history_bp.route("/history/viewed")
+@jwt_required
+def history_viewed_people():
+    views = current_user.get_view_history()
+    viewed_people = []
+    for view in views:
+        user = User.get(id=view.profile_id)
+        distance = _get_distance(current_user.geohash, user.geohash)
+        user_tags = [t.name for t in user.get_tags()]
+        current_user_tags = [t.name for t in current_user.get_tags()]
+        common_tags = _get_common_tags(current_user_tags, user_tags)
+        user_dict = user.to_dict()
+        user_dict["common_tags"] = common_tags
+        user_dict["distance"] = distance
+        viewed_people.append(user_dict)
+    return SuccessOutput("viewed", viewed_people)
+
+
+@history_bp.route("/history/viewed/me", methods=["GET"])
+@jwt_required
+def history_viewed_me():
+    views = current_user.get_views()
+    viewed_people = []
+    for view in views:
+        user = User.get(id=view.viewer_id)
+        distance = _get_distance(current_user.geohash, user.geohash)
+        user_tags = [t.name for t in user.get_tags()]
+        current_user_tags = [t.name for t in current_user.get_tags()]
+        common_tags = _get_common_tags(current_user_tags, user_tags)
+        user_dict = user.to_dict()
+        user_dict["common_tags"] = common_tags
+        user_dict["distance"] = distance
+        viewed_people.append(user_dict)
+    return SuccessOutput("viewed_me", viewed_people)
+
+
+@history_bp.route("/history/liked", methods=["GET"])
+@jwt_required
+def history_liked_people():
+    likes = current_user.get_likes_sent()
+    liked_people = []
+    for like in likes:
+        user = User.get(id=like.liked_id)
+        distance = _get_distance(current_user.geohash, user.geohash)
+        user_tags = [t.name for t in user.get_tags()]
+        current_user_tags = [t.name for t in current_user.get_tags()]
+        common_tags = _get_common_tags(current_user_tags, user_tags)
+        user_dict = user.to_dict()
+        user_dict["common_tags"] = common_tags
+        user_dict["distance"] = distance
+        liked_people.append(user_dict)
+    return SuccessOutput("liked", liked_people)
+
+
+@history_bp.route("/history/liked/me", methods=["GET"])
+@jwt_required
+def history_liked_me():
+    likes = current_user.get_likes_received()
+    liked_people = []
+    for like in likes:
+        user = User.get(id=like.liker_id)
+        distance = _get_distance(current_user.geohash, user.geohash)
+        user_tags = [t.name for t in user.get_tags()]
+        current_user_tags = [t.name for t in current_user.get_tags()]
+        common_tags = _get_common_tags(current_user_tags, user_tags)
+        user_dict = user.to_dict()
+        user_dict["common_tags"] = common_tags
+        user_dict["distance"] = distance
+        liked_people.append(user_dict)
+    return SuccessOutput("liked_me", liked_people)
+
+
+@history_bp.route("/history/blocked", methods=["GET"])
+@jwt_required
+def history_blocked():
+    blocks = current_user.get_blocks()
+    blocked_people = []
+    for block in blocks:
+        user = User.get(id=block.blocked_id)
+        distance = _get_distance(current_user.geohash, user.geohash)
+        user_tags = [t.name for t in user.get_tags()]
+        current_user_tags = [t.name for t in current_user.get_tags()]
+        common_tags = _get_common_tags(current_user_tags, user_tags)
+        user_dict = user.to_dict()
+        user_dict["common_tags"] = common_tags
+        user_dict["distance"] = distance
+        blocked_people.append(user_dict)
+    return SuccessOutput("liked_me", blocked_people)

backend/PyMatcha/routes/api/like.py

@@ -12,7 +12,6 @@
 from PyMatcha.utils.errors import BadRequestError
 from PyMatcha.utils.errors import NotFoundError
 from PyMatcha.utils.success import Success
-from PyMatcha.utils.success import SuccessOutput
 
 like_bp = Blueprint("like", __name__)
 
@@ -75,12 +74,3 @@ def unlike_profile(uid):
         raise BadRequestError("You never liked this person in the first place.")
     Like.get_multi(liked_id=u.id, liker_id=current_user.id).delete()
     return Success(f"Unliked user {u.id}.")
-
-
-@like_bp.route("/likes", methods=["GET"])
-@jwt_required
-def see_my_likes():
-    received = current_user.get_likes_received()
-    sent = current_user.get_likes_sent()
-    returned_dict = {"received": [r.to_dict() for r in received], "sent": [s.to_dict() for s in sent]}
-    return SuccessOutput("likes", returned_dict)

backend/PyMatcha/routes/api/profile/view.py

@@ -28,14 +28,6 @@
 profile_view_bp = Blueprint("profile_view", __name__)
 
 
-@profile_view_bp.route("/profile/views", methods=["GET"])
-@jwt_required
-def get_profile_views():
-    profile_views = current_user.get_views()
-    profile_views = [v.to_dict() for v in profile_views]
-    return SuccessOutput("views", profile_views)
-
-
 @profile_view_bp.route("/profile/view/<uid>", methods=["GET"])
 @jwt_required
 def view_profile(uid):