Merge branch '387-notifications' of https://github.com/Seluj78/PyMatcha into 387-notifications

Author: supalarry

backend/PyMatcha/utils/bot_actions.py

@@ -10,6 +10,7 @@
 from PyMatcha.models.like import Like
 from PyMatcha.models.match import Match
 from PyMatcha.models.message import Message
+from PyMatcha.models.notification import Notification
 from PyMatcha.models.user import User
 from PyMatcha.models.view import View
 from PyMatcha.utils.recommendations import create_user_recommendations
@@ -60,10 +61,30 @@ def _botaction_like(bot_user: User, recommendations):
         return
     user_to_like = User.get(id=user_to_like["id"])
     View.create(profile_id=user_to_like.id, viewer_id=bot_user.id)
+    Notification.create(
+        trigger_id=bot_user.id,
+        user_id=user_to_like["id"],
+        content=f"{bot_user.first_name} just viewed your profile! Go check their profile out!",
+        type="view",
+        link_to=f"users/{bot_user.id}",
+    )
     Like.create(liker_id=bot_user.id, liked_id=user_to_like.id)
-
+    Notification.create(
+        trigger_id=bot_user.id,
+        user_id=user_to_like.id,
+        content=f"{bot_user.first_name} liked you! Go check them out!",
+        type="like",
+        link_to=f"users/{bot_user.id}",
+    )
     if user_to_like.already_likes(bot_user.id):
         Match.create(user_1=bot_user.id, user_2=user_to_like.id)
+        Notification.create(
+            trigger_id=bot_user.id,
+            user_id=user_to_like.id,
+            content=f"You and {bot_user.first_name} matched!",
+            type="match",
+            link_to=f"conversation/{bot_user.id}",
+        )
 
 
 def botaction_unlike(bot_user: User):
@@ -81,6 +102,13 @@ def _botaction_view(bot_user: User, recommendations):
     except IndexError:
         return
     View.create(profile_id=user_to_view["id"], viewer_id=bot_user.id)
+    Notification.create(
+        trigger_id=bot_user.id,
+        user_id=user_to_view["id"],
+        content=f"{bot_user.first_name} just viewed your profile! Go check their profile out!",
+        type="view",
+        link_to=f"users/{bot_user.id}",
+    )
 
 
 def _botaction_message_new_conversation(bot_user: User):
@@ -102,7 +130,15 @@ def _botaction_message_new_conversation(bot_user: User):
     else:
         other_user = match_to_open_conv.user_1
 
-    bot_user.send_message(to_id=other_user, content=choice(BOT_CONV_OPENERS))
+    content = choice(BOT_CONV_OPENERS)
+    bot_user.send_message(to_id=other_user, content=content)
+    Notification.create(
+        trigger_id=bot_user.id,
+        user_id=other_user,
+        content=f"{bot_user.first_name} said: {content}",
+        type="message",
+        link_to=f"conversation/{bot_user.id}",
+    )
 
 
 def _botaction_respond_to_unread(bot_user: User, chatbot):
@@ -118,6 +154,13 @@ def _botaction_respond_to_unread(bot_user: User, chatbot):
         return
     bot_reply = chatbot.get_response(message_to_reply.content)
     bot_user.send_message(to_id=message_to_reply.from_id, content=bot_reply.text)
+    Notification.create(
+        trigger_id=bot_user.id,
+        user_id=message_to_reply.from_id,
+        content=f"{bot_user.first_name} said: {bot_reply.text}",
+        type="message",
+        link_to=f"conversation/{bot_user.id}",
+    )
 
 
 def _botaction_send_message_over_old_one(bot_user: User, chatbot):
@@ -133,6 +176,13 @@ def _botaction_send_message_over_old_one(bot_user: User, chatbot):
 
     bot_reply = chatbot.get_response(".")
     bot_user.send_message(to_id=other_user, content=bot_reply.text)
+    Notification.create(
+        trigger_id=bot_user.id,
+        user_id=message_to_reply.from_id,
+        content=f"{bot_user.first_name} said: {bot_reply.text}",
+        type="message",
+        link_to=f"conversation/{bot_user.id}",
+    )
 
 
 def decide_bot_action(bot_user: User):

backend/PyMatcha/utils/tasks.py

@@ -5,6 +5,7 @@
 from PyMatcha import celery
 from PyMatcha import redis
 from PyMatcha.models.message import Message
+from PyMatcha.models.notification import Notification
 from PyMatcha.models.user import User
 from PyMatcha.utils.bot_actions import _prepare_chatbot
 from PyMatcha.utils.bot_actions import decide_bot_action
@@ -161,5 +162,12 @@ def bot_respond_to_message(bot_id: int, from_id: int, message_content: str):
     chatbot = _prepare_chatbot(bot_user.username)
     reply = chatbot.get_response(message_content)
     bot_user.send_message(from_user.id, reply.text)
+    Notification.create(
+        trigger_id=bot_id,
+        user_id=from_id,
+        content=f"{bot_user.first_name} said: {reply.text}",
+        type="message",
+        link_to=f"conversation/{bot_user.id}",
+    )
 
     return f"Bot {bot_id} successfully replied to {from_id}"