Merge pull request #347 from Seluj78/feature/block

Author: Seluj78

backend/PyMatcha/__init__.py

@@ -178,6 +178,7 @@
 from PyMatcha.routes.api.recommendations import recommendations_bp
 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
 
 logging.debug("Registering Flask blueprints")
 application.register_blueprint(user_bp)
@@ -195,6 +196,7 @@
 application.register_blueprint(recommendations_bp)
 application.register_blueprint(images_bp)
 application.register_blueprint(search_bp)
+application.register_blueprint(profile_block_bp)
 
 if application.debug:
     logging.debug("Registering debug route")

backend/PyMatcha/models/block.py

@@ -0,0 +1,46 @@
+"""
+    PyMatcha - A Python Dating Website
+    Copyright (C) 2018-2019 jlasne/gmorer
+    <jlasne@student.42.fr> - <lauris.skraucis@gmail.com>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+"""
+from __future__ import annotations
+
+import datetime
+import logging
+
+from PyMatcha.utils import create_blocks_table
+from PyMatcha.utils.orm import Field
+from PyMatcha.utils.orm import Model
+
+
+class Block(Model):
+    table_name = "blocks"
+
+    id = Field(int, modifiable=False)
+    blocker_id = Field(int)
+    blocked_id = Field(int)
+    dt_blocked = Field(datetime.datetime, fmt="%Y-%m-%d %H:%M:%S")
+
+    @staticmethod
+    def create(blocker_id: int, blocked_id: int, dt_blocked: datetime.datetime = datetime.datetime.utcnow()) -> Block:
+        new_blocked = Block(blocker_id=blocker_id, blocked_id=blocked_id, dt_blocked=dt_blocked)
+        new_blocked.save()
+        logging.debug("Creating new block")
+        return new_blocked
+
+    @classmethod
+    def create_table(cls):
+        create_blocks_table(cls.db)

backend/PyMatcha/models/user.py

@@ -26,6 +26,7 @@
 from typing import Optional
 
 import Geohash
+from PyMatcha.models.block import Block
 from PyMatcha.models.image import Image
 from PyMatcha.models.like import Like
 from PyMatcha.models.match import Match
@@ -204,6 +205,7 @@ def to_dict(self) -> Dict:
         returned_dict["likes"]["sent"] = [like.to_dict() for like in self.get_likes_sent()]
         returned_dict["likes"]["received"] = [like.to_dict() for like in self.get_likes_received()]
         returned_dict["last_seen"] = timeago_format(self.date_lastseen, datetime.datetime.utcnow())
+        returned_dict["blocks"] = [block.to_dict() for block in self.get_blocks()]
         returned_dict.pop("password")
         returned_dict.pop("previous_reset_token")
 
@@ -233,59 +235,34 @@ def get_jwt_info(self):
 
     def get_images(self):
         logging.debug("Getting all images for user {}".format(self.id))
-        image_list = Image.get_multis(user_id=self.id)
-        if not image_list:
-            return []
-        else:
-            return image_list
+        return Image.get_multis(user_id=self.id)
 
     def get_tags(self):
         logging.debug("Getting all tags for user {}".format(self.id))
-        tag_list = Tag.get_multis(user_id=self.id)
-        if not tag_list:
-            return []
-        else:
-            return tag_list
+        return Tag.get_multis(user_id=self.id)
 
     def get_views(self):
         logging.debug("Getting all views for user profile {}".format(self.id))
-        view_list = View.get_multis(profile_id=self.id)
-        if not view_list:
-            return []
-        else:
-            return view_list
+        return View.get_multis(profile_id=self.id)
 
     def get_reports_received(self):
         logging.debug("Getting all reports received for user {}".format(self.id))
-        reports_received_list = Report.get_multis(reported_id=self.id)
-        if not reports_received_list:
-            return []
-        else:
-            return reports_received_list
+        return Report.get_multis(reported_id=self.id)
 
     def get_reports_sent(self):
         logging.debug("Getting all reports sent for user {}".format(self.id))
-        reports_sent_list = Report.get_multis(reporter_id=self.id)
-        if not reports_sent_list:
-            return []
-        else:
-            return reports_sent_list
+        return Report.get_multis(reporter_id=self.id)
 
     def get_likes_received(self):
         logging.debug("Getting all likes received for user {}".format(self.id))
-        likes_received_list = Like.get_multis(liked_id=self.id)
-        if not likes_received_list:
-            return []
-        else:
-            return likes_received_list
+        return Like.get_multis(liked_id=self.id)
 
     def get_likes_sent(self):
         logging.debug("Getting all likes sent for user {}".format(self.id))
-        likes_sent_list = Like.get_multis(liker_id=self.id)
-        if not likes_sent_list:
-            return []
-        else:
-            return likes_sent_list
+        return Like.get_multis(liker_id=self.id)
+
+    def get_blocks(self):
+        return Block.get_multis(blocker_id=self.id)
 
     def already_likes(self, liked_id: int) -> bool:
         with self.db.cursor() as c:

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

@@ -0,0 +1,62 @@
+"""
+    PyMatcha - A Python Dating Website
+    Copyright (C) 2018-2019 jlasne/gmorer
+    <jlasne@student.42.fr> - <lauris.skraucis@gmail.com>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+"""
+from flask import Blueprint
+from flask_jwt_extended import current_user
+from flask_jwt_extended import jwt_required
+from PyMatcha.models.block import Block
+from PyMatcha.models.user import get_user
+from PyMatcha.utils.errors import BadRequestError
+from PyMatcha.utils.errors import NotFoundError
+from PyMatcha.utils.success import Success
+
+profile_block_bp = Blueprint("profile_block", __name__)
+
+
+@profile_block_bp.route("/profile/block/<uid>", methods=["POST"])
+@jwt_required
+def block_profile(uid):
+    try:
+        u = get_user(uid)
+    except NotFoundError:
+        raise NotFoundError(f"User {uid} not found.")
+    if current_user.id == u.id:
+        raise BadRequestError("Cannot block yourself.")
+    try:
+        Block.get_multi(blocker_id=current_user.id, blocked_id=u.id)
+    except NotFoundError:
+        Block.create(blocker_id=current_user.id, blocked_id=u.id)
+        return Success(f"Successfully blocked {u.email}.")
+    else:
+        return BadRequestError("You already blocked this user.")
+
+
+@profile_block_bp.route("/profile/unblock/<uid>", methods=["POST"])
+@jwt_required
+def unblock_profile(uid):
+    try:
+        u = get_user(uid)
+    except NotFoundError:
+        raise NotFoundError(f"User {uid} not found.")
+    try:
+        block = Block.get_multi(blocker_id=current_user.id, blocked_id=u.id)
+    except NotFoundError:
+        raise BadRequestError("You didn't block this user.")
+    else:
+        block.delete()
+        return Success("Unblock successful.")

backend/PyMatcha/routes/api/search.py

@@ -43,12 +43,15 @@ def search():
     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()]
+    blocked_ids = [u.blocked_id for u in current_user.get_blocks()]
     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
+        if user.id in blocked_ids:
+            continue
 
         user_age = (
             today.year - user.birthdate.year - ((today.month, today.day) < (user.birthdate.month, user.birthdate.day))
@@ -84,7 +87,6 @@ def search():
             common_tags = _get_common_tags(tags, user_tags)
             if not common_tags:
                 # No tags has been found
-                common_tags = []
                 continue
 
         user_dict = user.to_dict()

backend/PyMatcha/utils/__init__.py

@@ -1,4 +1,5 @@
 from PyMatcha.utils.password import hash_password
+from PyMatcha.utils.tables import _create_blocks_table
 from PyMatcha.utils.tables import _create_images_table
 from PyMatcha.utils.tables import _create_likes_table
 from PyMatcha.utils.tables import _create_matches_table
@@ -17,6 +18,7 @@
 create_matches_table = _create_matches_table
 create_messages_table = _create_messages_table
 create_images_table = _create_images_table
+create_blocks_table = _create_blocks_table
 
 __all__ = [
     "hash_password",
@@ -29,4 +31,5 @@
     "create_matches_table",
     "create_messages_table",
     "create_images_table",
+    "create_blocks_table",
 ]

backend/PyMatcha/utils/recommendations.py

@@ -35,12 +35,16 @@ def create_user_recommendations(user_to_update):
 
     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()]
+    blocked_ids = [u.blocked_id for u in user_to_update.get_blocks()]
 
     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
+        if user.id in blocked_ids:
+            continue
+
         score = 0
 
         distance = _get_distance(user_to_update.geohash, user.geohash)

backend/PyMatcha/utils/tables.py

@@ -200,6 +200,25 @@ def _create_images_table(db):
         c.close()
 
 
+def _create_blocks_table(db):
+    with db.cursor() as c:
+        logging.info("Creating table blocks.")
+        c.execute(DISABLE_SQL_NOTES)
+        c.execute(
+            """
+        CREATE TABLE IF NOT EXISTS blocks
+        (
+        id            INT auto_increment PRIMARY KEY,
+        blocker_id    INT NOT NULL,
+        blocked_id    INT NOT NULL,
+        dt_blocked    DATETIME DEFAULT NOW()
+        ) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci ;
+        """
+        )
+        c.execute(ENABLE_SQL_NOTES)
+        c.close()
+
+
 def create_tables(db):
     _create_user_table(db)
     _create_tags_table(db)
@@ -209,3 +228,4 @@ def create_tables(db):
     _create_matches_table(db)
     _create_messages_table(db)
     _create_images_table(db)
+    _create_blocks_table(db)