Merge pull request #414 from Seluj78/chore/consistent-notifs

Consistent notification handling

Author: Seluj78

PyMatchaV2.postman_collection.json

@@ -7230,162 +7230,162 @@
 	],
 	"variable": [
 		{
-			"id": "3e50a45c-f7b6-4503-898e-7a2a319f21c6",
+			"id": "a4a1a2bf-3b0c-463b-8067-a3756f80cded",
 			"key": "host",
 			"value": "http://127.0.0.1:5000"
 		},
 		{
-			"id": "df25c64c-7f48-448e-8505-a0b970f3db0c",
+			"id": "962d0a9d-d340-41a9-a3cb-e3930824cf3d",
 			"key": "access_token",
 			"value": ""
 		},
 		{
-			"id": "6b4cdb7c-f052-4235-aba4-300e8ea5a78a",
+			"id": "cabb980b-4b51-410d-bd3b-482946bbb22c",
 			"key": "refresh_token",
 			"value": ""
 		},
 		{
-			"id": "02e0ebf1-a832-49eb-a738-7817f6281e58",
+			"id": "d5c4dc38-a6b1-4dc0-8144-ea9c86e794c8",
 			"key": "debug_token",
 			"value": "xX69jules69Xx"
 		},
 		{
-			"id": "2dcc1cbe-016f-4cd5-a595-d0a789158d39",
+			"id": "9b77ee58-359b-4388-9b8a-f5be2c6a0662",
 			"key": "id",
 			"value": "1541"
 		},
 		{
-			"id": "e8bb8541-cd39-456d-8f8a-6d974982c40b",
+			"id": "993d77e2-255e-4639-8843-52eb83e4680e",
 			"key": "first_name",
 			"value": "Jules"
 		},
 		{
-			"id": "12ea98a3-1c9f-463d-b820-c9803ae9eaad",
+			"id": "d6f8baa9-b3d2-490a-aced-e1ce6c6a1d24",
 			"key": "last_name",
 			"value": "Lasne"
 		},
 		{
-			"id": "c4335ab4-917c-4b59-9f35-19f9f4476d92",
+			"id": "97a68a89-2697-420d-b16a-8d513247eeac",
 			"key": "email",
 			"value": "jules.lasne@example.org"
 		},
 		{
-			"id": "6bb86094-ebb6-4795-852a-7aa813c9548a",
+			"id": "9a718a12-4761-4690-9ebb-0a0f6b6107fc",
 			"key": "username",
 			"value": "seluj78"
 		},
 		{
-			"id": "66ad79d0-1da1-4c86-856f-68b8cb9b543f",
+			"id": "2563b3e4-db96-4814-80c3-8e089892692c",
 			"key": "password",
 			"value": "dolphin"
 		},
 		{
-			"id": "2bfe0b20-7576-406d-925a-76ec05695a56",
+			"id": "bb0cac59-bdb3-4c90-a96e-a88250efc944",
 			"key": "orientation",
 			"value": "heterosexual"
 		},
 		{
-			"id": "7e307fe3-ad69-42a4-851e-c6054e88f533",
+			"id": "e69b1b19-6387-4718-b926-d0a440344f29",
 			"key": "gender",
 			"value": "male"
 		},
 		{
-			"id": "c30ca7ec-d669-4ca3-8736-9bfdcbb7492c",
+			"id": "c581783d-3eda-436c-850e-ffaa67e04c03",
 			"key": "bio",
 			"value": "Phasellus vel tortor vel elit scelerisque accumsan vel nec nunc. Ut condimentum vestibulum sapien non dictum. Vestibulum ac eleifend mi. Curabitur dictum vestibulum ex at placerat. Pellentesque odio mi, condimentum et sollicitudin at, finibus non leo. Aenean sed pulvinar nulla, nec tincidunt felis. Aenean nibh elit, aliquam sit amet lobortis et, pellentesque ut orci. Curabitur placerat sem id ex laoreet imperdiet. Curabitur dictum ac urna feugiat viverra. Vivamus nec pulvinar urna. Suspendisse vel ultrices est. Sed malesuada est vel orci venenatis scelerisque. Phasellus ultrices dignissim sapien, at mattis tellus mattis pulvinar. Sed ut euismod velit, id fermentum leo."
 		},
 		{
-			"id": "5df95083-a02d-42cc-adca-af2fc7f4a931",
+			"id": "12cd6fd2-ac21-4372-867b-618e6f96186b",
 			"key": "birthdate",
 			"value": "06/04/1998"
 		},
 		{
-			"id": "95044a57-47d6-4de8-85f1-7263e0341f79",
+			"id": "e73b6bb9-4c3b-4661-b187-2868d5690427",
 			"key": "first_name2",
 			"value": "Félix"
 		},
 		{
-			"id": "d2aae104-3ac8-435d-b506-9085c84dbdad",
+			"id": "bf6b4dc8-bf4e-44ce-a830-6b1e40ba19f7",
 			"key": "last_name2",
 			"value": "Ensal"
 		},
 		{
-			"id": "b6ff9c48-4fe5-4801-8349-7fdc764bf394",
+			"id": "66ae9be9-19aa-4b92-b987-f2feb4896383",
 			"key": "username2",
 			"value": "Ufree"
 		},
 		{
-			"id": "9d9fb357-9866-4da3-bfff-cec077624a25",
+			"id": "85c3053f-21b2-40a3-b162-9d9718df1a2f",
 			"key": "bio2",
 			"value": "Donec quis porttitor ante, ac pulvinar nulla. Vivamus dignissim, ipsum ultricies interdum suscipit, risus tellus auctor mi, eu auctor metus sem quis urna. In maximus placerat ipsum, nec sodales elit aliquet sed. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Phasellus malesuada velit felis, non volutpat ex bibendum at. Maecenas aliquet sodales quam at consequat. Sed faucibus consequat tempor. Fusce consequat eu sem non tempus. Duis dapibus nunc vel tempus semper. Pellentesque dignissim tellus odio, vel luctus ipsum suscipit quis. Curabitur id erat at quam varius fermentum non in massa."
 		},
 		{
-			"id": "3ad12943-7b1f-481f-b5a2-ead7d6402a58",
+			"id": "94669490-d468-4ba7-a0f0-d945957b518c",
 			"key": "gender2",
 			"value": "other"
 		},
 		{
-			"id": "f55b25d0-b708-47bd-a10f-922cb7b4f211",
+			"id": "71765231-44e2-40a4-a710-1c45cf639b48",
 			"key": "orientation2",
 			"value": "bisexual"
 		},
 		{
-			"id": "6f90d87b-f468-4417-9481-2102220b89b0",
+			"id": "e5b081e0-d30b-4298-9def-73d87b96a765",
 			"key": "birthdate2",
 			"value": "25/06/2000"
 		},
 		{
-			"id": "88b302d8-8018-457d-ae33-2ce511e3d4f5",
+			"id": "856b6bcb-b2db-4bb2-b55c-b993b4fd25f6",
 			"key": "email2",
 			"value": "felix.ensal@example.org"
 		},
 		{
-			"id": "7e4aeab9-c234-4ee1-8d0c-0e30c12b79ea",
+			"id": "2f47c53d-0d20-4c59-9b2e-a354b1079845",
 			"key": "password2",
 			"value": "dolphin2"
 		},
 		{
-			"id": "95f78452-7269-45f9-9202-879adc7feb60",
+			"id": "ca342d3c-7ac6-4cbb-ba4b-4b5c1a2cb8dc",
 			"key": "ip",
 			"value": "90.108.46.63"
 		},
 		{
-			"id": "f8e0b102-6fa0-405c-b684-ed2976662d36",
+			"id": "cf6a253d-c24c-47f9-8e73-88a74a3f6609",
 			"key": "lat",
 			"value": "49.5271"
 		},
 		{
-			"id": "d088bed1-37fe-4edc-9110-5a6c1fdadb78",
+			"id": "e337f153-6467-4f21-90c1-37ebcbea650d",
 			"key": "lng",
 			"value": "1.1885"
 		},
 		{
-			"id": "f02f943b-b835-46ea-8f92-ec51ad160ed0",
+			"id": "8d4d29af-38a6-4e00-878b-495182b12409",
 			"key": "my_msg_id",
 			"value": "-1"
 		},
 		{
-			"id": "a5380797-19c0-4b69-8632-d7eac317ed6e",
+			"id": "8c5cb5c3-47b4-4d70-b7f3-f2bcb621c962",
 			"key": "to_me_msg_id",
 			"value": "-1"
 		},
 		{
-			"id": "7455c588-11dd-455d-b0d6-e9d1b051e0c9",
+			"id": "b25b588c-989a-4497-aeef-d140bd1f7fef",
 			"key": "other_msg_id",
 			"value": "-1"
 		},
 		{
-			"id": "4ec2e211-56dc-4c5a-8fa5-1bd65a276129",
+			"id": "a9d9e751-155c-4e6d-a8db-d9eca88aeeb2",
 			"key": "user_access_token",
 			"value": ""
 		},
 		{
-			"id": "2f59a635-bacd-4d08-ad0d-44b3169b33d1",
+			"id": "d44c47f0-6ba9-4c3c-a233-66f504c28d10",
 			"key": "user_refresh_token",
 			"value": ""
 		},
 		{
-			"id": "f674942a-f096-4139-9947-02af7849a610",
+			"id": "fdbec5c8-98d1-4bff-8b33-f75ee2214b05",
 			"key": "notif_id",
 			"value": ""
 		}

backend/PyMatcha/models/like.py

@@ -38,7 +38,7 @@ class Like(Model):
 
     @staticmethod
     def create(
-        liker_id: int, liked_id: int, is_superlike: str = False, dt_liked: Optional[datetime.datetime] = None
+        liker_id: int, liked_id: int, is_superlike: bool = False, dt_liked: Optional[datetime.datetime] = None
     ) -> Like:
         if not dt_liked:
             dt_liked = datetime.datetime.utcnow()

backend/PyMatcha/routes/api/like.py

@@ -2,14 +2,14 @@
 from datetime import timedelta
 
 from flask import Blueprint
-from flask import current_app
 from flask import request
 from flask_jwt_extended import current_user
 from flask_jwt_extended import jwt_required
-from PyMatcha.models.like import Like
-from PyMatcha.models.match import Match
-from PyMatcha.models.notification import Notification
 from PyMatcha.models.user import get_user
+from PyMatcha.utils.action_notifs.like import do_like
+from PyMatcha.utils.action_notifs.like import do_match
+from PyMatcha.utils.action_notifs.like import do_superlike
+from PyMatcha.utils.action_notifs.like import do_unlike
 from PyMatcha.utils.decorators import validate_params
 from PyMatcha.utils.errors import BadRequestError
 from PyMatcha.utils.errors import NotFoundError
@@ -27,12 +27,12 @@ def like_profile(uid):
     is_superlike = request.get_json()["is_superlike"]
 
     try:
-        u = get_user(uid)
+        liked_user = get_user(uid)
     except NotFoundError:
         raise NotFoundError(f"User {uid} not found.")
-    if current_user.id == u.id:
+    if current_user.id == liked_user.id:
         raise BadRequestError("Cannot like yourself.")
-    if current_user.already_likes(u.id):
+    if current_user.already_likes(liked_user.id):
         raise BadRequestError("You already liked this person.")
 
     if is_superlike:
@@ -48,85 +48,32 @@ def like_profile(uid):
                 current_user.superlikes_reset_dt = datetime.utcnow() + timedelta(hours=12)
             current_user.save()
 
-    Like.create(liker_id=current_user.id, liked_id=u.id, is_superlike=is_superlike)
+    if is_superlike:
+        do_superlike(liker_user=current_user, liked_user_id=liked_user.id)
+    else:
+        do_like(liker_user=current_user, liked_user_id=liked_user.id)
 
-    if u.already_likes(current_user.id):
-        current_app.logger.debug(f"Creating match between user {current_user.id} and {u.id}")
-        Match.create(user_1=current_user.id, user_2=u.id)
-        Notification.create(
-            trigger_id=current_user.id,
-            user_id=u.id,
-            content=f"{current_user.first_name} liked you! Go check them out!",
-            type="like",
-            link_to=f"users/{current_user.id}",
-        )
-        Notification.create(
-            trigger_id=current_user.id,
-            user_id=u.id,
-            content=f"You and {current_user.first_name} matched!",
-            type="match",
-            link_to=f"conversation/{current_user.id}",
-        )
-        Notification.create(
-            trigger_id=u.id,
-            user_id=current_user.id,
-            content=f"You and {u.first_name} matched!",
-            type="match",
-            link_to=f"conversation/{u.id}",
-        )
+    if liked_user.already_likes(current_user.id):
+        do_match(liker_user=current_user, liked_user=liked_user)
         return Success("It's a match !")
 
     if is_superlike:
-        current_app.logger.debug(f"Creating superlike between user {current_user.id} and {u.id}")
-        Notification.create(
-            trigger_id=current_user.id,
-            user_id=u.id,
-            content=f"{current_user.first_name} superliked you 😏! Go check them out!",
-            type="superlike",
-            link_to=f"users/{current_user.id}",
-        )
         return Success("Superliked user.")
     else:
-        current_app.logger.debug(f"Creating like between user {current_user.id} and {u.id}")
-        Notification.create(
-            trigger_id=current_user.id,
-            user_id=u.id,
-            content=f"{current_user.first_name} liked you! Go check them out!",
-            type="like",
-            link_to=f"users/{current_user.id}",
-        )
         return Success("Liked user.")
 
 
 @like_bp.route("/unlike/<uid>", methods=["POST"])
 @jwt_required
 def unlike_profile(uid):
     try:
-        u = get_user(uid)
+        unliked_user = get_user(uid)
     except NotFoundError:
         raise NotFoundError(f"User {uid} not found.")
-    if current_user.id == u.id:
+    if current_user.id == unliked_user.id:
         raise BadRequestError("Cannot unlike yourself.")
-    if not current_user.already_likes(u.id):
+    if not current_user.already_likes(unliked_user.id):
         raise BadRequestError("You never liked this person in the first place.")
-    Like.get_multi(liked_id=u.id, liker_id=current_user.id).delete()
-    current_app.logger.debug(f"Deleting like between user {current_user.id} and {u.id}")
-
-    m1 = Match.get_multi(user_1=u.id, user_2=current_user.id)
-    m2 = Match.get_multi(user_1=current_user.id, user_2=u.id)
-
-    if m1:
-        current_app.logger.debug(f"Deleting match between user {current_user.id} and {u.id}")
-        m1.delete()
-    elif m2:
-        current_app.logger.debug(f"Deleting match between user {current_user.id} and {u.id}")
-        m2.delete()
-    Notification.create(
-        trigger_id=current_user.id,
-        user_id=u.id,
-        content=f"{current_user.first_name} unliked you.",
-        type="unlike",
-        link_to=None,
-    )
+    do_unlike(current_user, unliked_user.id)
 
     return Success("Unliked user.")

backend/PyMatcha/routes/api/messages.py

@@ -24,8 +24,9 @@
 from flask_jwt_extended import current_user
 from flask_jwt_extended import jwt_required
 from PyMatcha.models.message import Message
-from PyMatcha.models.notification import Notification
 from PyMatcha.models.user import get_user
+from PyMatcha.utils.action_notifs.message import do_like_message
+from PyMatcha.utils.action_notifs.message import do_message
 from PyMatcha.utils.decorators import validate_params
 from PyMatcha.utils.errors import BadRequestError
 from PyMatcha.utils.errors import NotFoundError
@@ -35,7 +36,6 @@
 from PyMatcha.utils.tasks import bot_respond_to_message
 from timeago import format as timeago_format
 
-
 REQUIRED_KEYS_NEW_MESSAGE = {"to_uid": str, "content": str}
 
 messages_bp = Blueprint("messages", __name__)
@@ -74,18 +74,10 @@ def send_message():
 
     if current_user.id == to_user.id:
         raise BadRequestError("Cannot send a message to yourself.")
-    current_app.logger.info(f"Sending message between {current_user.id} and {to_uid}")
-    current_user.send_message(to_id=to_user.id, content=content)
 
-    new_message = Message.get_multis(to_id=to_user.id, from_id=current_user.id)[-1]
+    do_message(from_user=current_user, to_user=to_user, content=content)
 
-    Notification.create(
-        trigger_id=current_user.id,
-        user_id=to_user.id,
-        content=f"{current_user.first_name} said: {content}",
-        type="message",
-        link_to=f"conversation/{current_user.id}",
-    )
+    new_message = Message.get_multis(to_id=to_user.id, from_id=current_user.id)[-1]
 
     if to_user.is_bot:
         new_message.is_seen = True
@@ -142,16 +134,8 @@ def like_message(message_id):
         raise BadRequestError("Cannot like a message that isn't destined to you.")
     if message.is_liked:
         raise BadRequestError("Message is already liked.")
-    current_app.logger.debug(f"Liking message {message_id}")
-    message.is_liked = True
-    message.save()
-    Notification.create(
-        trigger_id=current_user.id,
-        user_id=message.from_id,
-        content=f"{current_user.first_name} liked you message!",
-        type="message_like",
-        link_to=f"conversation/{current_user.id}",
-    )
+
+    do_like_message(message=message, liker=current_user, to_id=message.from_id)
     return Success(f"Liked message {message_id}.")